diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java index 33940524..5d7864bf 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java @@ -1701,6 +1701,17 @@ public class QcController { Map countMap = qcService.subDetailUpload(file, data); return R.ok().put("countMap", countMap); } + + /** + * 获取检验方法列表 + * @param data + * @return + */ + @PostMapping("/queryMethodList") + public R queryMethodList(@RequestBody QcMethodData data) { + List list = qcService.queryMethodList(data); + return R.ok().put("rows", list); + } } diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java index 58cee33b..89f8c96c 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java @@ -440,4 +440,6 @@ public interface QcMapper { void deleteIPQCRecordCount(QcFAIRecordData qcData); List getItem(QcTemplateData data); + + List queryMethodList(QcMethodData data); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index df5c7c4b..22f71201 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java @@ -582,6 +582,17 @@ public class QcServiceImpl implements QcService { return list; } + /** + * 获取检验方法列表 + * @param data + * @return + */ + @Override + public List queryMethodList(QcMethodData data) { + List list = qcMapper.queryMethodList(data); + return list; + } + /** * @description: 删除项目 * @author: fengyuan_yang diff --git a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java index b655f8c4..df24ac54 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java @@ -264,4 +264,6 @@ public interface QcService { Map subDetailUpload(MultipartFile file, GetParamInData data); List getItem(QcTemplateData data); + + List queryMethodList(QcMethodData data); } diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index dd8c45da..d700b85e 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -1089,7 +1089,7 @@ qt.template_name, qit.inspection_type_name FROM qc_template as qt - LEFT JOIN qc_inspection_type AS qit ON qt.inspection_type_no = qit.inspection_type_no + LEFT JOIN qc_inspection_type AS qit ON qt.inspection_type_no = qit.inspection_type_no and qt.site = qit.site qt.site = #{site} @@ -2868,6 +2868,29 @@ WHERE site = #{site} and inspection_no = #{inspectionNo} and item_no = #{itemNo} + + +