优化

platform-dao/src/main/java/com/platform/dao/dto/check/CheckJobDTO.java

@@ -24,7 +24,11 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class CheckJobDTO extends BaseDTO implements Serializable {
-    private Boolean flag;
+    private List<String> positionIds;
+    /**
+     * 1:本日，2：本周，3：本月
+     */
+    private Integer timeFlag;
 
     private String positionId;
     /**

platform-dao/src/main/java/com/platform/dao/mapper/sb/SbPositionMapper.java

@@ -1,6 +1,7 @@
 package com.platform.dao.mapper.sb;
 
 import com.platform.dao.config.MyMapper;
+import com.platform.dao.dto.check.CheckJobDTO;
 import com.platform.dao.dto.sb.SbPositionDTO;
 import com.platform.dao.entity.sb.SbPosition;
 import com.platform.dao.vo.query.check.CheckJobVO;
@@ -19,6 +20,9 @@ import java.util.List;
 @Component
 public interface SbPositionMapper extends MyMapper<SbPosition> {
     List<CheckJobVO> getByIds(List<String> ids);
+
+    List<CheckJobVO> getCheckJobNums(CheckJobDTO dto);
+
     /**
      * 分页查询
      *

platform-dao/src/main/resources/mapper/sb/SbPositionMapper.xml

@@ -56,4 +56,20 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getCheckJobNums" parameterType="com.platform.dao.dto.check.CheckJobDTO" resultType="com.platform.dao.vo.query.check.CheckJobVO">
+        select
+        position.name as positionName, position.id as positionId,count(1) as waitNum
+        from t_sb_position position left join t_sb_info info on position.id=info.position_id left join t_check_job job
+        on info.id = job.sb_id
+        <where>
+        and (job.status = 1 or job.status =2) and position .id in
+        <foreach item="item" index="index" collection="list" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="searchEndTime!=null">
+            and job.start_time <![CDATA[<=]]> #{searchEndTime}
+        </if>
+        </where>
+    </select>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/check/CheckJobController.java

@@ -119,10 +119,9 @@ public class CheckJobController {
      */
     @GetMapping("/page")
     public R<AbstractPageResultBean<CheckJobVO>> query(CheckJobDTO checkJobDTO, @RequestParam(required = false) List<Integer> statusList, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-//        if (CollectionUtil.isNotEmpty(statusList)) {
-//            checkJobDTO.setStatusList(statusList);
-//        }
-        checkJobDTO.setStatusList(null);
+        if (CollectionUtil.isNotEmpty(statusList)) {
+            checkJobDTO.setStatusList(statusList);
+        }
         return new R<>(checkJobService.selectPageList(checkJobDTO, pageNum, pageSize));
     }
 
@@ -285,8 +284,8 @@ public class CheckJobController {
      * @return R
      */
     @GetMapping("/getCheckJobVO")
-    public R<List<CheckJobVO>> getCheckJobVO() {
-        return new R<>(checkJobService.getCheckJobVO());
+    public R<List<CheckJobVO>> getCheckJobVO(CheckJobDTO checkJobDTO) {
+        return new R<>(checkJobService.getCheckJobVO(checkJobDTO));
     }
 
 

platform-service/src/main/java/com/platform/service/check/CheckJobService.java

@@ -36,7 +36,7 @@ public interface CheckJobService extends IBaseService<CheckJob, CheckJobDTO> {
     CheckJobVO getCheckJobVODetail(CheckJobDTO checkJobDTO);
 
 
-    List<CheckJobVO> getCheckJobVO();
+    List<CheckJobVO> getCheckJobVO(CheckJobDTO dto);
 
     /**
      * 批量删除

platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -264,7 +264,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
     }
 
     @Override
-    public List<CheckJobVO> getCheckJobVO() {
+    public List<CheckJobVO> getCheckJobVO(CheckJobDTO dto) {
         CheckJobDTO checkJobDTO = new CheckJobDTO();
         List<CheckJobVO> checkJobVOS = getJobVO(checkJobDTO);
         Integer waitNum = 0;
@@ -283,7 +283,20 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         }
         List<SbInfoVO> sbInfoVOS = sbInfoMapper.getByIds(sbIds);
         List<String> positionIds = sbInfoVOS.stream().map(SbInfoVO::getPositionId).distinct().collect(Collectors.toList());
-        List<CheckJobVO> checkJobVOS1 = sbPositionMapper.getByIds(positionIds);
+        List<CheckJobVO> checkJobVOS1 = new ArrayList<>();
+        if (dto.getTimeFlag()!=null){
+            checkJobDTO.setPositionIds(positionIds);
+            if (dto.getTimeFlag()==1){
+                checkJobDTO.setSearchEndTime(DateUtils.getTodayEndTime());
+            }else if (dto.getTimeFlag()==2){
+                checkJobDTO.setSearchEndTime(DateUtils.getSundayOfThisWeek());
+            }else if (dto.getTimeFlag()==3){
+                checkJobDTO.setSearchEndTime(DateUtils.getLastDayOfThisMonth());
+            }
+            checkJobVOS1 = sbPositionMapper.getCheckJobNums(checkJobDTO);
+        }else {
+            checkJobVOS1 = sbPositionMapper.getByIds(positionIds);
+        }
         if (checkJobVOS1!=null&&checkJobVOS1.size()>0) {
             checkJobVOS1.get(0).setWaitNum(waitNum);
             checkJobVOS1.get(0).setSbNum(sbIds.size());
@@ -304,11 +317,22 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
     private List<CheckJobVO> getJobVO(CheckJobDTO checkJobDTO){
         UserInfo userInfo = SecurityUtils.getUserInfo();
         LocalDate date = LocalDate.now();
-        String lastDay = date.with(TemporalAdjusters.lastDayOfMonth()).toString()+" 23:59:59";
-        String firstDay = date.with(TemporalAdjusters.firstDayOfMonth()).toString()+" 00:00:00";
+        String lastDay = date.with(TemporalAdjusters.lastDayOfMonth()).toString() + " 23:59:59";
+        String firstDay = date.with(TemporalAdjusters.firstDayOfMonth()).toString() + " 00:00:00";
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        checkJobDTO.setSearchStartTime(LocalDateTime.parse(firstDay,df));
-        checkJobDTO.setSearchEndTime(LocalDateTime.parse(lastDay,df));
+        if (checkJobDTO.getTimeFlag()!=null){
+            if (checkJobDTO.getTimeFlag()==1){
+                checkJobDTO.setSearchEndTime(DateUtils.getTodayEndTime());
+            }else if (checkJobDTO.getTimeFlag()==2){
+                checkJobDTO.setSearchEndTime(DateUtils.getSundayOfThisWeek());
+            }else if (checkJobDTO.getTimeFlag()==3){
+                checkJobDTO.setSearchEndTime(DateUtils.getLastDayOfThisMonth());
+            }
+        }else {
+
+            checkJobDTO.setSearchStartTime(LocalDateTime.parse(firstDay, df));
+            checkJobDTO.setSearchEndTime(LocalDateTime.parse(lastDay, df));
+        }
         checkJobDTO.setCheckUserId(userInfo.getUserId());
         checkJobDTO.setType(2);
         List<CheckJobVO> checkJobVOS = mapper.selectList(checkJobDTO);
@@ -367,6 +391,15 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
             UserInfo userInfo = SecurityUtils.getUserInfo();
             model.setCheckUserId(userInfo.getUserId());
         }
+        if (model.getTimeFlag()!=null){
+            if (model.getTimeFlag()==1){
+                model.setSearchEndTime(DateUtils.getTodayEndTime());
+            }else if (model.getTimeFlag()==2){
+                model.setSearchEndTime(DateUtils.getSundayOfThisWeek());
+            }else if (model.getTimeFlag()==3){
+                model.setSearchEndTime(DateUtils.getLastDayOfThisMonth());
+            }
+        }
 
         if (model.getSearchType() != null && 1 == model.getSearchType()) {
             checkJobVOS = packageCheckJobDTO(model,checkJobVOS);