更新任务状态姓名添加

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskProgressController.java

@@ -47,8 +47,8 @@ public class TaskProgressController {
     }
 
     @RequestMapping("/list")
-    public HttpRespMsg list(Integer taskId) {
-        return taskProgressService.getList(taskId);
+    public HttpRespMsg list(Integer taskId,HttpServletRequest request) {
+        return taskProgressService.getList(taskId,request);
     }
 }
 

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

@@ -20,5 +20,5 @@ public interface TaskProgressService extends IService<TaskProgress> {
 
     HttpRespMsg deleteProgress(Integer id, HttpServletRequest request);
 
-    HttpRespMsg getList(Integer taskId);
+    HttpRespMsg getList(Integer taskId,HttpServletRequest request);
 }

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

@@ -166,10 +166,26 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
     }
 
     @Override
-    public HttpRespMsg getList(Integer taskId) {
+    public HttpRespMsg getList(Integer taskId,HttpServletRequest request) {
+        String token = request.getHeader("token");
+        User user = userMapper.selectById(token);
         //倒序，最新的在最上面
         List<TaskProgress> taskProgressList
                 = taskProgressMapper.selectList(new QueryWrapper<TaskProgress>().eq("task_id", taskId).orderByDesc("id"));
+        List<User> users = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()));
+        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
+        for (TaskProgress taskProgress : taskProgressList) {
+            for (User item : users) {
+                if (item.getId().equals(taskProgress.getCreatorId())){
+                    if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+                        taskProgress.setCreatorName(item.getCorpwxRealUserid());
+                    }else {
+                        taskProgress.setCreatorName(item.getName());
+                    }
+                    break;
+                }
+            }
+        }
         HttpRespMsg msg = new HttpRespMsg();
         msg.data = taskProgressList;
         return msg;