From 0f490cf81790efe3949a0a02dabfbe7044f859e5 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 3 Jan 2024 16:31:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=A3=80=E6=B5=8B=E9=A1=B9?= =?UTF-8?q?=E5=8A=A0=E6=A3=80=E6=B5=8B=E9=A1=B9=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/controller/QcCheckTypeProjectController.java | 9 ++++++++- .../main/java/com/op/quality/domain/QcCheckProject.java | 1 - .../com/op/quality/mapper/QcCheckTypeProjectMapper.java | 3 +++ .../op/quality/service/IQcCheckTypeProjectService.java | 3 +++ .../service/impl/QcCheckTypeProjectServiceImpl.java | 7 +++++++ .../mapper/quality/QcCheckTypeProjectMapper.xml | 7 +++++++ 6 files changed, 28 insertions(+), 2 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeProjectController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeProjectController.java index bab92760..d2900514 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeProjectController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTypeProjectController.java @@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse; import com.op.quality.domain.QcCheckProject; import com.op.quality.domain.QcMaterialGroup; +import com.op.quality.domain.QcProjectType; import com.op.quality.service.IQcMaterialGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -116,5 +117,11 @@ public class QcCheckTypeProjectController extends BaseController { public AjaxResult submitProjects(@RequestBody List typeProjects) { return toAjax(qcCheckTypeProjectService.submitProjects(typeProjects)); } - + //获取方案下拉 + @GetMapping("/getProjectOptions") + public List getProjectOptions(QcCheckProject qcCheckProject) { + startPage(); + List list = qcCheckTypeProjectService.getProjectOptions(qcCheckProject); + return list; + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java index 57307e84..6653a26a 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java @@ -64,7 +64,6 @@ public class QcCheckProject extends BaseEntity { private String typeCode; private String groupId; - public String getProjectType() { return projectType; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeProjectMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeProjectMapper.java index 8b7f3a76..500d2c61 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeProjectMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeProjectMapper.java @@ -6,6 +6,7 @@ import java.util.Map; import com.op.quality.domain.QcCheckProject; import com.op.quality.domain.QcCheckTaskDetail; import com.op.quality.domain.QcCheckTypeProject; +import com.op.quality.domain.QcProjectType; import com.op.system.api.domain.SysDictData; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; @@ -77,4 +78,6 @@ public interface QcCheckTypeProjectMapper { List getProjectInfoList(QcCheckProject qcCheckProject); int insertQcCheckTypeProjects(@Param("list") List typeProjects); + + List getProjectOptions(QcCheckProject qcCheckProject); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTypeProjectService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTypeProjectService.java index aeffa6f9..2790a01a 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTypeProjectService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTypeProjectService.java @@ -4,6 +4,7 @@ import java.util.List; import com.op.quality.domain.QcCheckProject; import com.op.quality.domain.QcCheckTypeProject; +import com.op.quality.domain.QcProjectType; /** * 物料检验项目维护Service接口 @@ -66,4 +67,6 @@ public interface IQcCheckTypeProjectService { List getProjectInfoList(QcCheckProject qcCheckProject); int submitProjects(List typeProjects); + + List getProjectOptions(QcCheckProject qcCheckProject); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTypeProjectServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTypeProjectServiceImpl.java index 64cb7814..d35f5ca3 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTypeProjectServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTypeProjectServiceImpl.java @@ -10,6 +10,7 @@ import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; import com.op.quality.domain.QcCheckProject; +import com.op.quality.domain.QcProjectType; import com.op.system.api.domain.SysDictData; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -155,5 +156,11 @@ public class QcCheckTypeProjectServiceImpl implements IQcCheckTypeProjectService return m; } + @Override + @DS("#header.poolName") + public List getProjectOptions(QcCheckProject qcCheckProject) { + return qcCheckTypeProjectMapper.getProjectOptions(qcCheckProject); + } + } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml index a0e42006..672a754e 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml @@ -306,6 +306,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" defect_level defectLevel from qc_check_project where del_flag = '0' + and project_type = #{projectType} and rule_name like concat('%',#{ruleName},'%') and id not in( select project_id from qc_check_type_project @@ -314,4 +315,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and material_code = #{materialCode} ) +