审核他人文件

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/TaskServiceImpl.java

@@ -1005,16 +1005,18 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         }
 
         List<OtherTaskFileInfoVO> list = taskMapper.getOtherTaskChargePage(queryBO,branchDepartment);
-//        List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, user.getCompanyId())
-//                .eq(User::getIsActive, 1)
-//        );
+        List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, user.getCompanyId())
+                .eq(User::getIsActive, 1)
+        );
 
 //        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id",user.getCompanyId()));
 //        CompanyDingding dingding = companyDingdingService.getOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
 
-//        if(CollectionUtils.isNotEmpty(list)){
-//            Map<String, User> userMap = users.stream().collect(Collectors.toMap(User::getId, t -> t));
-//            for (OtherTaskFileInfoVO otherTaskFileInfoVO : list) {
+        if(CollectionUtils.isNotEmpty(list)){
+            Map<String, User> userMap = users.stream().collect(Collectors.toMap(User::getId, t -> t));
+            for (OtherTaskFileInfoVO otherTaskFileInfoVO : list) {
+                User chargeUser = userMap.getOrDefault(otherTaskFileInfoVO.getFinalChargeId(), null);
+                otherTaskFileInfoVO.setFinalChargeName(null==chargeUser?"":chargeUser.getName());
 //                User createrUser = userMap.get(otherTaskFileInfoVO.getCreatorId());
 //                User finalChargeUser = userMap.get(otherTaskFileInfoVO.getFinalChargeId());
 //                String createrUserWxId = "";
@@ -1036,8 +1038,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
 //                }else{
 //                    otherTaskFileInfoVO.setFinalChargeName(finalChargeUser.getName());
 //                }
-//            }
-//        }
+            }
+        }
 
         int total = taskMapper.getOtherTaskChargePageTotal(queryBO,branchDepartment);
         Map<String, Object> map = new HashMap<>();

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskMapper.xml

@@ -741,7 +741,7 @@
     <select id="getOtherTaskChargePage" resultType="com.management.platform.entity.vo.OtherTaskFileInfoVO">
         select tf.task_id,task.name as taskName
         ,p.id as projectId,p.project_name
-        ,tf.creator_id,tf.document_name
+        ,tf.creator_id,tf.creator_name,tf.document_name
         ,case tf.charge_stage
         when 1 then tf.charge_one_id when 2 then tf.charge_two_id
         end as final_charge_id