优化代码结构

wisenergy-mapper/src/main/resources/mapper/WorkTimeOrderMapper.xml

@@ -122,7 +122,7 @@
             </foreach>
             </if>
         </where>
-        ORDER BY work_day,project_id DESC
+        ORDER BY work_day DESC
     </select>
 
     <!-- 通用查询结果列 -->

wisenergy-service/src/main/java/cn/wisenergy/service/WorkTimeOrderService.java

@@ -71,7 +71,7 @@ public interface WorkTimeOrderService {
      * @param status    状态
      * @return 自定义dto
      */
-    PageInfo<WorkTimeOrder> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer size, Integer status);
+    PageInfo<WorkTimeOrderDto> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer size, Integer status);
 
     /**
      *  功能：获取小程序待审批

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

@@ -242,7 +242,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
      * @return 自定义dto
      */
     @Override
-    public PageInfo<WorkTimeOrder> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer size, Integer status) {
+    public PageInfo<WorkTimeOrderDto> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer size, Integer status) {
         log.info("WorkOrderServiceImpl[]getExamine[]input.param.userId:{},projectId:{},type:{},page:{},size:{},status:{}" + userId, projectId, type, page, size, status);
         // 判断当前用户是否是管理员
         isManager(userId);
@@ -560,7 +560,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         // 判断是否重复填报
         isRepeat(list);
 
-
         for (WorkTimeOrderDto dto : list) {
             if (null == dto.getDes()) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.DES_NOT_NULL);
@@ -712,8 +711,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.INSERT_DATA_IS_FAIL);
             }
             totalTime += workTimeOrder.getWorkTime();
-
-
         }
         WorkCollect workCollect = new WorkCollect();
         BeanUtils.copyProperties(list.get(0), workCollect);
@@ -728,7 +725,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
 
 
     // 审批分页
-    private PageInfo<WorkTimeOrder> pageExamine(WorkUser user, Integer projectId, Integer type, Integer page, Integer size, Integer status) {
+    private PageInfo<WorkTimeOrderDto> pageExamine(WorkUser user, Integer projectId, Integer type, Integer page, Integer size, Integer status) {
         log.info("WorkOrderServiceImpl[]pageExamine[]input.param.user:{},projectId:{},type:{},page:{},size:{},status:{}" + user, projectId, type, page, size, status);
         page = page == null ? 1 : page;
         size = size == null ? 10 : size;
@@ -746,7 +743,21 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             types = type == null ? Arrays.asList(3, 4, 5, 6, 7) : new ArrayList<>(type);
             workTimeOrders = workTimeOrderMapper.queryByPage(status, null, types);
         }
-        PageInfo<WorkTimeOrder> pageInfo = new PageInfo<>(workTimeOrders);
+        List<WorkTimeOrderDto> workTimeOrderDtos = new ArrayList<>();
+        for (WorkTimeOrder workTimeOrder : workTimeOrders) {
+            WorkTimeOrderDto workTimeOrderDto = new WorkTimeOrderDto();
+            BeanUtils.copyProperties(workTimeOrder, workTimeOrderDto);
+            workTimeOrderDto.setUserName(workUserService.getById(workTimeOrder.getUserId()).getName());
+            if (null != workTimeOrder.getProjectId()) {
+                workTimeOrderDto.setProjectName(workProjectService.getById(workTimeOrder.getProjectId()).getProjectName());
+            }
+            workTimeOrderDtos.add(workTimeOrderDto);
+        }
+
+
+        PageInfo<WorkTimeOrderDto> pageInfo = new PageInfo<>(workTimeOrderDtos);
+
+
 
         return pageInfo;
     }

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

@@ -99,12 +99,12 @@ public class WorkTimeOrderController extends BaseController {
             @ApiImplicitParam(name = "status", value = "PC端审批状态", dataType = "int"),
     })
     @GetMapping(value = "/getExamine")
-    public Result<PageInfo<WorkTimeOrder>> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer size, Integer status) {
+    public Result<PageInfo<WorkTimeOrderDto>> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer size, Integer status) {
         log.info("WorkTimeOrderController[]getExamine[]input.param.userId:{},projectId:{},type:{},page:{},size:{},status:{}" + userId, projectId, type, page, size, status);
         if (null == userId) {
             throw new CustomException(RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
-        PageInfo<WorkTimeOrder> examine = workTimeOrderService.getExamine(userId, projectId, type, page, size, status);
+        PageInfo<WorkTimeOrderDto> examine = workTimeOrderService.getExamine(userId, projectId, type, page, size, status);
         return getResult(examine);
     }