优化代码结构

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

@@ -74,7 +74,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
     @Override
     public List<WorkTimeOrder> getByDay(Integer userId, Date workDay) {
         log.info("WorkTimeOrderServiceImpl[]getDayRejectReason[]input.param.userId:{},workDay:{}" + userId, workDay);
-        if (null == userId || StringUtils.isEmpty(workDay)) {
+        if (null == userId || null == workDay) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
         List<WorkTimeOrder> workTimeOrders = workTimeOrderMapper.getByDay(userId, workDay);
@@ -575,13 +575,14 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             if (workHolidayService.isHoliday(workDay)) {
                 workTimeOrder.setIsOvertime(1);
             }
+            workTimeOrder.setStatus(status);
             // 如果是请假或者调休直接通过
             if (3 == workTimeOrder.getType() || 4 == workTimeOrder.getType()) {
-                status = 2;
+                workTimeOrder.setStatus(2);
                 workTimeOrder.setProjectName(null);
                 workTimeOrder.setProjectId(null);
             }
-            workTimeOrder.setStatus(status);
+
             int saveRow = workTimeOrderMapper.save(workTimeOrder);
             if (0 == saveRow) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.INSERT_DATA_IS_FAIL);
@@ -625,7 +626,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
 
     // 根据工单获取管理员
     private String getManagerNameByOrder(WorkTimeOrder wto) {
-        if (1 == wto.getType() || 2 == wto.getType()) {
+        if (1 == wto.getType() || 2 == wto.getType() ) {
             WorkProject workProject = workProjectService.getById(wto.getProjectId());
             return workProject != null ? workProject.getManagerName() : "";
         }