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

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

@@ -47,6 +47,9 @@ public class UserController {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private UserExcludeService excludeService;
+
     @Resource
     private HttpServletRequest request;
 
@@ -452,5 +455,10 @@ public class UserController {
         return allList.stream().filter(all->all.getDepartmentId().intValue() == id).findFirst().get();
     }
 
+    @RequestMapping("/insertUserExclude")
+    public HttpRespMsg insertUserExclude(String userId) {
+        return excludeService.insertUserExclude(userId);
+    }
+
 }
 

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

@@ -0,0 +1,20 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UserExclude extends Model<UserExclude> {
+    /**
+     * 主键
+     */
+    @TableId(value = "user_id")
+    private String id;
+}

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

@@ -0,0 +1,7 @@
+package com.management.platform.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.management.platform.entity.UserExclude;
+
+public interface UserExcludeMapper extends BaseMapper<UserExclude> {
+}

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

@@ -0,0 +1,9 @@
+package com.management.platform.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.management.platform.entity.UserExclude;
+import com.management.platform.util.HttpRespMsg;
+
+public interface UserExcludeService extends IService<UserExclude> {
+    HttpRespMsg insertUserExclude(String userId);
+}

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

@@ -11613,7 +11613,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     @Override
     public HttpRespMsg getEffectiveLaborHourRate(String startDate, String endDate) {
         LambdaQueryWrapper<Department> lqw = new LambdaQueryWrapper<>();
-        lqw.in(Department::getDepartmentId,3759,3899,3900,3901,3902,3903,3904,3906,5719);
+        lqw.in(Department::getDepartmentId,7526,7560,7539,7643,7645,7536,7547,7388,7578);
         List<Department> departments = departmentMapper.selectList(lqw);
 
         ArrayList<LaborHourRateVo> laborHourRateVos = new ArrayList<>();

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

@@ -0,0 +1,36 @@
+package com.management.platform.service.impl;
+
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.management.platform.entity.UserExclude;
+import com.management.platform.mapper.UserExcludeMapper;
+import com.management.platform.service.UserExcludeService;
+import com.management.platform.util.HttpRespMsg;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+@Service
+public class UserExcludeServiceImpl extends ServiceImpl<UserExcludeMapper,UserExclude> implements UserExcludeService{
+
+    @Autowired
+    private UserExcludeMapper userExcludeMapper;
+    @Override
+    public HttpRespMsg insertUserExclude(String userId) {
+        HttpRespMsg msg = new HttpRespMsg();
+
+        if (StringUtils.isNotEmpty(userId)){
+            UserExclude one = userExcludeMapper.selectById(userId);
+            if (one==null){
+                userExcludeMapper.insert(new UserExclude(userId));
+                return msg;
+            }else {
+                msg.setError("已经添加过该人员了");
+                return msg;
+            }
+        }
+        msg.setError("获取参数为空");
+        return msg;
+    }
+}
+