优化代码结构

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkTimeOrderMapper.java

@@ -40,7 +40,7 @@ public interface WorkTimeOrderMapper extends BaseMapper<WorkTimeOrder> {
 
     int updateStatusById(@Param("reviewerId") Integer reviewerId, @Param("id") Integer id, @Param("reason") String reason);
 
-    List<WorkTimeOrder> queryByPage(@Param("status")List<Integer>  status, @Param("projectId") Integer projectId, @Param("type") Integer type, @Param("deptId") Integer deptId);
+    List<WorkTimeOrder> queryByPage(@Param("status")List<Integer>  status, @Param("projectIds") List<Integer> projectIds, @Param("types") List<Integer> types, @Param("deptId") Integer deptId);
 
     /**
      * 根据填报项目类型获取次数和工时汇总

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

@@ -260,7 +260,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         for (WorkTimeOrder dto : addList) {
             if (null != workCollect && null != workCollect.getRejectTime()) {
                 Date rejectTime1 = workCollect.getRejectTime();
-                dto.setStatus(RE_SUBMIT);
+                //dto.setStatus(RE_SUBMIT);
                 Date rejectTime = DateUtil.convertStrToDate(DateUtil.convertDateToStr(rejectTime1, "yyyy-MM-dd"), "yyyy-MM-dd");
                 if (DateUtil.isThanDay(rejectTime, date, submitTime)) {
                     throw new BaseCustomException("627", "超过" + submitTime + "天的不能填报");
@@ -822,20 +822,36 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         page = page == null ? 1 : page;
         pageSize = pageSize == null ? 10 : pageSize;
         List<WorkType> workTypes = workTypeService.getAll(1);
+        List<Integer> projectIds = new ArrayList<>();
+        List<Integer> types = new ArrayList<>();
+
         if (null == projectId && null == type) {
             List<ProjectManagerDto> projectManagerDto = getProjectManagerDto(user, workTypes);
-            projectId = projectManagerDto.get(0).getId();
-            type = projectManagerDto.get(0).getType();
+            if (!CollectionUtils.isEmpty(projectManagerDto)) {
+                projectManagerDto.forEach(project ->{
+                    if (null != project.getId()) {
+                        projectIds.add(project.getId());
+                    } else {
+                        types.add(project.getType());
+                    }
+                } );
+            }
+        }else{
+            if (null != projectId) {
+                projectIds.add(projectId);
+            }
+            if (null != type) {
+                types.add(type);
+            }
         }
         Page<WorkTimeOrderDto> pageHelper = null;
         List<WorkTimeOrder> workTimeOrders = null;
         if (UserRoleLevelUtils.isManagerLevel(user.getId(), LevelEnum.EXAMINE.getLevelName())) {
             pageHelper = PageHelper.startPage(page, pageSize);
             Integer deptId = user.getDeptId();
-            workTimeOrders = workTimeOrderMapper.queryByPage(status, projectId, type, deptId);
+            workTimeOrders = workTimeOrderMapper.queryByPage(status, projectIds, types, deptId);
         }
         List<WorkTimeOrderDto> workTimeOrderDtos = new ArrayList<>();
-
         List<WorkUser> workUsers = workUserMapper.selectList(new QueryWrapper<>());
         List<WorkProject> workProjects = workProjectMapper.selectList(new QueryWrapper<>());
         for (WorkTimeOrder workTimeOrder : workTimeOrders) {