4/8 youahu 1.6

src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java

@@ -207,6 +207,7 @@ public class CollectOrderBizResponse {
 
 
     private Integer isSplit;
+    private Integer notCodeType;
 
 
 

src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java

@@ -792,30 +792,8 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
     public Page<IoCollectOrderResponse> filterorderStatsList(CollectOrderRequest collectOrderRequest) {
 
         List<IoCollectOrderResponse> data = ioCollectOrderBackupMapper.filterorderStatsList(collectOrderRequest);
-//        for (IoCollectOrderResponse ioCollectOrderResponse : data){
-//            Integer newScanCount = 0;
-//            Integer shouldCount = 0;
-//            List<IoCollectOrderBizBackup> orderBizBackups = ioCollectOrderBizBackupService.listByBillNo(ioCollectOrderResponse.getBillNo());
-//            // 遍历集合进行累加
-//            for (IoCollectOrderBizBackup collectOrderBizResponse : orderBizBackups) {
-//                newScanCount += (collectOrderBizResponse.getScanCount() != null) ? collectOrderBizResponse.getScanCount() : 0;
-//                shouldCount += getCount(collectOrderBizResponse);
-//            }
-//            ioCollectOrderResponse.setScanCount(newScanCount);
-//            ioCollectOrderResponse.setShouldCount(shouldCount);
-//            ioCollectOrderResponse.setScanRate(getScanRate(shouldCount,newScanCount));
-//            if (newScanCount == shouldCount){
-//                ioCollectOrderResponse.setStorard(1);
-//            }else {
-//                ioCollectOrderResponse.setStorard(0);
-//            }
-//        }
-
 
-        // 筛选 setStorard 为 1 的数据
         List<IoCollectOrderResponse> filteredData = new ArrayList<>();
-        List<IoCollectOrderResponse> filteredData1 = new ArrayList<>();
-        List<IoCollectOrderResponse> filteredData2 = new ArrayList<>();
         for (IoCollectOrderResponse ioCollectOrderResponse : data) {
             Integer newScanCount = 0;
             Integer shouldCount = 0;

src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml

@@ -10,6 +10,7 @@
         bp.packUnit,
         bp.prepnSpec,
         bp.manufactory,
+        bu.notCodeType,
         COALESCE(bp.bzgg,bp.ggxh) AS spec
         FROM io_collect_order_biz_backup icobb
         left join basic_udirel bu on icobb.relId = bu.id