优化代码结构

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

@@ -555,6 +555,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         int totalTime = 0;
         int status = 1;
         //根据用户id,获取用户信息
+
         for (WorkTimeOrderDto dto : list) {
             WorkTimeOrder workTimeOrder = new WorkTimeOrder();
             // 获取用户名
@@ -565,24 +566,22 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             }
             dto.setProjectName(null != dto.getProjectId() ? workProjectService.getById(dto.getProjectId()).getProjectName() : getTypeName(dto.getType()));
 
-            BeanUtils.copyProperties(dto, workTimeOrder);
-
             // 获取部门id
-            workTimeOrder.setDeptId(workUserDeptService.getDeptIdByUserId(workTimeOrder.getUserId()));
-            Date workDay = workTimeOrder.getWorkDay();
+            workTimeOrder.setDeptId(workUserDeptService.getDeptIdByUserId(dto.getUserId()));
+            Date workDay = dto.getWorkDay();
             // 默认正常工时
             workTimeOrder.setIsOvertime(0);
             if (workHolidayService.isHoliday(workDay)) {
                 workTimeOrder.setIsOvertime(1);
             }
-            workTimeOrder.setStatus(status);
+            dto.setStatus(status);
             // 如果是请假或者调休直接通过
-            if (3 == workTimeOrder.getType() || 4 == workTimeOrder.getType()) {
-                workTimeOrder.setStatus(2);
-                workTimeOrder.setProjectName(null);
-                workTimeOrder.setProjectId(null);
+            if (3 == dto.getType() || 4 == dto.getType()) {
+                dto.setStatus(2);
+                dto.setProjectName(null);
+                dto.setProjectId(null);
             }
-
+            BeanUtils.copyProperties(dto, workTimeOrder);
             int saveRow = workTimeOrderMapper.save(workTimeOrder);
             if (0 == saveRow) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.INSERT_DATA_IS_FAIL);
@@ -596,6 +595,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         if (!workCollectService.insertCollect(workCollect)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INSERT_DATA_IS_FAIL);
         }
+
         return list;
     }
 
@@ -628,7 +628,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
     private String getManagerNameByOrder(WorkTimeOrder wto) {
         if (1 == wto.getType() || 2 == wto.getType() ) {
             WorkProject workProject = workProjectService.getById(wto.getProjectId());
-            return workProject != null ? workProject.getManagerName() : "";
+            return workProject != null ? workUserService.getById(workProject.getManagerId()).getName() : "";
         }
         if (1 != wto.getType() || 2 != wto.getType()) {
             return workUserService.getById(