Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

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

@@ -60,6 +60,7 @@ public class ZAreaVo implements Serializable {
     @ExcelProperty(value = "行政区", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "district")
     private String district;
+    private String districtName;
 
     /**
      * 核算行政区

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringIndustryServiceImpl.java

@@ -94,7 +94,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         lqw.orderByDesc(ZEngineeringIndustry::getCreateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
         lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringIndustry::getEnginName, bo.getEnginName());
-        lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
+        lqw.like(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
         lqw.eq(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringIndustry::getConstructUnit, bo.getConstructUnit());
         lqw.eq(StringUtils.isNotBlank(bo.getProjectHead()), ZEngineeringIndustry::getProjectHead, bo.getProjectHead());
         lqw.eq(StringUtils.isNotBlank(bo.getSceneHead()), ZEngineeringIndustry::getSceneHead, bo.getSceneHead());
@@ -333,7 +333,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         queryWrapper.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
         queryWrapper.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringIndustry::getType, bo.getType());
         if (!"null".equals(bo.getEnginClassification())) {
-            queryWrapper.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
+            queryWrapper.like(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
         }
 
         return queryWrapper;

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

@@ -33,9 +33,13 @@
         select
         a.id,
         a.name,
-        a.administrative
+        a.administrative,
+        a.district,
+        b.dict_label as districtName
         from z_area a
+        left join sys_dict_data b on a.district = b.dict_value
         where a.del_flag = '0'
+        and b.dict_type = 'district'
         <if test="district != null and district != ''">
             and a.district = #{district}
         </if>