填报及时率

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

@@ -923,9 +923,15 @@ public class ProjectController {
     public HttpRespMsg getTimeCostByUserCustom(String startDate,String endDate,String subCustomName,Integer customId,HttpServletRequest request,String fieldName){
         return  projectService.getTimeCostByUserCustom(startDate,endDate,subCustomName,customId,request,fieldName);
     }
+
     @RequestMapping("/exportTimeCostByUserCustom")
     public HttpRespMsg exportTimeCostByUserCustom(String startDate,String endDate,String subCustomName,Integer customId,HttpServletRequest request,String fieldName){
         return projectService.exportTimeCostByUserCustom(startDate,endDate,subCustomName,customId,request,fieldName);
     }
+
+    @RequestMapping("/importPersonnelWithGroup")
+    public HttpRespMsg importPersonnelWithGroup(MultipartFile file,HttpServletRequest request){
+        return projectService.importPersonnelWithGroup(file,request);
+    }
 }
 

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

@@ -21,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -220,5 +221,30 @@ public class TaskGroupController {
         return msg;
     }
 
+    @RequestMapping("/detail")
+    public HttpRespMsg detail(Integer groupId,HttpServletRequest request){
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
+        User user = userMapper.selectById(request.getHeader("token"));
+        TaskGroup taskGroup = taskGroupService.getById(groupId);
+        List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()));
+        HashMap map=new HashMap();
+        if(taskGroup.getInchargerId()!=null){
+            User incharger = userMapper.selectById(taskGroup.getInchargerId());
+            map.put("incharger",incharger.getName());
+        }else {
+            map.put("incharger",null);
+        }
+        List<GroupParticipator> participatorList = groupParticipatorMapper.selectList(new QueryWrapper<GroupParticipator>().eq("group_id", groupId));
+        for (GroupParticipator participator : participatorList) {
+            Optional<User> first = userList.stream().filter(ul -> ul.getId().equals(participator.getUserId())).findFirst();
+            if(first.isPresent()){
+                participator.setUserName(first.get().getName());
+            }
+        }
+        map.put("participators",participatorList);
+        httpRespMsg.data=map;
+        return httpRespMsg;
+    }
+
 }
 

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

@@ -1,14 +1,15 @@
 package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 
@@ -33,6 +34,9 @@ public class GroupParticipator extends Model<GroupParticipator> {
     @TableField("user_id")
     private String userId;
 
+    @TableField(exist = false)
+    private String userName;
+
 
     @Override
     protected Serializable pkVal() {

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

@@ -179,4 +179,6 @@ public interface ProjectService extends IService<Project> {
     HttpRespMsg getTimeCostByUserCustom(String startDate, String endDate, String subCustomName, Integer customId,HttpServletRequest request,String fieldName);
 
     HttpRespMsg exportTimeCostByUserCustom(String startDate, String endDate, String subCustomName, Integer customId, HttpServletRequest request, String fieldName);
+
+    HttpRespMsg importPersonnelWithGroup(MultipartFile file, HttpServletRequest request);
 }