Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/LogSummaryServiceImpl.java

@@ -151,8 +151,11 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
                         if (ObjectUtil.isNull(orderDetail.getActualNum())){
                             orderDetail.setActualNum(0);
                         }
+                        List<DetailJsonReq> detailJson = detailReq.getDetailJson();
+                        detailJson.forEach(detailJsonReq -> detailJsonReq.setModifyQuantity(detailJsonReq.getNum()));
+
 //                        orderDetail.setModifyQuantity(orderDetail.getActualNum()+detailReq.getActualNum());
-                        orderDetail.setDetailJson(JSONObject.toJSONString(detailReq.getDetailJson()));
+                        orderDetail.setDetailJson(JSONObject.toJSONString(detailJson));
                         orderDetail.setModifyQuantity(detailReq.getActualNum());
                         orderDetail.setActualNum(detailReq.getActualNum());
                         orderDetail.setActualTotalPrice(detailReq.getPrice());

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -1058,7 +1058,11 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                                 }
                             }
                         }
+
                         //记账差值
+                        if (ObjectUtil.isNull(detailJsonReq.getModifyQuantity())){
+                            detailJsonReq.setModifyQuantity(uploadDetailReq.getModifyQuantity());
+                        }
                         int subNum=detailJsonReq.getModifyQuantity()-detailJsonReq.getNum();
                         detailJsonReq.setSizeName(uploadDetailReq.getSizeName());
                         detailJsonReq.setTypeName(uploadDetailReq.getTypeName());

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java

@@ -769,15 +769,46 @@ public class TjServiceImpl implements TjService {
         PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
         List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
         List<TjOrgCountDto> tjOrgCountList=new ArrayList<>();
-        for (String orgId:orgList) {
-            TjOrgCountDto orgData =equipmentCountSummaryMapper.TjOrgCount(orgId,
-                    req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),
-                    req.getMonthList());
-            orgData.setNumber(ObjectUtil.isNull(orgData.getNumber())?0:orgData.getNumber());
-            orgData.setUseCount(ObjectUtil.isNull(orgData.getUseCount())?0:orgData.getUseCount());
-            orgData.setFixCount(ObjectUtil.isNull(orgData.getFixCount())?0:orgData.getFixCount());
+//        for (String orgId:orgList) {
+//            TjOrgCountDto orgData =equipmentCountSummaryMapper.TjOrgCount(orgId,
+//                    req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),
+//                    req.getMonthList());
+//            orgData.setNumber(ObjectUtil.isNull(orgData.getNumber())?0:orgData.getNumber());
+//            orgData.setUseCount(ObjectUtil.isNull(orgData.getUseCount())?0:orgData.getUseCount());
+//            orgData.setFixCount(ObjectUtil.isNull(orgData.getFixCount())?0:orgData.getFixCount());
+//            tjOrgCountList.add(orgData);
+//        }
+
+        List<CompletableFuture<TjOrgCountDto>> futures = orgList.stream()
+                .map(orgId -> CompletableFuture.supplyAsync(() ->
+                        equipmentCountSummaryMapper.TjOrgCount(orgId,
+                                req.getTypeIdsList(), req.getSizeNameList(),
+                                req.getYear(), req.getTypeParentId(), req.getMonthList()))
+                )
+                .collect(Collectors.toList());
+// 等待所有 CompletableFuture 完成
+        CompletableFuture<Void> allOf = CompletableFuture.allOf(
+                futures.toArray(new CompletableFuture[0])
+        );
+        // 处理每个 CompletableFuture 的结果
+        allOf.thenRun(() -> {
+            for (CompletableFuture<TjOrgCountDto> future : futures) {
+                try {
+                    TjOrgCountDto orgData = future.get(); // 获取 CompletableFuture 的结果
+                    if (orgData != null) {
+                        orgData.setNumber(ObjectUtil.isNull(orgData.getNumber()) ? 0 : orgData.getNumber());
+                        orgData.setUseCount(ObjectUtil.isNull(orgData.getUseCount()) ? 0 : orgData.getUseCount());
+                        orgData.setFixCount(ObjectUtil.isNull(orgData.getFixCount()) ? 0 : orgData.getFixCount());
                         tjOrgCountList.add(orgData);
                     }
+                } catch (InterruptedException | ExecutionException e) {
+                    // 处理异常
+                }
+            }
+        });
+
+// 等待所有 CompletableFuture 完成
+        allOf.join();
         if (req.getOrgId()!=1369509498032808905L){
             TjOrgCountDto orgData =equipmentCountSummaryMapper.TjOrgCountleve4(req.getOrgId(),
                     req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),