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

fhKeeper/formulahousekeeper/inva_4_tivo/css/index.css

@@ -70,10 +70,11 @@
 
 /* 图片 */
 .bannarIMgGam {
-    width: 62.5rem;    /* height: 34.625rem; */
+    width: 62.5rem;
+    /* height: 34.625rem; */
     position: absolute;
-    top: 150px;
-    right: -30px;
+    top: 13.75rem;
+    right: 3.4375rem;
     z-index: 1;
 }
 

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);
 }

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

@@ -517,6 +517,12 @@ public class DingDingServiceImpl implements DingDingService {
         }
     }
 
+    private synchronized String getPrivateAT(String corpid) throws ApiException {
+        CompanyDingding companyDingding = companyDingdingMapper.selectById(corpid);
+        String accessToken = getInnerCorpToken(companyDingding);
+        return accessToken;
+    }
+
     @Override
     public HttpRespMsg getUserByCode(String code, String corpid) {
         DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/getuserinfo");
@@ -529,8 +535,7 @@ public class DingDingServiceImpl implements DingDingService {
         try {
             String accessToken = null;
             if (isPrivateDeploy) {
-                CompanyDingding companyDingding = companyDingdingMapper.selectById(corpid);
-                accessToken = getInnerCorpToken(companyDingding);
+                getPrivateAT(corpid);
             } else {
                 accessToken = getValidCorpAccessToken(corpid);
             }

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

@@ -4582,7 +4582,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         days-=leaveSheet.getTimeDays();
                     }
                     for (LocalDateTime localDateTime : leaveDateList) {
-                        if(mapList.stream().anyMatch(ml->{
+                        if(mapList!=null&&mapList.stream().anyMatch(ml->{
                             Object date = ml.get("createDate");
                             LocalDate createDate = LocalDate.parse(String.valueOf(date));
                             return createDate.isEqual(localDateTime.toLocalDate());
@@ -4625,10 +4625,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         break;
                     }
                     if(createTimeDate.isBefore(createDate)||createTimeDate.isEqual(createDate)){
-                        if(!leaveSheets.stream().anyMatch(ls->(createTimeDate.isAfter(ls.getStartDate())||createTimeDate.isEqual(ls.getStartDate()))&&
-                                (createTimeDate.isBefore(ls.getEndDate())||createTimeDate.isEqual(ls.getEndDate())))){
-                            num++;
-                        }
+                        num++;
                     }
                 }
                 System.out.println(days);
@@ -5367,6 +5364,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         return httpRespMsg;
     }
 
+    @Override
+    public HttpRespMsg importPersonnelWithGroup(MultipartFile file, HttpServletRequest request) {
+        return null;
+    }
+
 
     private List<Department> getSubDepts(Department dp, List<Department> list) {
         List<Department> collect = list.stream().filter(l -> dp.getDepartmentId().equals(l.getSuperiorId())).collect(Collectors.toList());

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

@@ -1418,7 +1418,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             }else {
                                 json.put("template_id","tty9TkCAAANpvEtLrkPUGeOEd1-U7W2w");
                             }
-                            item.put("key","填报日期");
+                            item.put("key","日期");
                             item.put("value",report.getCreateDate());
                             dataJson.add(item);
                             json.put("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://mobworktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
@@ -2184,7 +2184,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             item.put("value",user.getName());
                             item.put("key","评价");
                             item.put("value",report.getEvaluate());
-                            item.put("key","填报日期");
+                            item.put("key","日期");
                             item.put("value",report.getCreateDate());
                             dataJson.add(item);
                             json.put("template_id","tty9TkCAAAWoUyhGnXRCZuhkgCqw_Uow");