优化

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

@@ -24,6 +24,8 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class CheckStandardDTO extends BaseDTO implements Serializable {
+    private Integer notInPeriod;
+    private List<Integer> levelList;
     private List<Integer> statusList;
     private LocalDateTime searchStartTime;
 

platform-dao/src/main/java/com/platform/dao/vo/query/check/CheckJobNum.java

@@ -16,6 +16,7 @@ import java.math.BigDecimal;
 @Data
 @Accessors(chain = true)
 public class CheckJobNum implements Serializable {
+    private BigDecimal totalNum = new BigDecimal(0);
     private String sbName;
     private String sbNo;
 

platform-dao/src/main/resources/mapper/check/CheckStandardMapper.xml

@@ -212,6 +212,15 @@ checkstandard.last_date,
             <if test="periodType!=null">
                 and checkstandard.period_type = #{periodType}
             </if>
+            <if test="levelList!=null and levelList.size>0">
+                and checkstandard.level in
+                <foreach collection="levelList" separator="," close=")" open="(" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="notInPeriod!=null and notInPeriod!=''">
+                and checkstandard.period_type !=#{notInPeriod}
+            </if>
         </where>
         group by checkstandard.id
         Order By

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

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.cache.ConfigCache;
+import com.platform.common.cache.DictCache;
 import com.platform.common.enums.DataFilterTypeEnum;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.model.OauthUser;
@@ -111,7 +112,9 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         standardDTO.setSbIdList(sbIdList);
         standardDTO.setSbName(dto.getSbName());
         standardDTO.setSbNo(dto.getSbNo());
+        standardDTO.setLevelList(dto.getLevelList());
         standardDTO.setPeriodType(dto.getPeriodType());
+        standardDTO.setNotInPeriod(PeriodTypeEnum.DAY.getValue());
         List<Integer> statusList = new ArrayList<>();
         statusList.add(1);
         statusList.add(2);
@@ -119,6 +122,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         List<CheckStandardVO> checkStandardVOS = standardMapper.selectList2(standardDTO);
         sbIdList = checkStandardVOS.stream().map(CheckStandardVO::getSbId).distinct().collect(Collectors.toList());
         List<CheckJobNum> checkJobNums = new ArrayList<>();
+        BigDecimal totalNum =new BigDecimal(0);
         for (String id:sbIdList) {
             BigDecimal num = new BigDecimal(0);
             CheckJobNum checkJobNum = new CheckJobNum();
@@ -155,10 +159,14 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
                 }
             }
             if (num.intValue()!=0) {
+                totalNum = totalNum.add(num);
                 checkJobNum.setCount(num);
                 checkJobNums.add(checkJobNum);
             }
         }
+        if (checkJobNums!=null &&checkJobNums.size()>0){
+            checkJobNums.get(0).setTotalNum(totalNum);
+        }
         AbstractPageResultBean<CheckJobNum> pageInfo = getPageInfo(pageNum,pageSize,checkJobNums);
         return pageInfo;
     }