相关人员 部门导出修改

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

@@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -19,7 +20,7 @@ import java.util.List;
  * @since 2021-04-19
  */
 public interface TaskMapper extends BaseMapper<Task> {
-    List getExecutorPanel(Integer projectId);
+    List<Map<String,Object>> getExecutorPanel(Integer projectId);
     List getStagesPanel(Integer projectId);
     List getTopCostTask(Integer projectId);
 
@@ -44,7 +45,7 @@ public interface TaskMapper extends BaseMapper<Task> {
 
     List<Task> selectMilepost(@Param("ids") List<Integer> ids);
 
-    List getExecutorPlanHour(Integer projectId);
+    List<Map<String,Object>> getExecutorPlanHour(Integer projectId);
     @Update("update task set start_date =null where id=#{id}")
     void updateStartDate(Integer id);
     @Update("update task set end_date =null where id=#{id}")

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

@@ -71,7 +71,11 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
     @Override
     public HttpRespMsg getExecutorPanel(Integer projectId) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data = taskMapper.getExecutorPanel(projectId);
+        List<Map<String, Object>> list = taskMapper.getExecutorPanel(projectId);
+        list.forEach(l->{
+            l.put("type","userName");
+        });
+        msg.data=list;
         return msg;
     }
 
@@ -619,7 +623,11 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
     @Override
     public HttpRespMsg getExecutorPlanHour(Integer projectId) {
         HttpRespMsg httpRespMsg=new HttpRespMsg();
-        httpRespMsg.data=taskMapper.getExecutorPlanHour(projectId);
+        List<Map<String, Object>> list = taskMapper.getExecutorPlanHour(projectId);
+        list.forEach(l->{
+            l.put("type","userName");
+        });
+        httpRespMsg.data=list;
         return httpRespMsg;
     }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/ExcelUtil.java

@@ -40,7 +40,6 @@ public class ExcelUtil {
 
 
     public static String exportGeneralExcelByTitleAndList(WxCorpInfo wxCorpInfo,String title, List<List<String>> list, String downloadPath) {
-        System.out.println(wxCorpInfo.getCorpid());
         String result="系统提示：Excel文件导出成功！";
         String fileName= title+".xls";
         try {