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

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

@@ -30,14 +30,15 @@
     </select>
 
     <select id="getArea" resultType="com.ruoyi.zdsz.domain.vo.ZAreaVo">
-        select id as id,
-        name as name
-        from z_area
-        where del_flag = '0'
+        select a.id as id,
+        CONCAT(a.name,'-',b.dict_label) as name
+        from z_area a
+        LEFT JOIN sys_dict_data b on b.dict_type = 'community_source' and b.dict_value = a.source
+        where a.del_flag = '0'
         <if test="district != null and district != ''">
-            and district = #{district}
+            and a.district = #{district}
         </if>
-        order by create_time desc
+        order by a.create_time desc
     </select>
     <select id="selectGExportsList" resultType="com.ruoyi.zdsz.domain.vo.GImportVo">
         SELECT za.name AS areaName,

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

@@ -25,14 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LIMIT 1
     </select>
     <select id="getBuildingList" resultType="com.ruoyi.zdsz.domain.vo.ZBuildingVo">
-        select id   as id,
-               name as name
-        from z_building
-        where del_flag = '0'
+        select a.id as id,
+        CONCAT(a.name,'-',b.dict_label) as name
+        from z_building a
+        LEFT JOIN sys_dict_data b on b.dict_type = 'community_source' and b.dict_value = a.source
+        where a.del_flag = '0'
         <if test="areaId != null and areaId != ''">
-            and area_id = #{areaId}
+            and a.area_id = #{areaId}
         </if>
-        order by create_time desc
+        order by a.create_time desc
     </select>
 
     <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZBuildingVo">

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

@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and engin_classification = #{p.enginClassification}
         </if>
         <if test="p.enginCycle != null and p.enginCycle != ''">
-            and engin_cycle = #{p.enginCycle}
+            and engin_cycle = 0
         </if>
         ) as total,
         a.*,
@@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and engin_classification = #{p.enginClassification}
         </if>
         <if test="p.enginCycle != null and p.enginCycle != ''">
-            and engin_cycle = #{p.enginCycle}
+            and engin_cycle = 0
         </if>
         order by a.create_time desc
         LIMIT #{page},#{size}

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

@@ -55,10 +55,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectListByunitId" resultType="com.ruoyi.zdsz.domain.vo.ZHouseVo">
-        select * from z_house as zh where zh.del_flag = '0'
+        select
+        a.id as id,
+        CONCAT(a.name,'-',b.dict_label) as name
+        from z_house as a
+        LEFT JOIN sys_dict_data b on b.dict_type = 'community_source' and b.dict_value = a.source
+        where a.del_flag = '0'
         <if test="unitId != null  and unitId != ''">
-            and zh.unit_id = #{unitId}
+            and a.unit_id = #{unitId}
         </if>
-        order by zh.create_time desc
+        order by a.create_time desc
     </select>
 </mapper>

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

@@ -26,14 +26,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getUnitList" resultType="com.ruoyi.zdsz.domain.vo.ZUnitVo">
-        select id   as id,
-        name as name
-        from z_unit
-        where del_flag = '0'
+        select a.id as id,
+        CONCAT(a.name,'-',b.dict_label) as name
+        from z_unit a
+        LEFT JOIN sys_dict_data b on b.dict_type = 'community_source' and b.dict_value = a.source
+        where a.del_flag = '0'
         <if test="buildingId != null and buildingId != ''">
-            and building_id = #{buildingId}
+            and a.building_id = #{buildingId}
         </if>
-        order by create_time desc
+        order by a.create_time desc
     </select>
 
     <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZUnitVo">