优化代码结构

wisenergy-common/wisenergy-common.iml

@@ -11,8 +11,8 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <output url="file://D:/Repository/ideaRepository/org/springframework/boot/spring-boot-starter-parent/2.1.5.RELEASE/target/classes" />
+    <output-test url="file://D:/Repository/ideaRepository/org/springframework/boot/spring-boot-starter-parent/2.1.5.RELEASE/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />

wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkTimeOrder.java

@@ -74,5 +74,4 @@ public class WorkTimeOrder implements Serializable {
     @ApiModelProperty(name = "modifyTime",value = "工单修改时间")
     private Date modifyTime;
 
-
 }

wisenergy-model/src/main/java/cn/wisenergy/model/dto/CalendarDto.java

 package cn.wisenergy.model.dto;
 
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,4 +27,6 @@ public class CalendarDto implements Serializable {
     @ApiModelProperty(name = "workDay",value = "工时的日期")
     private Date workDay;
 
+
+
 }

wisenergy-model/src/main/java/cn/wisenergy/model/dto/SubtotalDto.java

@@ -26,6 +26,9 @@ public class SubtotalDto {
     @ApiModelProperty(name = "reason",value = "驳回原因")
     private String reason;
 
+    @ApiModelProperty(name = "status", value ="状态")
+    private Integer status;
+
     @ApiModelProperty(name = "rejectMonth",value = "当月被驳回待处理条数")
     private Integer rejectMonth;
 }

wisenergy-model/src/main/java/cn/wisenergy/model/dto/WorkTimeOrderDto.java

@@ -53,4 +53,7 @@ public class WorkTimeOrderDto {
     @ApiModelProperty(name = "reason",value = "驳回理由")
     private String reason;
 
+    @ApiModelProperty(name = "typeName",value = "项目类型名")
+    private String typeName;
+
 }

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

@@ -81,6 +81,13 @@ public class WorkCollectServiceImpl implements WorkCollectService {
         if (null == subtotalDto) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_INFO_IS_NULL);
         }
+        QueryWrapper<WorkCollect> wrapper = new QueryWrapper<>();
+        wrapper.eq("user_id", userId);
+        wrapper.eq("work_day", workDay);
+        WorkCollect workCollect = workCollectMapper.selectOne(wrapper);
+        if (workCollect != null) {
+            subtotalDto.setStatus(workCollect.getStatus());
+        }
         return subtotalDto;
     }
 

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

@@ -334,6 +334,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         if (CollectionUtils.isEmpty(workTimeOrders)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_INFO_IS_NULL);
         }
+
         return wtoToWtod(workTimeOrders);
     }
 
@@ -344,8 +345,10 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             WorkTimeOrderDto dto = new WorkTimeOrderDto();
             BeanUtils.copyProperties(workTimeOrder, dto);
             dto.setProjectManagerName(getManagerNameByOrder(workTimeOrder));
+            dto.setTypeName(getTypeName(dto.getType()));
             dtos.add(dto);
         }
+
         return dtos;
     }
 
@@ -376,8 +379,8 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         log.info("WorkOrderServiceImpl[]checkWorkOrderInfo[]input.method");
         // 1、工单时间不能大于当前天
         Date date = new Date();
-        WorkSubmitAdopt workSbumitAdopt = workSbumitAdoptService.getById(1);
-        Integer submitTime = workSbumitAdopt.getSubmitTime();
+        WorkSubmitAdopt workSubmitAdopt = workSbumitAdoptService.getById(1);
+        Integer submitTime = workSubmitAdopt.getSubmitTime();
         for (WorkTimeOrderDto dto : list) {
             if (null == dto.getDes()) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.DES_NOT_NULL);
@@ -389,9 +392,17 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             if (date.getTime() - dto.getWorkDay().getTime() > submitTime * 24 * 60 * 60 * 1000) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_DAY_THAN_DATE);
             }
+            // 3.判断当日是否已经填报
+            WorkCollect byUserIdAndWorkDay = workCollectService.getByUserIdAndWorkDay(dto.getUserId(), dto.getWorkDay());
+            if (null != byUserIdAndWorkDay) {
+                throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_ALREADY_COMMIT);
+            }
         }
-        //3.每天工时累加不得超过八小时
+        // 4.每天工时累加不得超过八小时
         timeNotEight(0, list);
+
+
+
     }
 
 
@@ -508,18 +519,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         return list;
     }
 
-    private String getTypeName(Integer type) {
-        if (type == 5) {
-            return "外部商务、技术交流";
-        }
-        if (type == 6) {
-            return "内部培训、技术准备、管理";
-        }
-        if (type == 7) {
-            return "其他非项目/商机工作";
-        }
-        return null;
-    }
+
 
     // 审批分页
     private List<ExamineGroupbyProjectDto> pageExamine(WorkUser user, Integer projectId, Integer type, Integer page, Integer size, Integer status) {
@@ -568,4 +568,10 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
         }
     }
+
+    private String getTypeName(Integer type) {
+        String[] str = { "项目", "商机", "请假", "调休", "外部商务、技术交流", "内部培训、技术准备、管理", "其他非项目/商机工作"};
+        return str[--type];
+    }
+
 }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/WorkTimeOrderController.java

@@ -123,11 +123,11 @@ public class WorkTimeOrderController extends BaseController {
     }
 
     @ApiOperation(value = "单个或批量审批", notes = "单个或批量审批", httpMethod = "GET")
-    @ApiImplicitParams({//@ApiImplicitParam(name = "ids", value = "工单id", dataType = "list", required = true),
+    @ApiImplicitParams({@ApiImplicitParam(name = "ids", value = "工单id", dataType = "list", required = true),
             @ApiImplicitParam(name = "reviewerId", value = "审核人id", dataType = "int", required = true)})
     @GetMapping(value = "/examine")
-    public Result<Boolean> examineByIds(Integer reviewerId,@RequestParam  List<Integer> ids) {
-        log.info("WorkTimeOrderController[]examinsByIds[]input.param.reviewerId:{},ids:{}" + reviewerId, ids);
+    public Result<Boolean> examineByIds(Integer reviewerId,@RequestBody  List<Integer> ids) {
+        log.info("WorkTimeOrderController[]examineByIds[]input.param.reviewerId:{},ids:{}" + reviewerId, ids);
         if (null == reviewerId || CollectionUtils.isEmpty(ids)) {
             throw new CustomException(RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }