优化

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

@@ -24,6 +24,10 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class CheckJobDTO extends BaseDTO implements Serializable {
+    private List<Integer> standardLevelList;
+    private List<Integer> periodTypeList;
+    private List<Integer> sbLevelList;
+
     private List<String> positionIds;
     /**
      * 1:本日，2：本周，3：本月
@@ -109,10 +113,7 @@ public class CheckJobDTO extends BaseDTO implements Serializable {
      * 保养等级
      */
     private Integer standardLevel;
-    /**
-     * 保养等级
-     */
-    private List<Integer> standardLevelList;
+
     /**
      * 周期类型
      */

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 List<Integer> periodTypeList;
+    private List<Integer> sbLevelList;
     private Integer notInPeriod;
     private List<Integer> levelList;
     private List<Integer> statusList;

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

@@ -199,6 +199,18 @@
         <if test="positionId!=null and positionId!=''">
             and sbInfo.position_id = #{positionId}
         </if>
+        <if test="periodTypeList != null and periodTypeList.size > 0">
+            AND standard.period_type in
+            <foreach item="item" index="index" collection="periodTypeList" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="sbLevelList != null and sbLevelList.size > 0">
+            AND sbInfo.level in
+            <foreach item="item" index="index" collection="sbLevelList" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.check.CheckJobDTO"

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

@@ -164,6 +164,24 @@ checkstandard.last_date,
                     #{item}
                 </foreach>
             </if>
+            <if test="periodTypeList!=null and periodTypeList.size>0">
+                and checkstandard.period_type in
+                <foreach collection="periodTypeList" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="sbLevelList!=null and sbLevelList.size>0">
+                and sbInfo.level in
+                <foreach collection="sbLevelList" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="levelList!=null and levelList.size>0">
+                and checkstandard.level in
+                <foreach collection="levelList" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         Order By
         checkstandard.level asc,