diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPqcInspectionRuleController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPqcInspectionRuleController.java index 58b201d8..de49419b 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPqcInspectionRuleController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsPqcInspectionRuleController.java @@ -3,6 +3,7 @@ package com.nflg.qms.admin.controller; import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAddQO; import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAuditQO; import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleEditQO; +import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleModelNoSearchQO; import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleSearchQO; import com.nflg.qms.admin.pojo.vo.PqcInspectionRuleDetailVO; import com.nflg.qms.admin.pojo.vo.PqcInspectionPointListVO; @@ -52,6 +53,14 @@ public class QmsPqcInspectionRuleController extends BaseController { return ApiResult.success(ruleControllerService.search(qo)); } + /** + * 分页查询PQC标准检测机型编号(去重) + */ + @PostMapping("/modelNos") + public ApiResult> modelNos(@RequestBody PqcInspectionRuleModelNoSearchQO qo) { + return ApiResult.success(ruleControllerService.searchModelNos(qo)); + } + /** * 获取规则详情 */ diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/pojo/qo/PqcInspectionRuleModelNoSearchQO.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/pojo/qo/PqcInspectionRuleModelNoSearchQO.java new file mode 100644 index 00000000..34fe97e5 --- /dev/null +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/pojo/qo/PqcInspectionRuleModelNoSearchQO.java @@ -0,0 +1,18 @@ +package com.nflg.qms.admin.pojo.qo; + +import com.nflg.wms.common.pojo.qo.PageQO; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * PQC标准检测机型编号查询参数 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PqcInspectionRuleModelNoSearchQO extends PageQO { + + /** + * 机型编号(模糊查询) + */ + private String modelNo; +} diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcInspectionRuleControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcInspectionRuleControllerService.java index 9115774f..bc13dbe3 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcInspectionRuleControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcInspectionRuleControllerService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAddQO; import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAuditQO; import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleEditQO; +import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleModelNoSearchQO; import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleSearchQO; import com.nflg.qms.admin.pojo.vo.PqcInspectionPointListVO; import com.nflg.qms.admin.pojo.vo.PqcInspectionRuleDetailVO; @@ -28,6 +29,11 @@ public interface QmsPqcInspectionRuleControllerService { */ PageData search(PqcInspectionRuleSearchQO qo); + /** + * 分页查询PQC标准检测机型编号(去重) + */ + PageData searchModelNos(PqcInspectionRuleModelNoSearchQO qo); + /** * 获取规则详情(含检查点和检查项) */ diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/impl/QmsPqcInspectionRuleControllerServiceImpl.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/impl/QmsPqcInspectionRuleControllerServiceImpl.java index feb91f7f..ddc66266 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/impl/QmsPqcInspectionRuleControllerServiceImpl.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/impl/QmsPqcInspectionRuleControllerServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAddQO; import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAuditQO; import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleEditQO; +import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleModelNoSearchQO; import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleSearchQO; import com.nflg.qms.admin.pojo.vo.PqcInspectionPointItemVO; import com.nflg.qms.admin.pojo.vo.PqcInspectionPointListVO; @@ -207,6 +208,23 @@ public class QmsPqcInspectionRuleControllerServiceImpl implements QmsPqcInspecti return PageUtil.Page(voList, (int) page.getCurrent(), (int) page.getSize()); } + @Override + public PageData searchModelNos(PqcInspectionRuleModelNoSearchQO qo) { + List modelNos = ruleService.lambdaQuery() + .select(QmsPqcInspectionRule::getModelNo) + .like(StrUtil.isNotBlank(qo.getModelNo()), QmsPqcInspectionRule::getModelNo, qo.getModelNo()) + .isNotNull(QmsPqcInspectionRule::getModelNo) + .list() + .stream() + .map(QmsPqcInspectionRule::getModelNo) + .filter(StrUtil::isNotBlank) + .distinct() + .sorted() + .collect(Collectors.toList()); + + return PageUtil.Page(modelNos, qo.getPage(), qo.getPageSize()); + } + @Override public PqcInspectionRuleDetailVO getDetail(Long id) { QmsPqcInspectionRule rule = ruleService.getById(id);