优化代码结构

wisenergy-model/src/main/java/cn/wisenergy/model/dto/DeptUserDto.java

 package cn.wisenergy.model.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,7 +15,6 @@ public class DeptUserDto {
 
     private String deptName;
 
-    private Date date;
-    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd")
+
     private List<UserDto> userDtos;
 }

wisenergy-model/src/main/java/cn/wisenergy/model/dto/NotWorkSubmitOrderDto.java

+package cn.wisenergy.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Authotr:陈奇
+ * @QQ1799796883
+ */
+@Data
+public class NotWorkSubmitOrderDto {
+
+    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd")
+    private Date date;
+
+    private List<DeptUserDto> deptUserDtos;
+}

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

@@ -124,5 +124,5 @@ public interface WorkTimeOrderService {
      * @param userId
      * @return
      */
-    List<DeptUserDto> getDeptNotOrderInfo(Integer userId);
+    NotWorkSubmitOrderDto getDeptNotOrderInfo(Integer userId);
 }

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

@@ -934,7 +934,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
      * @return
      */
     @Override
-    public List<DeptUserDto> getDeptNotOrderInfo(Integer userId) {
+    public NotWorkSubmitOrderDto getDeptNotOrderInfo(Integer userId) {
         log.info("WorkOrderServiceImpl[]getDeptNotOrderInfo[]input.param.userId" + userId);
         if (null == userId) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
@@ -951,6 +951,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         if (rankMax == null) {
             return null;
         }
+        NotWorkSubmitOrderDto notWorkSubmitOrderDto = new NotWorkSubmitOrderDto();
         List<DeptUserCollectDto> deptNotOrderInfo = new ArrayList<>();
         List<Integer> deptIds = new ArrayList<>();
         WorkSubmitAdopt adopt = workSubmitAdoptService.getById(1);
@@ -972,14 +973,13 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
 
         List<DeptUserDto> deptUserDtos = new ArrayList<>();
 
-
+        notWorkSubmitOrderDto.setDate(date);
         if (LevelRankEnum.CENTRAL_LEVEL.getRank().equals(rankMax)) {
             List<WorkDept> deptByCentreManager = workCentreService.getDeptByCentreManager(user);
             for (WorkDept workDept : deptByCentreManager) {
                 DeptUserDto deptUserDto = new DeptUserDto();
                 deptUserDto.setDeptId(workDept.getId());
                 deptUserDto.setDeptName(workDept.getDeptName());
-                deptUserDto.setDate(date);
                 deptUserDtos.add(deptUserDto);
             }
             if (CollectionUtils.isEmpty(deptByCentreManager)) {
@@ -995,7 +995,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             DeptUserDto deptUserDto = new DeptUserDto();
             deptUserDto.setDeptId(deptNotOrderInfo.get(0).getDeptId());
             deptUserDto.setDeptName(deptNotOrderInfo.get(0).getDeptName());
-            deptUserDto.setDate(date);
             deptUserDtos.add(deptUserDto);
         }
 
@@ -1018,9 +1017,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         }
 
 
-        System.out.println(deptNotOrderInfo);
+        notWorkSubmitOrderDto.setDeptUserDtos(deptUserDtos);
 
-        return deptUserDtos;
+        return notWorkSubmitOrderDto;
     }
 
 

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

@@ -163,8 +163,8 @@ public class WorkTimeOrderController extends BaseController {
     @GetMapping(value = "/getDeptNotOrderInfo")
     public Result getDeptNotOrderInfo(Integer userId) {
         log.info("WorkTimeOrderController[]getDeptNotOrderInfo[]input.param.userId:{}" + userId);
-        List<DeptUserDto> deptUserDtos = workTimeOrderService.getDeptNotOrderInfo(userId);
-        return getResult(deptUserDtos);
+        NotWorkSubmitOrderDto deptNotOrderInfo = workTimeOrderService.getDeptNotOrderInfo(userId);
+        return getResult(deptNotOrderInfo);
 
     }