小区添加工程类型、分类、周期查询

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/GExportsVo.java

@@ -34,7 +34,7 @@ public class GExportsVo {
     @ExcelProperty(value = "实际规模")
     private String count;
     @ExcelProperty(value = "所属包", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "affiliated_package")
+    @ExcelDictFormat(dictType = "belonging_pack")
     private String belongingPack;
 
 }

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringCivilMapper.xml

@@ -41,6 +41,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="p.unitId != null and p.unitId != ''">
             and unit_id = #{p.unitId}
         </if>
+        <if test="p.enginType != null and p.enginType != ''">
+            and engin_type = #{p.enginType}
+        </if>
+        <if test="p.enginClassification != null and p.enginClassification != ''">
+            and engin_classification = #{p.enginClassification}
+        </if>
+        <if test="p.enginCycle != null and p.enginCycle != ''">
+            and engin_cycle = #{p.enginCycle}
+        </if>
         ) as total,
         a.*,
         b.name AS areaName,
@@ -68,6 +77,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="p.unitId != null and p.unitId != ''">
             and a.unit_id = #{p.unitId}
         </if>
+        <if test="p.enginType != null and p.enginType != ''">
+            and engin_type = #{p.enginType}
+        </if>
+        <if test="p.enginClassification != null and p.enginClassification != ''">
+            and engin_classification = #{p.enginClassification}
+        </if>
+        <if test="p.enginCycle != null and p.enginCycle != ''">
+            and engin_cycle = #{p.enginCycle}
+        </if>
         LIMIT #{page},#{size}
         ) AS at)
     </select>