优化代码结构

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

@@ -209,46 +209,29 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         timeNotEight(workTimeOrders);
         int totalTime = 0;
         List<WorkTimeOrder> addList = new ArrayList<>();
-        List<Integer> typeIds = workTypeService.getIdByReviewer(1);
         List<WorkType> workTypes = workTypeService.getAll(null);
 
-        // 验证填报类型项目是否已经结项
+        // 3.验证填报类型项目是否已经结项
         orderIsEnd(workTimeOrders, workTypes);
         for (WorkTimeOrderDto dto : workTimeOrders) {
-            // 3.判断工单是否合法
+            // 4.判断工单是否合法
             isEmpty(dto);
 
-            // 获取用户名和类型名
-            /*Integer type = dto.getType();
-            dto.setUserName(workUserService.getById(dto.getUserId()).getName());
-            dto.setTypeName(getTypeName(type, workTypes));
-            if (!CollectionUtils.isEmpty(typeIds)) {
-                if (typeIds.contains(type)) {dto.setProjectName(workProjectService.getById(dto.getProjectId()).getProjectName());
-                    dto.setManagerName(workUserService.getById(workProjectService.getById(dto.getProjectId()).getManagerId()).getName());
-                }
-                if (!typeIds.contains(type)) {
-                    Integer deptManagerId = workDeptService.getById(user.getDeptId()).getDeptManagerId();
-                    if (null != deptManagerId) {
-                        dto.setManagerName(workUserService.getById(deptManagerId).getName());
-                    }
-
-                }
-            }*/
-            // 设置状态
+            // 5.设置状态
             if (null == dto.getStatus() || 0 == dto.getStatus()) {
                 dto.setStatus(COMPLETED);
             }
             if (null != dto.getStatus() && REJECTED.equals(dto.getStatus())) {
                 dto.setStatus(RE_SUBMIT);
             }
-            // 是否加班
+            // 6.是否加班
             dto.setIsOvertime(0);
             if (workHolidayService.isHoliday(dto.getWorkDay())) {
                 dto.setIsOvertime(1);
             }
-            // 是否已经审批
+            // 7.是否已经审批
             WorkTimeOrder workTimeOrder = new WorkTimeOrder();
-            workTimeOrder.setDeptId(workUserDeptService.getDeptIdByUserId(dto.getUserId()));
+            workTimeOrder.setDeptId(user.getDeptId());
             BeanUtils.copyProperties(dto, workTimeOrder);
             totalTime += dto.getWorkTime();
             if (null != dto.getWorkId()) {
@@ -263,7 +246,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             BeanUtils.copyProperties(workTimeOrder, dto);
             addList.add(workTimeOrder);
         }
-
+        // 8.判断是否超时
         WorkCollect workCollect = workCollectService.getByUserIdAndWorkDay(workTimeOrders.get(0).getUserId(), workTimeOrders.get(0).getWorkDay());
         for (WorkTimeOrder dto : addList) {
             if (null != workCollect && null != workCollect.getRejectTime()) {
@@ -283,7 +266,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
 
         }
 
-        // 删除数据库还没有审批的工单，添加填报没有审批的工单
+        // 9.删除数据库还没有审批的工单，添加填报没有审批的工单
         UpdateWrapper<WorkTimeOrder> wrapper = new UpdateWrapper<>();
         wrapper.eq("user_id", workTimeOrders.get(0).getUserId());
         wrapper.eq("work_day", workTimeOrders.get(0).getWorkDay());
@@ -292,7 +275,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         for (WorkTimeOrder workTimeOrder : addList) {
             workTimeOrderMapper.save(workTimeOrder);
         }
-        // 更新collect表
+        // 10.更新collect表
         int status = statusYes(workTimeOrders.get(0).getUserId(), workTimeOrders.get(0).getWorkDay());
 
         if (null == workCollect) {
@@ -544,7 +527,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
     @Transactional
     @Override
     public List<WorkTimeOrderDto> rejectNotSubmit(Integer userId) {
-        log.info("WorkOrderServiceImpl[]rejectById[]input.param.id:{}" + userId);
+        log.info("WorkOrderServiceImpl[]rejectNotSubmit[]input.param.id:{}" + userId);
         if (!UserRoleLevelUtils.isManagerLevel(userId, LevelEnum.EXAMINE.getLevelName())) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.USER_NOT_LEVEL);
         }
@@ -725,7 +708,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             WorkTimeOrderDto dto = new WorkTimeOrderDto();
             BeanUtils.copyProperties(workTimeOrder, dto);
             dto.setUserName(workUserService.getById(workTimeOrder.getUserId()).getName());
-
             Integer deptManagerId = workDeptService.getById(user.getDeptId()).getDeptManagerId();
             if (null != deptManagerId) {
                 dto.setManagerName(workUserService.getById(deptManagerId).getName());