1、单据上传页面逻辑优化

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

@@ -674,46 +674,38 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
         Integer codeCount = 0;
         Integer fifoSplitOneCount = 0;
         Integer fifoSplitTwoCount = 0;
-        String sum = "sum";
+        String sum = "_sum";
         if (list != null && list.size() > 0) {
             BaseResponse<Map<String, String[]>> baseResponse = erpBasicClient.getBuyType("thirdId");
             if (baseResponse.getCode() == 20000) {
                 buyTypeMap = baseResponse.getData();
             }
             Map<String, Integer> map = new HashMap();
-            for (IoCollectOrderResponse collectOrderResponse : list) {
             for (Map.Entry<String, String[]> entry : buyTypeMap.entrySet()) {
                 String key = entry.getKey();
                 if (ArrayUtil.isEmpty(entry.getValue())) {
                     continue;
                 }
                 String result = String.join(", ", entry.getValue());
-                        if (result.contains(collectOrderResponse.getBusType())) {
+                int sumCount = 0;
-                            int count = 0;
+                int okCount = 0;
-                            if (collectOrderResponse.getRelCodeCount() != null && collectOrderResponse.getRelCodeCount() > 0) {
-                                count += collectOrderResponse.getRelCodeCount();
-                            } else {
-                                count++;
 
-                            }
+                for (IoCollectOrderResponse collectOrderResponse : list) {
+                    if (result.contains(collectOrderResponse.getBusType())) {
+                        if (collectOrderResponse.getRelCodeCount() != null) {
                             if (2 == collectOrderResponse.getUploadStatus()) {
-
+                                okCount += collectOrderResponse.getRelCodeCount();
-                                map.put(key, count);
                             }
-                            map.put(key+sum, count);
+                            sumCount += collectOrderResponse.getRelCodeCount();
 
                         }
-
+                    }
-
                 }
 
 
-                if (collectOrderResponse.getRelCodeCount() != null && collectOrderResponse.getRelCodeCount() > 0) {
+                map.put(key , okCount);
-                    codeCount += collectOrderResponse.getRelCodeCount();
+                map.put(key + sum, sumCount);
-                } else {
-                    codeCount++;
 
-                }
 
             }
             // 数据做处理

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

@@ -151,9 +151,8 @@
 
     <select id="getList"  resultType="com.glxp.api.res.collect.IoCollectOrderResponse">
         SELECT
-        bac.*,(SELECT
+        bac.*,(SELECT sum(IF( relCodeCount > 0, relCodeCount, 1 )) FROM
-        sum(IF( relCodeCount > 0, relCodeCount, 1 )) FROM io_collect_code_backup code_ba
+        io_collect_code_backup code_ba where code_ba.billNo = bac.billNo ) as relCodeCount
-        LEFT JOIN io_collect_order_backup bac ON code_ba.billNo = bac.billNo ) as relCodeCount
         FROM
         io_collect_order_backup bac
         <where>