2024-07-03

功能优化

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){
-        List<SubDetailValues> list = qcService.selectFAISubDetailedRecord(data);
-        return R.ok().put("rows", list);
+        PageUtils page  = qcService.selectFAISubDetailedRecord(data);
+        return R.ok().put("page", page);
     }
 
     /**
@@ -1160,8 +1160,8 @@ public class QcController {
      **/
     @PostMapping("/selectFQCSubDetailedRecord")
     public R selectFQCSubDetailedRecord(@RequestBody SubDetailValues data){
-        List<SubDetailValues> list = qcService.selectFQCSubDetailedRecord(data);
-        return R.ok().put("rows", list);
+        PageUtils page  = qcService.selectFQCSubDetailedRecord(data);
+        return R.ok().put("page", page);
     }
 
     /**
@@ -1279,8 +1279,8 @@ public class QcController {
      **/
     @PostMapping("/selectIPQCSubDetailedRecord")
     public R selectIPQCSubDetailedRecord(@RequestBody SubDetailValues data){
-        List<SubDetailValues> list = qcService.selectIPQCSubDetailedRecord(data);
-        return R.ok().put("rows", list);
+        PageUtils page  = qcService.selectIPQCSubDetailedRecord(data);
+        return R.ok().put("page", page);
     }
 
     /**
@@ -1424,8 +1424,8 @@ public class QcController {
      **/
     @PostMapping("/selectIQCSubDetailedRecord")
     public R selectIQCSubDetailedRecord(@RequestBody SubDetailValues data){
-        List<SubDetailValues> list = qcService.selectIQCSubDetailedRecord(data);
-        return R.ok().put("rows", list);
+        PageUtils page  = qcService.selectIQCSubDetailedRecord(data);
+        return R.ok().put("page", page);
     }
 
     /**

src/main/java/com/xujie/sys/modules/pms/data/SubDetailValues.java

@@ -1,9 +1,11 @@
 package com.xujie.sys.modules.pms.data;
 
 
+import com.xujie.sys.common.utils.QueryPage;
+
 import java.math.BigDecimal;
 
-public class SubDetailValues {
+public class SubDetailValues extends QueryPage {
     // 工厂号
     private String site;
     // 主键ID

src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java

@@ -64,7 +64,7 @@ public interface QcMapper {
 
     void saveFAISubDetailed(List<SubDetailValues> subDetailValues);
 
-    List<SubDetailValues> selectFAISubDetailedRecord(SubDetailValues data);
+    IPage<SubDetailValues> selectFAISubDetailedRecord(Page<SubDetailValues> qcFAIRecordDataPage, @Param("query") SubDetailValues data);
 
     void updateFAISubDetailSubmitFlag(QcFAIRecordData data);
 
@@ -276,7 +276,7 @@ public interface QcMapper {
 
     void saveIPQCSubDetailed(List<SubDetailValues> subDetailValues);
 
-    List<SubDetailValues> selectIPQCSubDetailedRecord(SubDetailValues data);
+    IPage<SubDetailValues> selectIPQCSubDetailedRecord(Page<SubDetailValues> qcFAIRecordDataPage, @Param("query") SubDetailValues data);
 
     QcFAIRecordData checkIPQCIsSubmit(SubDetailValues data);
 
@@ -300,7 +300,7 @@ public interface QcMapper {
 
     List<QcFAIRecordData> iqcDetailSearch(QcFAIRecordData data);
 
-    List<SubDetailValues> selectIQCSubDetailedRecord(SubDetailValues data);
+    IPage<SubDetailValues> selectIQCSubDetailedRecord(Page<SubDetailValues> qcFAIRecordDataPage, @Param("query") SubDetailValues data);
 
     List<SubDetailValues> selectIQCSubDetailValue(String inspectionNo, String itemNo, String site);
 
@@ -385,7 +385,7 @@ public interface QcMapper {
 
     void saveFQCSubDetailed(List<SubDetailValues> subDetailValues);
 
-    List<SubDetailValues> selectFQCSubDetailedRecord(SubDetailValues data);
+    IPage<SubDetailValues> selectFQCSubDetailedRecord(Page<SubDetailValues> qcFAIRecordDataPage, @Param("query") SubDetailValues data);
 
     QcFAIRecordData checkFQCIsSubmit(SubDetailValues data);
 

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<com.xujie.sys.modules.pms.data.SubDetailValues>
      **/
     @Override
-    public List<SubDetailValues> selectFAISubDetailedRecord(SubDetailValues data) {
+    public PageUtils selectFAISubDetailedRecord(SubDetailValues data) {
         // 获取检验项目的采集数据内容
         String collectionDataContent = qcMapper.getItemCollectionDataContent(data);
         data.setCollectionDataContent(collectionDataContent);
-        List<SubDetailValues> list = qcMapper.selectFAISubDetailedRecord(data);
-        return list;
+        IPage<SubDetailValues> list = qcMapper.selectFAISubDetailedRecord(new Page<SubDetailValues>(data.getPage(), data.getLimit()), data);
+        return new PageUtils(list);
     }
 
     /**
@@ -2919,12 +2919,12 @@ public class QcServiceImpl implements QcService {
      * @return: java.util.List<com.xujie.sys.modules.pms.data.SubDetailValues>
      **/
     @Override
-    public List<SubDetailValues> selectFQCSubDetailedRecord(SubDetailValues data) {
+    public PageUtils selectFQCSubDetailedRecord(SubDetailValues data) {
         // 获取检验项目的采集数据内容
         String collectionDataContent = qcMapper.getItemCollectionDataContent(data);
         data.setCollectionDataContent(collectionDataContent);
-        List<SubDetailValues> list = qcMapper.selectFQCSubDetailedRecord(data);
-        return list;
+        IPage<SubDetailValues> list = qcMapper.selectFQCSubDetailedRecord(new Page<SubDetailValues>(data.getPage(), data.getLimit()), data);
+        return new PageUtils(list);
     }
 
     /**
@@ -3536,12 +3536,12 @@ public class QcServiceImpl implements QcService {
      * @return: java.util.List<com.xujie.sys.modules.pms.data.SubDetailValues>
      **/
     @Override
-    public List<SubDetailValues> selectIPQCSubDetailedRecord(SubDetailValues data) {
+    public PageUtils selectIPQCSubDetailedRecord(SubDetailValues data) {
         // 获取检验项目的采集数据内容
         String collectionDataContent = qcMapper.getItemCollectionDataContent(data);
         data.setCollectionDataContent(collectionDataContent);
-        List<SubDetailValues> list = qcMapper.selectIPQCSubDetailedRecord(data);
-        return list;
+        IPage<SubDetailValues> list = qcMapper.selectIPQCSubDetailedRecord(new Page<SubDetailValues>(data.getPage(), data.getLimit()), data);
+        return new PageUtils(list);
     }
 
     /**
@@ -3905,12 +3905,12 @@ public class QcServiceImpl implements QcService {
      * @return: java.util.List<com.xujie.sys.modules.pms.data.SubDetailValues>
      **/
     @Override
-    public List<SubDetailValues> selectIQCSubDetailedRecord(SubDetailValues data) {
+    public PageUtils selectIQCSubDetailedRecord(SubDetailValues data) {
         // 获取检验项目的采集数据内容
         String collectionDataContent = qcMapper.getItemCollectionDataContent(data);
         data.setCollectionDataContent(collectionDataContent);
-        List<SubDetailValues> list = qcMapper.selectIQCSubDetailedRecord(data);
-        return list;
+        IPage<SubDetailValues> list = qcMapper.selectIQCSubDetailedRecord(new Page<SubDetailValues>(data.getPage(), data.getLimit()), data);
+        return new PageUtils(list);
     }
 
     /**

src/main/java/com/xujie/sys/modules/pms/service/QcService.java

@@ -47,7 +47,7 @@ public interface QcService {
 
     Integer saveFAISubDetailed(QcSubDetailInformationData data);
 
-    List<SubDetailValues> selectFAISubDetailedRecord(SubDetailValues data);
+    PageUtils selectFAISubDetailedRecord(SubDetailValues data);
 
     Integer checkFAIIsSubmit(SubDetailValues data);
 
@@ -171,7 +171,7 @@ public interface QcService {
 
     Integer saveIPQCSubDetailed(QcSubDetailInformationData data);
 
-    List<SubDetailValues> selectIPQCSubDetailedRecord(SubDetailValues data);
+    PageUtils selectIPQCSubDetailedRecord(SubDetailValues data);
 
     Integer checkIPQCIsSubmit(SubDetailValues data);
 
@@ -189,7 +189,7 @@ public interface QcService {
 
     List<QcFAIRecordData> iqcDetailSearch(QcFAIRecordData data);
 
-    List<SubDetailValues> selectIQCSubDetailedRecord(SubDetailValues data);
+    PageUtils selectIQCSubDetailedRecord(SubDetailValues data);
 
     Integer checkIQCSubDetailValue(CheckSubDetailValueVo data);
 
@@ -231,7 +231,7 @@ public interface QcService {
 
     Integer saveFQCSubDetailed(QcSubDetailInformationData data);
 
-    List<SubDetailValues> selectFQCSubDetailedRecord(SubDetailValues data);
+    PageUtils selectFQCSubDetailedRecord(SubDetailValues data);
 
     Integer checkFQCIsSubmit(SubDetailValues data);
 

src/main/resources/mapper/pms/QcMapper.xml

@@ -1819,9 +1819,9 @@
             sampling_location_b,
             num
         FROM qc_fai_sub_detail_record
-        WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo}
-        <if test = "collectionDataContent != null and collectionDataContent != ''">
-            AND sub_detail_value ${collectionDataContent}
+        WHERE inspection_no = #{query.inspectionNo} and item_no = #{query.itemNo} and site = #{query.site} and bu_no = #{query.buNo}
+        <if test = "query.collectionDataContent != null and query.collectionDataContent != ''">
+            AND sub_detail_value ${query.collectionDataContent}
         </if>
         order by num
     </select>
@@ -2143,9 +2143,9 @@
             num,
             sub_detail_value_b
         FROM qc_ipqc_sub_detail_record
-        WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo}
-        <if test = "collectionDataContent != null and collectionDataContent != ''">
-            AND sub_detail_value ${collectionDataContent}
+        WHERE inspection_no = #{query.inspectionNo} and item_no = #{query.itemNo} and site = #{query.site} and bu_no = #{query.buNo}
+        <if test = "query.collectionDataContent != null and query.collectionDataContent != ''">
+            AND sub_detail_value ${query.collectionDataContent}
         </if>
         order by num
     </select>
@@ -2423,9 +2423,9 @@
             sampling_location_b,
             num
         FROM qc_iqc_sub_detail_record
-        WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo}
-        <if test = "collectionDataContent != null and collectionDataContent != ''">
-            AND sub_detail_value ${collectionDataContent}
+        WHERE inspection_no = #{query.inspectionNo} and item_no = #{query.itemNo} and site = #{query.site} and bu_no = #{query.buNo}
+        <if test = "query.collectionDataContent != null and query.collectionDataContent != ''">
+            AND sub_detail_value ${query.collectionDataContent}
         </if>
         order by num
     </select>
@@ -2863,9 +2863,9 @@
             sampling_location_b,
             num
         FROM qc_fqc_sub_detail_record
-        WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo}
-        <if test = "collectionDataContent != null and collectionDataContent != ''">
-            AND sub_detail_value ${collectionDataContent}
+        WHERE inspection_no = #{query.inspectionNo} and item_no = #{query.itemNo} and site = #{query.site} and bu_no = #{query.buNo}
+        <if test = "query.collectionDataContent != null and query.collectionDataContent != ''">
+            AND sub_detail_value ${query.collectionDataContent}
         </if>
         order by num
     </select>