物料检测项加检测项关联

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<QcCheckTypeProject> typeProjects) {
 		return toAjax(qcCheckTypeProjectService.submitProjects(typeProjects));
 	}
-
+    //获取方案下拉
+	@GetMapping("/getProjectOptions")
+	public List<QcProjectType> getProjectOptions(QcCheckProject qcCheckProject) {
+		startPage();
+		List<QcProjectType> list = qcCheckTypeProjectService.getProjectOptions(qcCheckProject);
+		return list;
+	}
 }

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;
 	}

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<QcCheckProject> getProjectInfoList(QcCheckProject qcCheckProject);
 
     int insertQcCheckTypeProjects(@Param("list") List<QcCheckTypeProject> typeProjects);
+
+    List<QcProjectType> getProjectOptions(QcCheckProject qcCheckProject);
 }

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<QcCheckProject> getProjectInfoList(QcCheckProject qcCheckProject);
 
     int submitProjects(List<QcCheckTypeProject> typeProjects);
+
+    List<QcProjectType> getProjectOptions(QcCheckProject qcCheckProject);
 }

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<QcProjectType> getProjectOptions(QcCheckProject qcCheckProject) {
+		return qcCheckTypeProjectMapper.getProjectOptions(qcCheckProject);
+	}
+
 
 }

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'
+		<if test="projectType != null">and project_type = #{projectType}</if>
 		<if test="ruleName != null">and rule_name like concat('%',#{ruleName},'%') </if>
 		and id not in(
 			select project_id from qc_check_type_project
@@ -314,4 +315,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="materialCode != null">and material_code = #{materialCode} </if>
 		)
 	</select>
+    <select id="getProjectOptions" resultType="com.op.quality.domain.QcProjectType">
+		select project_type_code projectTypeCode,
+			   project_type_name projectTypeName
+		from qc_project_type
+		where del_flag = '0'
+	</select>
 </mapper>