优化代码结构

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkTimeOrderMapper.java

@@ -38,7 +38,7 @@ public interface WorkTimeOrderMapper extends BaseMapper<WorkTimeOrder> {
 
     int updateStatusById(@Param("reviewerId") Integer reviewerId,@Param("id") Integer id,@Param("reason") String reason);
 
-    List<WorkTimeOrder> queryByPage(@Param("status") Integer status, @Param("projectId") Integer projectId, @Param("types") List<Integer> types);
+    List<WorkTimeOrder> queryByPage(@Param("status") Integer status, @Param("projectId")List<Integer> projectIds, @Param("types") List<Integer> types);
 
     /**
      * 根据填报项目类型获取次数和工时汇总

wisenergy-mapper/src/main/resources/mapper/WorkTimeOrderMapper.xml

@@ -111,8 +111,11 @@
         FROM
         <include refid="table"/>
         <where>
-            <if test="null != projectId">
-            AND   project_id = #{projectId}
+            <if test="null != projectIds">
+            AND   project_id IN
+                <foreach collection="projectIds" item="projectId" open="(" close=")" separator=",">
+                    #{projectId}
+                </foreach>
             </if>
             <if test="null != status">
             AND status = #{status}

wisenergy-model/src/main/java/cn/wisenergy/model/enums/ProjectTypeEnum.java

@@ -5,7 +5,7 @@ public enum ProjectTypeEnum {
     BUSINESS_OPPORTUNITY(2, "商机", 1),
     LEAVE(3, "请假", 2),
     COMPENSATORY_LEAVE(4, "调休", 2),
-    EXTERNAL_BUSINESS(5, "外部商务与技术交流", 3),
+    EXTERNAL_BUSINESS(5, "外部商务与、技术交流", 3),
     INTERNAL_TRAINING(6, "内部培训、技术准备、管理", 3),
     OTHER_NON_PROJECTS(7, "其他非项目/商机工作", 3),
     ;

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java

@@ -3,7 +3,9 @@ package cn.wisenergy.service.impl;
 import cn.wisenergy.common.utils.DateUtil;
 import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
 import cn.wisenergy.common.utils.exception.BaseCustomException;
+import cn.wisenergy.mapper.WorkProjectMapper;
 import cn.wisenergy.mapper.WorkTimeOrderMapper;
+import cn.wisenergy.mapper.WorkUserMapper;
 import cn.wisenergy.model.app.*;
 import cn.wisenergy.model.dto.*;
 import cn.wisenergy.model.enums.ProjectTypeEnum;
@@ -39,9 +41,15 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
     @Autowired
     private WorkUserService workUserService;
 
+    @Autowired
+    private WorkUserMapper workUserMapper;
+
     @Autowired
     private WorkProjectService workProjectService;
 
+    @Autowired
+    private WorkProjectMapper workProjectMapper;
+
     @Autowired
     private WorkTimeOrderMapper workTimeOrderMapper;
 
@@ -440,13 +448,11 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         log.info("WorkOrderServiceImpl[]getExamineApplets[]input.param.userId:{},projectId:{},type:{}" + userId, projectId, type);
         isManager(userId);
         WorkUser user = workUserService.getById(userId);
-        // 项目经理
-        if (1 == user.getLevel()) {
+        if (0 != user.getLevel()) {
             QueryWrapper<WorkTimeOrder> wrapper = new QueryWrapper<>();
-            projectId = projectId == null ? workProjectService.getByManagerId(userId).get(0).getId() : projectId;
-            // wrapper.eq("dept_id", user.getDeptId());
             wrapper.in("status", COMPLETED, RE_SUBMIT);
-            wrapper.eq("project_id", projectId);
+            wrapper.eq(type != null, "type", type);
+            wrapper.eq(projectId != null, "project_id", projectId);
             wrapper.orderByDesc("work_day");
             List<WorkTimeOrder> workTimeOrders = workTimeOrderMapper.selectList(wrapper);
             if (CollectionUtils.isEmpty(workTimeOrders)) {
@@ -454,20 +460,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             }
             return getDto(workTimeOrders);
         }
-        // 部门经理
-        if (2 == user.getLevel()) {
-            type = null == type ? 5 : type;
-            Integer deptId = user.getDeptId();
-            QueryWrapper<WorkTimeOrder> wrapper = new QueryWrapper<>();
-            wrapper.eq("dept_id", deptId);
-            wrapper.in("status", COMPLETED, RE_SUBMIT);
-            wrapper.eq("type", type);
-            List<WorkTimeOrder> workTimeOrders = workTimeOrderMapper.selectList(wrapper);
-            if (CollectionUtils.isEmpty(workTimeOrders)) {
-                throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_END);
-            }
-            return getDto(workTimeOrders);
-        }
         throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_END);
     }
 
@@ -770,7 +762,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         if (thanDate(dto.getWorkDay())) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_TIME_OVER_NOW_DAY);
         }
-
+        if (1 == dto.getType() || 2 == dto.getType() && null == dto.getProjectId()) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.NO_JOIN_EVERY_PROJECT_PLASE_JION);
+        }
         for (ProjectTypeEnum value : ProjectTypeEnum.values()) {
             if (value.getReviewer() == 2) {
                 if (dto.getType().equals(value.getType())) {
@@ -911,18 +905,47 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         List<WorkTimeOrder> workTimeOrders = null;
         Integer level = user.getLevel();
         List<Integer> types;
-        // 项目经理
-        if (1 == level) {
-            types = type == null ? Arrays.asList(1, 2) : new ArrayList<>(Collections.singletonList(type));
-            workTimeOrders = workTimeOrderMapper.queryByPage(status, projectId, types);
-        }
-        // 部门经理
-        if (2 == level) {
-            types = type == null ? Arrays.asList(5, 6, 7) : new ArrayList<>(Collections.singletonList(type));
-            workTimeOrders = workTimeOrderMapper.queryByPage(status, null, types);
+        List<Integer> projectIds = new ArrayList<>();
+        if (0 != level) {
+            if (null == projectId) {
+                List<ProjectDto> byManagerId = workProjectService.getByManagerId(user.getId());
+                if (!CollectionUtils.isEmpty(byManagerId)) {
+                    for (ProjectDto projectDto : byManagerId) {
+                        projectIds.add(projectDto.getId());
+                    }
+                }
+            }
+            if (null != projectId) {
+                projectIds.add(projectId);
+            }
+
+            types = type == null ? Arrays.asList(1, 2, 5, 6, 7) : new ArrayList<>(Collections.singletonList(type));
+            workTimeOrders = workTimeOrderMapper.queryByPage(status, projectIds, types);
         }
+
+
         List<WorkTimeOrderDto> workTimeOrderDtos = new ArrayList<>();
+
+        List<WorkUser> workUsers = workUserMapper.selectList(new QueryWrapper<>());
+        List<WorkProject> workProjects = workProjectMapper.selectList(new QueryWrapper<>());
         for (WorkTimeOrder workTimeOrder : workTimeOrders) {
+            WorkTimeOrderDto workTimeOrderDto = new WorkTimeOrderDto();
+            BeanUtils.copyProperties(workTimeOrder, workTimeOrderDto);
+            for (WorkUser workUser : workUsers) {
+                if (workTimeOrderDto.getUserId().equals(workUser.getId())) {
+                    workTimeOrderDto.setUserName(workUser.getName());
+                }
+            }
+            for (WorkProject workProject : workProjects) {
+                if (null !=workTimeOrderDto.getProjectId()&&workTimeOrderDto.getProjectId().equals(workProject.getId())) {
+                    workTimeOrderDto.setProjectName(workProject.getProjectName());
+                }
+            }
+            workTimeOrderDto.setTypeName(getTypeName(workTimeOrderDto.getType()));
+            workTimeOrderDtos.add(workTimeOrderDto);
+        }
+
+      /*  for (WorkTimeOrder workTimeOrder : workTimeOrders) {
             WorkTimeOrderDto workTimeOrderDto = new WorkTimeOrderDto();
             BeanUtils.copyProperties(workTimeOrder, workTimeOrderDto);
             workTimeOrderDto.setUserName(workUserService.getById(workTimeOrder.getUserId()).getName());
@@ -931,7 +954,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             }
             workTimeOrderDto.setTypeName(getTypeName(workTimeOrderDto.getType()));
             workTimeOrderDtos.add(workTimeOrderDto);
-        }
+        }*/
 
         return new PageInfo<>(workTimeOrderDtos);
     }