修改业务管理中审核未看到单据bug

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

@@ -85,6 +85,9 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
     @Resource
     private BusFormMapper busFormMapper;
 
+    @Resource
+    private PolicemanService policemanService;
+
     public Object addEs() {
         List<BusForm> esDto=this.list();
         return busFormRepository.saveAll(esDto);
@@ -167,6 +170,11 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
                 updateById(busForm);
             } else {
                 //保存
+                //将创建人员添加（为的是将审核员创建的单子，审核员能看见）
+                //将该组织机构下的所有审核人员进行查询，并添加到historyAssign中
+                String userIds=policemanService.searchUserByRoleId(req.getOrgId());
+                String userId=LoginContext.getContext().getLoginUser().getUserId().toString()+","+userIds;
+                busForm.setHistoryAssign(userId);
                 this.save(busForm);
             }
             Task currentTask = taskService.createTaskQuery().processInstanceId(substring).singleResult();
@@ -182,6 +190,11 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
                 updateById(busForm);
             } else {
                 //保存
+                //将创建人员添加（为的是将审核员创建的单子，审核员能看见）
+                //将该组织机构下的所有审核人员进行查询，并添加到historyAssign中
+                String userIds=policemanService.searchUserByRoleId(req.getOrgId());
+                String userId=LoginContext.getContext().getLoginUser().getUserId().toString()+","+userIds;
+                busForm.setHistoryAssign(userId);
                 this.save(busForm);
             }
         }else {
@@ -190,6 +203,11 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
                 updateById(busForm);
             } else {
                 //保存
+                //将创建人员添加（为的是将审核员创建的单子，审核员能看见）
+                //将该组织机构下的所有审核人员进行查询，并添加到historyAssign中
+                String userIds=policemanService.searchUserByRoleId(req.getOrgId());
+                String userId=LoginContext.getContext().getLoginUser().getUserId().toString()+","+userIds;
+                busForm.setHistoryAssign(userId);
                 this.save(busForm);
             }
         }

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

@@ -163,6 +163,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     @Resource
     private IStoredEncryptApi iStoredEncryptApi;
 
+    @Resource
+    private PolicemanService policemanService;
+
     private static final String REDIS_POLICE = "Policeman_";
     private static final String REDIS_ORG = "Organization_";
 
@@ -1728,6 +1731,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             reassignment.setOrderCode(orderNum.getBussinessType()+orderNum.getYear()+
                     String.format("%02d", LocalDateTime.now().getMonth().getValue())+
                     String.format("%02d",LocalDateTime.now().getDayOfMonth())+codeValue);
+            String userIds=policemanService.searchUserByRoleId(req.getOrgId());
+            String userId=LoginContext.getContext().getLoginUser().getUserId().toString()+","+userIds;
+            reassignment.setHistoryAssign(userId);
             reassignmentService.save(reassignment);
         }
         //执行工作流（如果点击提交接入审核流）

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

@@ -719,7 +719,6 @@ 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<>();
-
         String[] splitStart = req.getStartTime().split("-");
         String[] splitEnd =req.getEndTime().split("-");
         Integer year=Integer.parseInt(splitStart[0] );
@@ -728,6 +727,7 @@ public class TjServiceImpl implements TjService {
         for (int i = Integer.parseInt(splitStart[1]) ; i <= Integer.parseInt(splitEnd[1]); i++) {
             monthList.add(i);
         }
+        req.setMonthList(monthList);
         List<CompletableFuture<TjOrgCountDto>> futures = orgList.stream()
                 .map(orgId -> CompletableFuture.supplyAsync(() ->
                         equipmentCountSummaryMapper.TjOrgCount(orgId,
@@ -736,9 +736,8 @@ public class TjServiceImpl implements TjService {
                 )
                 .collect(Collectors.toList());
 // 等待所有 CompletableFuture 完成
-        CompletableFuture<Void> allOf = CompletableFuture.allOf(
-                futures.toArray(new CompletableFuture[0])
-        );
+        CompletableFuture<Void> allOf = CompletableFuture.allOf( futures.toArray(new CompletableFuture[0]));
+
 
         allOf.join();
         tjOrgCountList = futures.stream()