登陆返回项目计划创建权限,返回对应的第一,二审核人

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

@@ -170,6 +170,16 @@ public class UserController {
         return userService.getSimpleActiveUserList(departmentId,request,keyword,cursor);
     }
 
+    @RequestMapping("/getFirstCheckUser")
+    public HttpRespMsg getFirstCheckUserList() {
+        return userService.getFirstCheckUserList(request);
+    }
+
+    @RequestMapping("/getSecondCheckUser")
+    public HttpRespMsg getSecondCheckUser() {
+        return userService.getSecondCheckUserList(request);
+    }
+
     @RequestMapping("/getSimpleActiveUserListPage")
     public HttpRespMsg getSimpleActiveUserListPage(@RequestParam Integer pageIndex, @RequestParam Integer pageSize,Integer departmentId,String keyword,String cursor,@RequestParam(required = false) String userIds) throws Exception {
         return userService.getSimpleActiveUserListPage(pageIndex,pageSize,departmentId,request,keyword,cursor,userIds);

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

@@ -85,7 +85,7 @@ public class Task extends Model<Task> {
     private Integer taskLevel;
 
     /**
-     * 任务状态,0-进行中 1-已完成 2-已撤销
+     * 任务状态,0-进行中 1-已完成 2-已撤销 3-待第一审核人审核 4-待第二审核人审核 5-驳回
      */
     @TableField("task_status")
     private Integer taskStatus;
@@ -213,6 +213,30 @@ public class Task extends Model<Task> {
     @TableField("sap_task_code")
     private String sapTaskCode;
 
+    /**
+     * 任务计划类型 1.出差 2.在办公事处 3.请假
+     */
+    @TableField("task_plan_type")
+    private Integer taskPlanType;
+
+    /**
+     * 是否是任务计划 :0 否 ,1 是 ,默认 0
+     */
+    @TableField("is_task_plan")
+    private Integer isTaskPlan;
+
+    /**
+     * 任务计划第一审核人id
+     */
+    @TableField("check_first_id")
+    private String checkFirstId;
+
+    /**
+     * 任务计划第二审核人id
+     */
+    @TableField("check_second_id")
+    private String checkSecondId;
+
 //    /**文件审核人一[部门负责人]id*/
 //    @TableField("charge_one_id")
 //    private String chargeOneId;

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

@@ -16,6 +16,8 @@ public class UserVO extends User {
     private Long remainingTime;
     //是否是项目经理
     private boolean isLeader;
+    //是否是项目小组长
+    private boolean isProjectLeader;
     private Company company;
 
     //模块菜单的访问权限

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

@@ -114,4 +114,8 @@ public interface UserService extends IService<User> {
     HttpRespMsg removeUserIsMachine(String id, HttpServletRequest request);
 
     HttpRespMsg getUserIsMachineList(HttpServletRequest request);
+
+    HttpRespMsg getFirstCheckUserList(HttpServletRequest request);
+
+    HttpRespMsg getSecondCheckUserList(HttpServletRequest request);
 }

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

@@ -223,6 +223,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Resource
     private ProjectDeptRelateMapper projectDeptRelateMapper;
 
+    @Resource
+    private ProjectLeaderService projectLeaderService;
+
     @Resource
     private LdapTemplate ldapTemplate;
     @Resource
@@ -293,6 +296,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 //检测是否是项目审核人，有没有权限进行审核
                 userVO.setLeader(judgeIsLeader(userVO.getId()));
 
+                if(company.getId()==Constant.MLD_COMPANY_ID) {
+                    //检测是否是项目小组长，有没有权限进行添加计划
+                    userVO.setProjectLeader(judgeIsProjectLeader(userVO.getId(),company.getId()));
+                }
+
                 userVO.setTimeType(timeTypeMapper.selectById(company.getId()));
                 List<Department> manageDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", userVO.getId()));
                 List<Integer> deptIds = manageDeptList.stream().map(Department::getDepartmentId).collect(Collectors.toList());
@@ -755,6 +763,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return cnt>0;
     }
 
+    private boolean judgeIsProjectLeader(String userId,Integer companyId) {
+        int cnt = projectLeaderService.count(new QueryWrapper<ProjectLeader>().eq("leader_id", userId).eq("company_id", companyId));
+        return cnt>0;
+    }
+
     //获取用户信息
     @Override
     public HttpRespMsg getUserInfo(String id) {
@@ -2764,6 +2777,57 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         }
     }
 
+    @Override
+    public HttpRespMsg getFirstCheckUserList(HttpServletRequest request) {
+        HttpRespMsg msg = new HttpRespMsg();
+        String token = request.getHeader("TOKEN");
+        User user = userMapper.selectById(token);
+        if (user.getCompanyId() != Constant.MLD_COMPANY_ID) {
+            msg.setData(new ArrayList<User>());
+            return msg;
+        } else {
+
+            List<SysRole> sysRoles = sysRoleMapper.selectList(new QueryWrapper<SysRole>().eq("company_id", user.getCompanyId()).eq("rolename", "项目经理"));
+            if (!sysRoles.isEmpty()) {
+                List<User> userList = userMapper.selectList(new QueryWrapper<User>()
+                        .eq("company_id", user.getCompanyId())
+                        .eq("is_active", 1)
+                        .eq("role_id", sysRoles.get(0).getId()));
+                msg.setData(userList);
+            } else {
+                msg.setData(new ArrayList<User>());
+            }
+            return msg;
+        }
+    }
+
+    @Override
+    public HttpRespMsg getSecondCheckUserList(HttpServletRequest request) {
+        HttpRespMsg msg = new HttpRespMsg();
+        String token = request.getHeader("TOKEN");
+        User user = userMapper.selectById(token);
+        if (user.getCompanyId() != Constant.MLD_COMPANY_ID) {
+            msg.setData(new ArrayList<User>());
+            return msg;
+        } else {
+
+            List<SysRole> sysRoles = sysRoleMapper.selectList(new QueryWrapper<SysRole>().eq("company_id", user.getCompanyId()).eq("rolename", "区域经理&PM"));
+            if (!sysRoles.isEmpty()) {
+                List<User> userList = userMapper.selectList(new QueryWrapper<User>()
+                        .eq("company_id", user.getCompanyId())
+                        .eq("is_active", 1)
+                        .eq("role_id", sysRoles.get(0).getId()));
+                msg.setData(userList);
+            } else {
+                msg.setData(new ArrayList<User>());
+            }
+            return msg;
+        }
+    }
+
+
+
+
     @Override
     public HttpRespMsg getUserListByRole(HttpServletRequest request,String tableName) {
         HttpRespMsg httpRespMsg=new HttpRespMsg();

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

@@ -92,7 +92,7 @@ public class CodeGenerator {
 
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://1.94.62.58:17089/man_dev?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
+        dsc.setUrl("jdbc:mysql://1.94.62.58:17089/man_mld?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
 //        dsc.setSchemaName("public");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");

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

@@ -33,6 +33,10 @@
         <result column="ahead_tid" property="aheadTid" />
         <result column="sap_task_code" property="sapTaskCode" />
         <result column="plan_cost" property="planCost" />
+        <result column="task_plan_type" property="taskPlanType" />
+        <result column="is_task_plan" property="isTaskPlan" />
+        <result column="check_first_id" property="checkFirstId" />
+        <result column="check_second_id" property="checkSecondId" />
         <result column="attach_file_required" property="attachFileRequired" />
     </resultMap>