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 5691f45a..ad6b10ff 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 @@ -1015,8 +1015,8 @@ public class QcController { **/ @PostMapping("/selectFAISubDetailedRecord") public R selectFAISubDetailedRecord(@RequestBody SubDetailValues data){ - PageUtils page = qcService.selectFAISubDetailedRecord(data); - return R.ok().put("page", page); + List list = qcService.selectFAISubDetailedRecord(data); + return R.ok().put("rows", list); } /** @@ -1160,8 +1160,8 @@ public class QcController { **/ @PostMapping("/selectFQCSubDetailedRecord") public R selectFQCSubDetailedRecord(@RequestBody SubDetailValues data){ - PageUtils page = qcService.selectFQCSubDetailedRecord(data); - return R.ok().put("page", page); + List list = qcService.selectFQCSubDetailedRecord(data); + return R.ok().put("rows", list); } /** @@ -1279,8 +1279,8 @@ public class QcController { **/ @PostMapping("/selectIPQCSubDetailedRecord") public R selectIPQCSubDetailedRecord(@RequestBody SubDetailValues data){ - PageUtils page = qcService.selectIPQCSubDetailedRecord(data); - return R.ok().put("page", page); + List list = qcService.selectIPQCSubDetailedRecord(data); + return R.ok().put("rows", list); } /** @@ -1424,8 +1424,8 @@ public class QcController { **/ @PostMapping("/selectIQCSubDetailedRecord") public R selectIQCSubDetailedRecord(@RequestBody SubDetailValues data){ - PageUtils page = qcService.selectIQCSubDetailedRecord(data); - return R.ok().put("page", page); + List list = qcService.selectIQCSubDetailedRecord(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 f1bdd9a9..cdc66dbe 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 @@ -64,7 +64,7 @@ public interface QcMapper { void saveFAISubDetailed(List subDetailValues); - IPage selectFAISubDetailedRecord(Page qcFAIRecordDataPage, @Param("query") SubDetailValues data); + List selectFAISubDetailedRecord(SubDetailValues data); void updateFAISubDetailSubmitFlag(QcFAIRecordData data); @@ -276,7 +276,7 @@ public interface QcMapper { void saveIPQCSubDetailed(List subDetailValues); - IPage selectIPQCSubDetailedRecord(Page qcFAIRecordDataPage, @Param("query") SubDetailValues data); + List selectIPQCSubDetailedRecord(SubDetailValues data); QcFAIRecordData checkIPQCIsSubmit(SubDetailValues data); @@ -300,7 +300,7 @@ public interface QcMapper { List iqcDetailSearch(QcFAIRecordData data); - IPage selectIQCSubDetailedRecord(Page qcFAIRecordDataPage, @Param("query") SubDetailValues data); + List selectIQCSubDetailedRecord(SubDetailValues data); List selectIQCSubDetailValue(String inspectionNo, String itemNo, String site); @@ -385,7 +385,7 @@ public interface QcMapper { void saveFQCSubDetailed(List subDetailValues); - IPage selectFQCSubDetailedRecord(Page qcFAIRecordDataPage, @Param("query") SubDetailValues data); + List selectFQCSubDetailedRecord(SubDetailValues data); QcFAIRecordData checkFQCIsSubmit(SubDetailValues 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 17f089b8..e6bc300f 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 @@ -2361,12 +2361,12 @@ public class QcServiceImpl implements QcService { * @return: java.util.List **/ @Override - public PageUtils selectFAISubDetailedRecord(SubDetailValues data) { + public List selectFAISubDetailedRecord(SubDetailValues data) { // 获取检验项目的采集数据内容 String collectionDataContent = qcMapper.getItemCollectionDataContent(data); data.setCollectionDataContent(collectionDataContent); - IPage list = qcMapper.selectFAISubDetailedRecord(new Page(data.getPage(), data.getLimit()), data); - return new PageUtils(list); + List list = qcMapper.selectFAISubDetailedRecord(data); + return list; } /** @@ -2919,12 +2919,12 @@ public class QcServiceImpl implements QcService { * @return: java.util.List **/ @Override - public PageUtils selectFQCSubDetailedRecord(SubDetailValues data) { + public List selectFQCSubDetailedRecord(SubDetailValues data) { // 获取检验项目的采集数据内容 String collectionDataContent = qcMapper.getItemCollectionDataContent(data); data.setCollectionDataContent(collectionDataContent); - IPage list = qcMapper.selectFQCSubDetailedRecord(new Page(data.getPage(), data.getLimit()), data); - return new PageUtils(list); + List list = qcMapper.selectFQCSubDetailedRecord(data); + return list; } /** @@ -3536,12 +3536,12 @@ public class QcServiceImpl implements QcService { * @return: java.util.List **/ @Override - public PageUtils selectIPQCSubDetailedRecord(SubDetailValues data) { + public List selectIPQCSubDetailedRecord(SubDetailValues data) { // 获取检验项目的采集数据内容 String collectionDataContent = qcMapper.getItemCollectionDataContent(data); data.setCollectionDataContent(collectionDataContent); - IPage list = qcMapper.selectIPQCSubDetailedRecord(new Page(data.getPage(), data.getLimit()), data); - return new PageUtils(list); + List list = qcMapper.selectIPQCSubDetailedRecord(data); + return list; } /** @@ -3905,12 +3905,12 @@ public class QcServiceImpl implements QcService { * @return: java.util.List **/ @Override - public PageUtils selectIQCSubDetailedRecord(SubDetailValues data) { + public List selectIQCSubDetailedRecord(SubDetailValues data) { // 获取检验项目的采集数据内容 String collectionDataContent = qcMapper.getItemCollectionDataContent(data); data.setCollectionDataContent(collectionDataContent); - IPage list = qcMapper.selectIQCSubDetailedRecord(new Page(data.getPage(), data.getLimit()), data); - return new PageUtils(list); + List list = qcMapper.selectIQCSubDetailedRecord(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 56db7f98..f44da80c 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 @@ -47,7 +47,7 @@ public interface QcService { Integer saveFAISubDetailed(QcSubDetailInformationData data); - PageUtils selectFAISubDetailedRecord(SubDetailValues data); + List selectFAISubDetailedRecord(SubDetailValues data); Integer checkFAIIsSubmit(SubDetailValues data); @@ -171,7 +171,7 @@ public interface QcService { Integer saveIPQCSubDetailed(QcSubDetailInformationData data); - PageUtils selectIPQCSubDetailedRecord(SubDetailValues data); + List selectIPQCSubDetailedRecord(SubDetailValues data); Integer checkIPQCIsSubmit(SubDetailValues data); @@ -189,7 +189,7 @@ public interface QcService { List iqcDetailSearch(QcFAIRecordData data); - PageUtils selectIQCSubDetailedRecord(SubDetailValues data); + List selectIQCSubDetailedRecord(SubDetailValues data); Integer checkIQCSubDetailValue(CheckSubDetailValueVo data); @@ -231,7 +231,7 @@ public interface QcService { Integer saveFQCSubDetailed(QcSubDetailInformationData data); - PageUtils selectFQCSubDetailedRecord(SubDetailValues data); + List selectFQCSubDetailedRecord(SubDetailValues data); Integer checkFQCIsSubmit(SubDetailValues data); diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 49355694..27633e41 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -1819,9 +1819,9 @@ sampling_location_b, num FROM qc_fai_sub_detail_record - WHERE inspection_no = #{query.inspectionNo} and item_no = #{query.itemNo} and site = #{query.site} and bu_no = #{query.buNo} - - AND sub_detail_value ${query.collectionDataContent} + WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo} + + AND sub_detail_value ${collectionDataContent} order by num @@ -2143,9 +2143,9 @@ num, sub_detail_value_b FROM qc_ipqc_sub_detail_record - WHERE inspection_no = #{query.inspectionNo} and item_no = #{query.itemNo} and site = #{query.site} and bu_no = #{query.buNo} - - AND sub_detail_value ${query.collectionDataContent} + WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo} + + AND sub_detail_value ${collectionDataContent} order by num @@ -2428,9 +2428,9 @@ sampling_location_b, num FROM qc_iqc_sub_detail_record - WHERE inspection_no = #{query.inspectionNo} and item_no = #{query.itemNo} and site = #{query.site} and bu_no = #{query.buNo} - - AND sub_detail_value ${query.collectionDataContent} + WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo} + + AND sub_detail_value ${collectionDataContent} order by num @@ -2868,9 +2868,9 @@ sampling_location_b, num FROM qc_fqc_sub_detail_record - WHERE inspection_no = #{query.inspectionNo} and item_no = #{query.itemNo} and site = #{query.site} and bu_no = #{query.buNo} - - AND sub_detail_value ${query.collectionDataContent} + WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo} + + AND sub_detail_value ${collectionDataContent} order by num