工作计划导出加创建人

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

@@ -1930,6 +1930,7 @@ public class TaskController {
         titleList.add("一级审核人");
         titleList.add("二级审核人");
         titleList.add("审核状态");
+        titleList.add("创建人");
         titleList.add("开始时间");
         titleList.add("截止时间");
         boolean anyMatch = projectList.stream().anyMatch(p -> p.getDeptId() != null && !StringUtils.isEmpty(p.getDeptId()));
@@ -1999,6 +2000,19 @@ public class TaskController {
                         break;
                 }
             }
+
+            //创建人
+            if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+                String createrId = task.getCreaterId();
+                User user = userMapper.selectById(createrId);
+                item.add((String)("$userName="+user.getCorpwxUserid()+"$"));
+
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+                item.add((String)("$userName="+task.getCreaterName()+"$"));
+            }else {
+                item.add(task.getCreaterName());
+            }
+
             item.add(task.getStartDate()==null?"":df.format(task.getStartDate()));
             item.add(task.getEndDate()==null?"":df.format(task.getEndDate()));
             if(anyMatch){

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

@@ -150,6 +150,7 @@
         <result column="second_auditor_id" property="secondAuditorId" />
         <result column="second_auditor_name" property="secondAuditorName" />
         <result column="reject_user_name" property="rejectUserName" />
+        <result column="creater_name" property="createrName" />
     </resultMap>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -847,7 +848,7 @@
 
     <select id="getMyAuditTaskList"
             resultMap="AuditorResultMap">
-        SELECT task.*, task_executor.`first_auditor_id`, group_concat(task_executor.`second_auditor_id`) as second_auditor_id, u1.name AS first_auditor_name, group_concat(u2.`name`) AS second_auditor_name, project.`project_name`, stages.stages_name
+        SELECT task.*, task_executor.`first_auditor_id`, group_concat(task_executor.`second_auditor_id`) as second_auditor_id, u1.name AS first_auditor_name, group_concat(u2.`name`) AS second_auditor_name, project.`project_name`, stages.stages_name,task.creater_name
         FROM task LEFT JOIN task_executor ON task.id = task_executor.`task_id`
         left join project on project.id = task.`project_id`
         LEFT JOIN `user` u1 ON u1.id = task_executor.`first_auditor_id` LEFT JOIN `user` u2 ON u2.id = task_executor.`second_auditor_id`