优化代码结构

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

@@ -21,7 +21,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="WorkTimeOrder", description="工时单实体类")
-public class WorkTimeOrder implements Serializable {
+public class    WorkTimeOrder implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -117,7 +117,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         for (WorkTimeOrder wto : workTimeOrders) {
             totalTime += wto.getWorkTime();
             if (null != wto.getReason()) {
-                reason = wto.getProjectName() + ":" + wto.getReason() + ";";
+                reason = workProjectService.getById(wto.getProjectId()).getProjectName() + ":" + wto.getReason() + ";";
             }
             if (3 == wto.getStatus()) {
                 rejectMonth += 1;
@@ -292,6 +292,12 @@ 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());
+                    if (1 == workTimeOrder.getType() || 2 == workTimeOrder.getType()) {
+                        workTimeOrderDto.setProjectName(workProjectService.getById(workTimeOrderDto.getProjectId()).getProjectName());
+                        workTimeOrderDto.setProjectManagerName(workUserService.getById(workProjectService.getById(workTimeOrderDto.getProjectId()).getManagerId()).getName());
+                    }
+                    workTimeOrderDto.setTypeName(getTypeName(workTimeOrderDto.getType()));
                     workTimeOrderList.add(workTimeOrderDto);
                 }
             }
@@ -483,7 +489,11 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         for (WorkTimeOrder workTimeOrder : workTimeOrders) {
             WorkTimeOrderDto dto = new WorkTimeOrderDto();
             BeanUtils.copyProperties(workTimeOrder, dto);
-            dto.setProjectManagerName(getManagerNameByOrder(workTimeOrder));
+            dto.setUserName(workUserService.getById(workTimeOrder.getUserId()).getName());
+            if (1 == workTimeOrder.getType() || 2 == workTimeOrder.getType()) {
+                dto.setProjectName(workProjectService.getById(workTimeOrder.getProjectId()).getProjectName());
+                dto.setProjectManagerName(getManagerNameByOrder(workTimeOrder));
+            }
             dto.setTypeName(getTypeName(dto.getType()));
             dtos.add(dto);
         }
@@ -597,12 +607,12 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             WorkTimeOrder workTimeOrder = new WorkTimeOrder();
             BeanUtils.copyProperties(workTimeOrderDto, workTimeOrder);
             workTimeOrder.setStatus(4);
-            // 获取用户名
+           /* // 获取用户名
             workTimeOrder.setUserName(workUserService.getById(workTimeOrder.getUserId()).getName());
             // 获取项目名
             if (1 == workTimeOrder.getType() || 2 == workTimeOrder.getType()) {
                 workTimeOrder.setProjectName(workProjectService.getById(workTimeOrder.getProjectId()).getProjectName());
-            }
+            }*/
             // 获取部门id
             Integer deptIdByUserId = workUserDeptService.getDeptIdByUserId(workTimeOrder.getUserId());
             workTimeOrder.setDeptId(deptIdByUserId);