优化

ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseCustomInfo.java

@@ -98,6 +98,8 @@ public class BaseCustomInfo extends BaseEntity
 
     private Date endTime;
 
+    private Integer rubbishFlag;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -330,4 +332,12 @@ public class BaseCustomInfo extends BaseEntity
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
+
+    public Integer getRubbishFlag() {
+        return rubbishFlag;
+    }
+
+    public void setRubbishFlag(Integer rubbishFlag) {
+        this.rubbishFlag = rubbishFlag;
+    }
 }

ruoyi-system/src/main/resources/mapper/business/BaseCustomInfoMapper.xml

@@ -79,6 +79,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bz != null  and bz != ''"> and bz = #{bz}</if>
             <if test="deleteFlag != null "> and delete_flag = #{deleteFlag}</if>
             <if test="startTime != null and endTime != null"> and create_time between #{startTime} and #{endTime}</if>
+            <if test="rubbishFlag != null and rubbishFlag == 1"> and khzt = 7</if>
+            <if test="rubbishFlag != null and rubbishFlag == 0"> and khzt not in (7)</if>
         </where>
     </select>