Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -164,7 +164,8 @@ public class Clue extends Model<Clue> {
     private List<ActionLog> clueLogList;
     @TableField(exist = false)
     private List<UploadFile> files;
-
+    @TableField(exist = false)
+    private List<Task> taskList;
 
 
     @Override

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

@@ -2,9 +2,12 @@ package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+
 import java.time.LocalDate;
+
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -15,7 +18,7 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author Seyason
@@ -26,7 +29,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class Task extends Model<Task> {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
@@ -36,6 +39,8 @@ public class Task extends Model<Task> {
      */
     @TableField("task_name")
     private String taskName;
+    @TableField(exist = false)
+    private String executorName;
 
     /**
      * 公司id
@@ -116,7 +121,7 @@ public class Task extends Model<Task> {
     private Integer repeatType;
 
     /**
-     * 重复永不结束   1:勾选  
+     * 重复永不结束   1:勾选
      */
     @TableField("repeat_end_never")
     private Integer repeatEndNever;
@@ -222,7 +227,7 @@ public class Task extends Model<Task> {
      */
     @TableField("plate5")
     private String plate5;
-
+    @TableField(exist = false)
     private List<String> executorNames;
 
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/TaskMapper.java

@@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.management.platform.entity.Clue;
 import com.management.platform.entity.Task;
 import com.management.platform.entity.TimeTask;
 import com.management.platform.entity.dto.TaskDto;
 import com.management.platform.entity.vo.TasKVo;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
@@ -62,4 +64,6 @@ public interface TaskMapper extends BaseMapper<Task> {
     List<TasKVo> getPageListTotalTask(TaskDto taskDto);
 
     void updateRepeatConfig(Task task);
+    @Select("select * , (select `name` from `user` where id = executor_id) executorName from task where clue_id = #{id} ORDER BY id DESC")
+    List<Task> selectByInfoList(Clue clue1);
 }

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

@@ -15,6 +15,7 @@ import com.management.platform.service.SysFunctionService;
 import com.management.platform.service.UserService;
 import com.management.platform.service.WxCorpInfoService;
 import com.management.platform.util.HttpRespMsg;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -49,6 +50,8 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
     @Autowired
     private ClueMapper clueMapper;
     @Autowired
+    private TaskMapper taskMapper;
+    @Autowired
     private ClueUploadfileMapper clueUploadfileMapper;
     @Resource
     private WxCorpInfoService wxCorpInfoService;
@@ -165,6 +168,23 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
         Clue clue1 = clueMapper.selectById(clue.getId());
         clue1.setClueLogList(actionLogMapper.selectByInfoList(clue1));
         clue1.setFiles(uploadFileMapper.selectByInfoList(clue1));
+        List<Task> tasks = taskMapper.selectList(new QueryWrapper<Task>().in("clue_id", clue.getId()));
+        for (Task task : tasks) {
+            String executorId = task.getExecutorId();
+            List<String> ids1 = new ArrayList<>();
+            List<String> userNames = new ArrayList<>();
+            if (!executorId.isEmpty()) {
+                for (String id : executorId.split(",")) {
+                    ids1.add(id);
+                }
+                List<User> users = userMapper.selectList(new QueryWrapper<User>().in("id", ids1));
+                for (User user : users) {
+                    userNames.add(user.getName());
+                }
+                task.setExecutorNames(userNames);
+            }
+            clue1.setTaskList(tasks);
+        }
         return clue1;
     }