优化代码结构

wisenergy-common/src/main/java/cn/wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java

@@ -37,7 +37,7 @@ public enum BASE_RESP_CODE_ENUM {
     RECORD_WORD_REPEAT("616", "字段名称重复"),
     WORD_NAME_REPEAT("617", "字段名称请勿重复"),
     QUERY_USER_INFO_FAIL("618", "该用户不存在"),
-    WORK_ORDER_ALREADY_COMMIT("619", "工单已填报，不能重复填报"),
+    WORK_ORDER_ALREADY_COMMIT("619", "工单类型重复,不能重复填报"),
     WORK_TIME_OVER_NOW_DAY("620", "工单日期不能大于当天"),
     INSERT_WORK_COLLECT_DATA_FAIL("621", "插入工时单汇总信息失败"),
     NO_JOIN_EVERY_PROJECT_PLASE_JION("622", "您还没有加入项目中，请先去加入项目"),
@@ -46,7 +46,7 @@ public enum BASE_RESP_CODE_ENUM {
     PROJECT_NOT_HAVE_USER("624", "该部门下没有项目"),
     USER_LOGIN_NAME_OR_PASSWORD_IS_ERROR("625", "用户名或密码不正确"),
     DELETE_OLD_WORK_ORDER_FAIL("626","删除旧工单数据失败"),
-    WORK_DAY_THAN_DATE("627","填报的日期超过系统默认日期"),
+    WORK_DAY_THAN_DATE("627","超过3天的工单不能补报"),
     DES_NOT_NULL("628","工作简述不能为空"),
     WORK_PROJECT_IS_NULL("629","项目为空"),
     WORK_ORDER_END("630", "该项目的工单已经全部审批"),
@@ -60,7 +60,9 @@ public enum BASE_RESP_CODE_ENUM {
     PROJECT_NOT_NULL("638","项目类型不能为空"),
     NEW_PASSWORD_IS_HTE_SAME_OLD_PASSWORD("639","新密码不能与旧密码相同"),
     PASSWORD_FORMAT_ERROR("640","密码由6到16位数字组成"),
-    NOT_MANAGER_TYPE("642","没有可以管理的类型项目");
+    INCOMPLETE_WORK_ORDER_INFORMATION("621","请填写完整的工单信息"),
+    NOT_MANAGER_TYPE("642","没有可以管理的类型项目"),
+    ;
 
 
 

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

@@ -10,6 +10,7 @@ import cn.wisenergy.model.enums.ProjectTypeEnum;
 import cn.wisenergy.model.enums.StatusEnum;
 import cn.wisenergy.service.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -224,7 +225,8 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         timeNotEight(0, workTimeOrders);
 
         int totalTime = 0;
-        List<Integer> typeList = new ArrayList<>();
+
+        List<WorkTimeOrder> addList = new ArrayList<>();
         for (WorkTimeOrderDto dto : workTimeOrders) {
             // 3.判断工单是否合法
             isEmpty(dto);
@@ -261,8 +263,11 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             WorkTimeOrder workTimeOrder = new WorkTimeOrder();
             workTimeOrder.setDeptId(workUserDeptService.getDeptIdByUserId(dto.getUserId()));
             BeanUtils.copyProperties(dto, workTimeOrder);
-
-            // 修改
+            totalTime += dto.getWorkTime();
+            if (2 == dto.getStatus() || 5 == dto.getStatus()) {
+                continue;
+            }
+            /*// 修改
             if (null != dto.getWorkId()) {
                 workTimeOrderMapper.updateToNull(dto.getWorkId());
                 workTimeOrderMapper.updateById(workTimeOrder);
@@ -271,13 +276,21 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             if (null == dto.getWorkId() || 0 == dto.getWorkId()) {
                 workTimeOrderMapper.save(workTimeOrder);
                 dto.setWorkId(workTimeOrder.getWorkId());
-
-            }
-            typeList.add(type);
-            totalTime += dto.getWorkTime();
+            }*/
             BeanUtils.copyProperties(workTimeOrder, dto);
+            addList.add(workTimeOrder);
         }
 
+        UpdateWrapper<WorkTimeOrder> wrapper = new UpdateWrapper<>();
+        wrapper.eq("user_id", workTimeOrders.get(0).getUserId());
+        wrapper.eq("work_day", workTimeOrders.get(0).getWorkDay());
+        wrapper.notIn("status", 2, 5);
+        workTimeOrderMapper.delete(wrapper);
+        for (WorkTimeOrder workTimeOrder : addList) {
+            workTimeOrderMapper.insert(workTimeOrder);
+        }
+
+
         int status = statusYes(workTimeOrders.get(0).getUserId(), workTimeOrders.get(0).getWorkDay());
         WorkCollect workCollect = workCollectService.getByUserIdAndWorkDay(workTimeOrders.get(0).getUserId(), workTimeOrders.get(0).getWorkDay());
         if (null == workCollect) {
@@ -719,11 +732,25 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
 
 
     private void isEmpty(WorkTimeOrderDto dto) {
+        int size = 0;
+        if (null == dto.getType()) {
+            size++;
+        }
         if (null == dto.getWorkTime() || 0 == dto.getWorkTime()) {
-            throw new BaseCustomException(BASE_RESP_CODE_ENUM.TIME_NOT_IS_NULL);
+            size++;
+        }
+        if (1 == dto.getType() || 2 == dto.getType() && null == dto.getProjectId()) {
+            size++;
         }
         if (null == dto.getDes() || "".equals(dto.getDes())) {
-            throw new BaseCustomException(BASE_RESP_CODE_ENUM.DES_NOT_NULL);
+            size++;
+        }
+        if (size >= 2) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.INCOMPLETE_WORK_ORDER_INFORMATION);
+        }
+
+        if (null == dto.getWorkTime() || 0 == dto.getWorkTime()) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.TIME_NOT_IS_NULL);
         }
         if (null == dto.getWorkDay()) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORKDAY_NOT_NULL);
@@ -734,6 +761,16 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         if (thanDate(dto.getWorkDay())) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_TIME_OVER_NOW_DAY);
         }
+        for (ProjectTypeEnum value : ProjectTypeEnum.values()) {
+            if (value.getReviewer() == 2) {
+                if (dto.getType().equals(value.getType())) {
+                    return;
+                }
+            }
+        }
+        if (null == dto.getDes() || "".equals(dto.getDes())) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.DES_NOT_NULL);
+        }
     }
 
     //3.每天工时累加不得超过八小时