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

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

@@ -352,9 +352,6 @@ public class TjServiceImpl implements TjService {
         // 等待所有 CompletableFuture 完成
         allOf.join();
 
-        tjOrgPriceDtoList = futures.stream()
-                .map(CompletableFuture::join)
-                .collect(Collectors.toList());
 
         if (req.getOrgId()!=1369509498032808905L){
             //获取本级数据
@@ -430,7 +427,7 @@ public class TjServiceImpl implements TjService {
         finalTjOrgPriceDto.setEndPrice(BigDecimal.ZERO);
         finalTjOrgPriceDto.setDestoryPrice(BigDecimal.ZERO);
         List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
-        List<TjOrgPriceDto> tjOrgPriceDtoList=new ArrayList<>();
+
         //根据条件查询财务汇总表
         List<CompletableFuture<TjOrgPriceDto>> futures = orgList.stream()
                 .map(orgId -> CompletableFuture.supplyAsync(() ->
@@ -442,7 +439,9 @@ public class TjServiceImpl implements TjService {
         // 等待所有 CompletableFuture 完成
         allOf.join();
 
-        tjOrgPriceDtoList = futures.stream()
+        List<TjOrgPriceDto> tjOrgPriceDtoList = orgList.parallelStream()
+                .map(orgId -> CompletableFuture.supplyAsync(() ->
+                        priceSumSummaryMapper.TjOrgPrice(orgId, req.getYear(), req.getTypeIdsList(), req.getSizeNameList())))
                 .map(CompletableFuture::join)
                 .collect(Collectors.toList());
 

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java

@@ -304,7 +304,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             sendReq.setMsgTitle("您的审批被驳回");
             sendReq.setBizType("refuse/"+Types);
             sendReq.setBizId(Long.valueOf(task.getProcessInstanceId()));
-            sendReq.setMsgContent("您提交的审批【"+mainProcess.getName()+"】被驳回");
+            sendReq.setMsgContent("您提交的审批【"+mainProcess.getName()+"】被驳回，原因:"+handleDataDTO.getComments());
             sendReq.setPriority("0");
             sendReq.setSendTime(DateTime.now());
             messageApi.sendMessage(sendReq);