任务模块代码修改

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/vo/TasKVo.java

@@ -29,7 +29,7 @@ public class TasKVo extends Task {
     private String contactsPhone;
 
 
-    private List taskExecutors;
+    private List<String> taskExecutors;
 
 
 }

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

@@ -186,9 +186,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                         filter(taskExecutor -> taskExecutor.getCompanyId().equals(user.getCompanyId()))
                         .collect(Collectors.toList());
                 if (!collect.isEmpty()){
-                    List<String> collect1 = collect.stream().map(TaskExecutor::getExecutorId).collect(Collectors.toList());
-                    ArrayList<String> taskExecutorIds = new ArrayList<>(collect1);
-                    tasKVo.setTaskExecutors(taskExecutorIds);
+                    List<String> collect1 = collect.stream().map(TaskExecutor::getExecutorName).collect(Collectors.toList());
+                    tasKVo.setTaskExecutors(collect1);
                 }
             }
             if (!taskLogList.isEmpty()){
@@ -704,6 +703,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         User user = userMapper.selectById(request.getHeader("token"));
         SysForm sysForm = sysFormMapper.selectOne(new LambdaQueryWrapper<SysForm>().eq(SysForm::getCompanyId, user.getCompanyId()).eq(SysForm::getCode, "Task").eq(SysForm::getIsCurrent, 1));
         WxCorpInfo wxCorpInfo = wxCorpInfoService.getOne(new LambdaQueryWrapper<WxCorpInfo>().eq(WxCorpInfo::getCompanyId, user.getCompanyId()));
+        List<TaskExecutor> taskExecutorList = taskExecutorMapper.selectList(new LambdaQueryWrapper<TaskExecutor>().eq(TaskExecutor::getCompanyId,user.getCompanyId()));
+        List<TaskLog> taskLogList = taskLogMapper.selectList(new LambdaQueryWrapper<TaskLog>().eq(TaskLog::getCompanyId,user.getCompanyId()));
         String config = sysForm.getConfig();
         JSONObject configOb = JSON.parseObject(config);
         JSONArray configObJSONArray = configOb.getJSONArray("list");
@@ -719,16 +720,20 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         taskDto.setPageIndex(null).setPageSize(null);//暂时部不分页
         List<TasKVo> taskVoList =taskMapper.getPageListTask(taskDto);
         if (!taskVoList.isEmpty()){
-            taskVoList.forEach(tasKVo -> {
-                if (!tasKVo.getTaskExecutors().isEmpty()){
-                    Integer taskId = tasKVo.getId();
-                    LambdaQueryWrapper<TaskExecutor> lqw = new LambdaQueryWrapper<>();
-                    lqw.eq(TaskExecutor::getTaskId,taskId);
-                    List<TaskExecutor> taskExecutors = taskExecutorMapper.selectList(lqw);
-                    tasKVo.setTaskExecutors(taskExecutors);
+            for (TasKVo tasKVo : taskVoList) {
+                if (!taskExecutorList.isEmpty()){
+                    List<TaskExecutor> collect = taskExecutorList.stream().
+                            filter(taskExecutor -> taskExecutor.getTaskId().equals(tasKVo.getId())).
+                            filter(taskExecutor -> taskExecutor.getCompanyId().equals(user.getCompanyId()))
+                            .collect(Collectors.toList());
+                    if (!collect.isEmpty()){
+                        List<String> collect1 = collect.stream().map(TaskExecutor::getExecutorName).collect(Collectors.toList());
+                        tasKVo.setTaskExecutors(collect1);
+                    }
                 }
-            });
+            }
         }
+
         for (TasKVo tasKVo : taskVoList) {
             List<String> item=new ArrayList<>();
             for (int i = 0; i < configObJSONArray.size(); i++) {
@@ -751,33 +756,51 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 if(model.equals("taskName")){
                     value = String.valueOf(aClass.getMethod("getTaskName").invoke(tasKVo)).equals("null")?"":String.valueOf(aClass.getMethod("getTaskName").invoke(tasKVo));
                 }
-                if(model.equals("priority")){
+                else if(model.equals("priority")){
                     value = String.valueOf(aClass.getMethod("getPriority").invoke(tasKVo)).equals("null")?"":String.valueOf(aClass.getMethod("getPriority").invoke(tasKVo));
                 }
-                if(model.equals("executorId")){
+                else if(model.equals("executorId")){
                     StringJoiner stringJoiner = new StringJoiner(",");
-                    List<TaskExecutor> taskExecutors = tasKVo.getTaskExecutors();
+                    List<String> taskExecutors = tasKVo.getTaskExecutors();
                     if (taskExecutors!=null&&!taskExecutors.isEmpty()){
-                        for (TaskExecutor taskExecutor : taskExecutors) {
-                            stringJoiner.add(taskExecutor.getExecutorName());
+                        for (String taskExecutor : taskExecutors) {
+                            stringJoiner.add(taskExecutor);
                         }
                     }
                     value =stringJoiner.length()==0?"":stringJoiner.toString();
                 }
-                if(model.equals("startDate")){
+                else if(model.equals("startDate")){
                     if (tasKVo.getStartDate()!=null){
                         Date startDate = tasKVo.getStartDate();
                         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
                         value=format.format(startDate);
                     }
                 }
-                if(model.equals("endDate")){
+                else if(model.equals("endDate")){
                     if (tasKVo.getEndDate()!=null){
                         Date endDate = tasKVo.getEndDate();
                         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
                         value=format.format(endDate);
                     }
                 }
+                else if(model.equals("customId")){
+                    value = String.valueOf(aClass.getMethod("getCustomName").invoke(tasKVo)).equals("null")?"":String.valueOf(aClass.getMethod("getCustomName").invoke(tasKVo));
+                }
+                else if(model.equals("businessOpportunityId")){
+                    value = String.valueOf(aClass.getMethod("getBusinessName").invoke(tasKVo)).equals("null")?"":String.valueOf(aClass.getMethod("getBusinessName").invoke(tasKVo));
+                }
+                else if(model.equals("orderId")){
+                    value = String.valueOf(aClass.getMethod("getOrderName").invoke(tasKVo)).equals("null")?"":String.valueOf(aClass.getMethod("getOrderName").invoke(tasKVo));
+                }
+                else if(model.equals("clueId")){
+                    value = String.valueOf(aClass.getMethod("getClueName").invoke(tasKVo)).equals("null")?"":String.valueOf(aClass.getMethod("getClueName").invoke(tasKVo));
+                }
+                else if(model.equals("contactsId")){
+                    value = String.valueOf(aClass.getMethod("getContactsName").invoke(tasKVo)).equals("null")?"":String.valueOf(aClass.getMethod("getContactsName").invoke(tasKVo));
+                }
+                else if(model.equals("phone")){
+                    value = String.valueOf(aClass.getMethod("getContactsPhone").invoke(tasKVo)).equals("null")?"":String.valueOf(aClass.getMethod("getContactsPhone").invoke(tasKVo));
+                }
                 item.add(value);
             }
             dataList.add(item);