审核bug修复

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

@@ -109,7 +109,7 @@ public class ZEngineeringCivilExportVo extends BaseEntity implements Serializabl
      * 备注
      */
 //    @ExcelProperty(value = "备注")
-    private String remark;
+//    private String remark;
 
     /**
      *
@@ -157,6 +157,8 @@ public class ZEngineeringCivilExportVo extends BaseEntity implements Serializabl
      */
     @ExcelProperty(value = "施工位置")
     private String constructAddre;
+    @ExcelProperty(value = "具体位置")
+    private String remark;
 
     /**
      * 是否按图纸施工
@@ -268,7 +270,7 @@ private Date updateInfoTime;
      */
    // @TableField(fill = FieldFill.INSERT)
     //@ExcelProperty(value = "施工人")
-    @ExcelProperty(value = "施工人")
+    @ExcelProperty(value = "工号")
     private String createBy;
     @ExcelProperty(value = "施工时间")
 //    @JsonFormat("yyyy-MM-dd HH:mm:ss")

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

@@ -289,36 +289,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getexportList" resultType="com.ruoyi.zdsz.domain.vo.ZEngineeringCivilExportVo">
         SELECT
-            a.district,
-            g.`name` AS area_id,
-            h.`name` AS building_id,
-            i.`name` AS unit_id,
-            j.`name` AS house_id,
-            k.dict_label AS engin_classification,
-            CASE
-                a.engin_type
-                WHEN 'new_built' THEN
-                    '新建' ELSE '旧改'
-                END AS engin_type,
-            a.completion_status,
-            b.type,
-            c.construct_addre,
-            c.construct_according_drawings,
-            c.segmented_compression_qualified,
-            c.backfill_time,
-            c.construct_phone,
-            c.construct_time,
-            c.head_name,
-            c.head_phone,
-            d.corrosion_level,
-            d.visit_type,
-            d.self_closing_valve_type,
-            d.brand,
-            e.`name` AS material_quality,
-            f.`name` AS specifications,
-            d.number,
+        a.district,
+        g.`name` AS area_id,
+        h.`name` AS building_id,
+        i.`name` AS unit_id,
+        j.`name` AS house_id,
+        k.dict_label AS engin_classification,
+        CASE
+        a.engin_type
+        WHEN 'new_built' THEN
+        '新建' ELSE '旧改'
+        END AS engin_type,
+        a.completion_status,
+        b.type,
+        c.construct_addre,
+        c.construct_according_drawings,
+        c.segmented_compression_qualified,
+        c.backfill_time,
+        c.construct_phone,
+        c.construct_time,
+        c.head_name,
+        c.head_phone,
+        d.visit_type,
+        l.name as corrosion_level,
+        n.name as self_closing_valve_type,
+        m.name as brand,
+        e.`name` AS material_quality,
+        f.`name` AS specifications,
+        d.number,
         c.update_info_time as updateInfoTime,
-        c.create_by as createBy
+        c.create_by as createBy,
+        c.remark
         FROM
             z_engineering_civil a
         LEFT JOIN z_engineering_node b ON a.id = b.civli_id
@@ -332,6 +333,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN z_house j ON j.id = a.house_id
         LEFT JOIN sys_dict_data k ON k.dict_type = a.engin_type
         AND k.dict_value = a.engin_classification
+        LEFT JOIN z_engin_material_quality l ON l.id = d.corrosion_level
+        LEFT JOIN z_engin_material_quality m ON m.id = d.brand
+        LEFT JOIN z_engin_material_quality n ON n.id = d.self_closing_valve_type
         WHERE
          a.create_time LIKE CONCAT(REPLACE(#{createTime}, '_', '-'),'%')
         <if test="p.district != null and p.district != ''">
@@ -385,15 +389,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             c.construct_time,
             c.head_name,
             c.head_phone,
-            d.corrosion_level,
             d.visit_type,
-            d.self_closing_valve_type,
-            d.brand,
+            l.name as corrosion_level,
+            n.name as self_closing_valve_type,
+            m.name as brand,
             e.`name` AS material_quality,
             f.`name` AS specifications,
             d.number,
             c.update_info_time as updateInfoTime,
-            c.create_by as createBy
+            c.create_by as createBy,
+            c.remark
             FROM
             z_engineering_civil a
             LEFT JOIN z_engineering_node_${name} b ON a.id = b.civli_id
@@ -407,6 +412,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN z_house j ON j.id = a.house_id
             LEFT JOIN sys_dict_data k ON k.dict_type = a.engin_type
             AND k.dict_value = a.engin_classification
+            LEFT JOIN z_engin_specifications l ON l.id = d.corrosion_level
+            LEFT JOIN z_engin_material_quality m ON m.id = d.brand
+            LEFT JOIN z_engin_material_quality n ON n.id = d.self_closing_valve_type
             WHERE
              a.create_time LIKE CONCAT(REPLACE(#{name}, '_', '-'),'%')
             <if test="p.district != null and p.district != ''">