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 242776c3..1bf94b0e 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 @@ -1580,8 +1580,8 @@ public class QcController { * @return: com.xujie.sys.common.utils.R **/ @PostMapping(value="/disposalMeasuresSearch") - public R disposalMeasuresSearch(){ - List list = qcService.disposalMeasuresSearch(); + public R disposalMeasuresSearch(@RequestBody QcFAIRecordData data){ + List list = qcService.disposalMeasuresSearch(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 f9b4104f..5c681002 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 @@ -416,5 +416,5 @@ public interface QcMapper { List getSpecialOperationList(QcFAIRecordData data); - List disposalMeasuresSearch(); + List disposalMeasuresSearch(QcFAIRecordData 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 d7ff297f..97845152 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 @@ -3134,8 +3134,8 @@ public class QcServiceImpl implements QcService { * @return: java.util.List **/ @Override - public List disposalMeasuresSearch() { - List list = qcMapper.disposalMeasuresSearch(); + public List disposalMeasuresSearch(QcFAIRecordData data) { + List list = qcMapper.disposalMeasuresSearch(data); return list; } 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 38fb925a..39c643d7 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 @@ -244,5 +244,5 @@ public interface QcService { List getSpecialOperationList(QcFAIRecordData data); - List disposalMeasuresSearch(); + List disposalMeasuresSearch(QcFAIRecordData data); } diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 5aae1253..b4bd08bd 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -2588,11 +2588,16 @@ - SELECT id, disposal_measures - FROM qc_disposal_measures + FROM qc_disposal_measures + + + inspection_type != 'IPQC' + +