优化代码结构

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

@@ -732,6 +732,8 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             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);
         }
@@ -747,6 +749,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         if (1 == dto.getType() || 2 == dto.getType()) {
             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) {

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

@@ -2,9 +2,12 @@ package cn.wisenergy.web.admin.controller.app;
 
 import cn.wisenergy.common.utils.DateUtil;
 import cn.wisenergy.common.utils.exception.Result;
+import cn.wisenergy.model.app.WorkSubmitAdopt;
+import cn.wisenergy.model.app.WorkType;
 import cn.wisenergy.model.dto.CalendarDto;
 import cn.wisenergy.model.dto.SubtotalDto;
 import cn.wisenergy.service.WorkCollectService;
+import cn.wisenergy.service.WorkSubmitAdoptService;
 import cn.wisenergy.web.admin.controller.common.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -29,6 +32,9 @@ public class WorkCollectController extends BaseController {
     @Autowired
     private WorkCollectService workCollectService;
 
+    @Autowired
+    private WorkSubmitAdoptService workSubmitAdoptService;
+
     @ApiOperation(value = "日历->月详细", notes = "日历展示", httpMethod = "GET")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "userId", value = "用户id", dataType = "int", required = true),
@@ -56,4 +62,12 @@ public class WorkCollectController extends BaseController {
     }
 
 
+    @ApiOperation(value = "获取系统默认数据", notes = "获取系统默认数据", httpMethod = "GET")
+    @GetMapping(value = "/getAuto")
+    public Result<WorkType> getAuto() {
+        log.info("WorkCollectController[]getAuto);");
+        WorkSubmitAdopt auto = workSubmitAdoptService.getById(1);
+        return getResult(auto);
+    }
+
 }