优化代码结构

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

@@ -65,7 +65,8 @@ public enum BASE_RESP_CODE_ENUM {
     HAVE_ORDER_DELETE("643", "有工单被用户删除，审批失败，请重新审批"),
     ORDER_EXAMINE("644","该工单已经被审批，请刷新查看"),
     NO_WORK_ORDERS_HAVE_BEEN_REJECTED("645", "暂无驳回未提交工单"),
-    LEAVE_JOB_USER("646","账号状态异常，请联系管理员")
+    LEAVE_JOB_USER("646","账号状态异常，请联系管理员"),
+    ItemType_Does_NotMatch("647","工时类型和项目名称不匹配"),
     ;
 
 

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

@@ -258,9 +258,9 @@ public class StatisticsServiceImpl implements StatisticsService {
         // 创建一行
         HSSFRow row1 = sheet.createRow(0);
         // 给第一行赋值
-        row1.createCell(0).setCellValue("序号");
-        row1.createCell(1).setCellValue("部门名称");
-        row1.createCell(2).setCellValue("姓名");
+            row1.createCell(0).setCellValue("序号");
+            row1.createCell(1).setCellValue("部门名称");
+            row1.createCell(2).setCellValue("姓名");
         for (int i = 1; i <= dayCount; i++) {
             HSSFCell cell = row1.createCell(2 + i);
             cell.setCellValue(i + "日");

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

@@ -315,12 +315,24 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         int size = list.size();
         for (int i = 0; i < size; i++) {
             for (int j = i + 1; j < size; j++) {
-                if (list.get(i).getType().equals(list.get(j).getType())) {
+                if (PROJECT.equals(list.get(i).getType()) || BUSINESS_OPPORTUNITY.equals(list.get(i).getType())) {
+                    if (list.get(j).getType().equals(list.get(i).getType())) {
+                        if (null == list.get(i).getProjectId() || null == list.get(j).getProjectId()) {
+                            throw new BaseCustomException(BASE_RESP_CODE_ENUM.NO_JOIN_EVERY_PROJECT_PLASE_JION);
+                        }else if(list.get(i).getProjectId().equals(list.get(j).getProjectId())){
+                            throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_ALREADY_COMMIT);
+                        }
+                    }
+
+                } else if (list.get(i).getType().equals(list.get(j).getProjectId())) {
+                    throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_ALREADY_COMMIT);
+                }
+               /* if (list.get(i).getType().equals(list.get(j).getType())) {
                     if (null != list.get(i).getProjectId() && null != list.get(j).getProjectId() && !list.get(i).getProjectId().equals(list.get(j).getProjectId())) {
                         continue;
                     }
                     throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_ALREADY_COMMIT);
-                }
+                }*/
             }
         }
     }
@@ -669,9 +681,15 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_TIME_OVER_NOW_DAY);
         }
         if (1 == dto.getType() || 2 == dto.getType()) {
+            QueryWrapper<WorkProject> wrapper = new QueryWrapper<>();
+            wrapper.eq("id", dto.getProjectId());
+            wrapper.eq("type", dto.getType());
+            List<WorkProject> workProjects = workProjectMapper.selectList(wrapper);
+            if (CollectionUtils.isEmpty(workProjects)) {
+                throw new BaseCustomException(BASE_RESP_CODE_ENUM.ItemType_Does_NotMatch);
+            }
             if (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) {