优化代码结构

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

@@ -217,7 +217,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
 
             }
 
-            if (null == dto.getStatus()) {
+            if (null == dto.getStatus() || 0 == dto.getStatus()) {
                 dto.setStatus(1);
             }
             if (3 == type || 4 == type) {
@@ -424,6 +424,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         return null;
     }
 
+    // 封装可填报的数据
     private List<AppletsPendApprovalDto> getDto(List<WorkTimeOrder> workTimeOrders) {
         List<AppletsPendApprovalDto> appletsPendApprovalDtos = new ArrayList<>();
         Date date = workTimeOrders.get(0).getWorkDay();
@@ -447,8 +448,8 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
                 if (approvalDto.getWorkDay().compareTo(workTimeOrder.getWorkDay()) == 0) {
                     WorkTimeOrderDto workTimeOrderDto = new WorkTimeOrderDto();
                     BeanUtils.copyProperties(workTimeOrder, workTimeOrderDto);
-                    workTimeOrderDto.setUserName(workUserService.getById(workTimeOrderDto.getUserId()).getName());
                     workTimeOrderDto.setManagerName(workUserService.getById(workTypeService.getByDeptId(workTimeOrder.getDeptId()).get(0).getManagerId()).getName());
+                    workTimeOrderDto.setUserName(workUserService.getById(workTimeOrderDto.getUserId()).getName());
                     if (1 == workTimeOrder.getType() || 2 == workTimeOrder.getType()) {
                         workTimeOrderDto.setProjectName(workProjectService.getById(workTimeOrderDto.getProjectId()).getProjectName());
                         workTimeOrderDto.setManagerName(workUserService.getById(workProjectService.getById(workTimeOrderDto.getProjectId()).getManagerId()).getName());

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

@@ -171,7 +171,6 @@ public class WorkTimeOrderController extends BaseController {
     @PostMapping(value = "/addOrder")
     public Result<List<WorkTimeOrderDto>> addOrder(@RequestBody CreateWorkOrderDto dto) {
         log.info("WorkTimeOrderController[]addTest[]input.param" + dto);
-
         List<WorkTimeOrderDto> workTimeOrderDtos = workTimeOrderService.addTest(dto);
         return getResult(workTimeOrderDtos);
     }