提交代码

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

@@ -297,12 +297,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getexportList" resultType="com.ruoyi.zdsz.domain.vo.ZEngineeringCivilExportVo">
         SELECT
         a.id,
-        a.district,
+        (SELECT dict_label FROM `sys_dict_data` WHERE dict_type = 'district' AND dict_value = a.district) AS district,
         g.`name` AS area_id,
         h.`name` AS building_id,
         i.`name` AS unit_id,
         j.`name` AS house_id,
-        j.`source` AS source,
+        (SELECT dict_label FROM `sys_dict_data` WHERE dict_type = 'community_source' AND dict_value = j.`source`) AS source,
         k.dict_label AS engin_classification,
         CASE
         a.engin_type
@@ -379,12 +379,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             union
             SELECT
             a.id,
-            a.district,
+            (SELECT dict_label FROM `sys_dict_data` WHERE dict_type = 'district' AND dict_value = a.district) AS district,
             g.`name` AS area_id,
             h.`name` AS building_id,
             i.`name` AS unit_id,
             j.`name` AS house_id,
-            j.`source` AS source,
+            (SELECT dict_label FROM `sys_dict_data` WHERE dict_type = 'community_source' AND dict_value = j.`source`) AS source,
             k.dict_label AS engin_classification,
             CASE
             a.engin_type