修改导出

ruoyi-admin/src/main/resources/application-dev.yml

@@ -50,12 +50,12 @@ spring:
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
 #          url: jdbc:mysql://192.168.10.15:63306/sj_zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
-          url: jdbc:mysql://192.168.10.15:63306/zdsz_xstb?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
-          username: root
-          password: sooka1a2b3c4d%...
-#          url: jdbc:mysql://123.249.95.134:13306/zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+#          url: jdbc:mysql://192.168.10.15:63306/zdsz_xstb?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
 #          username: root
-#          password: ZDSZ1a2b3c4d%...
+#          password: sooka1a2b3c4d%...
+          url: jdbc:mysql://123.249.95.134:13306/zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          username: root
+          password: ZDSZ1a2b3c4d%...
         # 从库数据源
 #        slave:
 #          lazy: true

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

@@ -160,6 +160,8 @@ public class ZEngineeringCivilExportVo extends BaseEntity implements Serializabl
     private String constructAddre;
     @ExcelProperty(value = "具体位置")
     private String remark;
+    @ExcelProperty(value = "现住人电话")
+    private String newPhone;
 
     /**
      * 是否按图纸施工

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

@@ -42,6 +42,7 @@ public class ZEngineeringCivilExportVos extends BaseEntity implements Serializab
     private String enginClassification;
 
     private String completionStatus;
+    private String newPhone;//现主人电话
 
 
     // 室内

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

@@ -394,6 +394,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 zEngineeringCivilExportVos.setBuildingId(zEngineeringCivilExportVo.getBuildingId());
                 zEngineeringCivilExportVos.setUnitId(zEngineeringCivilExportVo.getUnitId());
                 zEngineeringCivilExportVos.setHouseId(zEngineeringCivilExportVo.getHouseId());
+                zEngineeringCivilExportVos.setNewPhone(zEngineeringCivilExportVo.getNewPhone());
                 zEngineeringCivilExportVos.setSource(zEngineeringCivilExportVo.getSource());
                 zEngineeringCivilExportVos.setEnginType(zEngineeringCivilExportVo.getEnginType());
                 zEngineeringCivilExportVos.setEnginClassification(zEngineeringCivilExportVo.getEnginClassification());
@@ -510,6 +511,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 zEngineeringCivilExportVos.setBuildingId(zEngineeringCivilExportVo.getBuildingId());
                 zEngineeringCivilExportVos.setUnitId(zEngineeringCivilExportVo.getUnitId());
                 zEngineeringCivilExportVos.setHouseId(zEngineeringCivilExportVo.getHouseId());
+                zEngineeringCivilExportVos.setNewPhone(zEngineeringCivilExportVo.getNewPhone());
                 zEngineeringCivilExportVos.setSource(zEngineeringCivilExportVo.getSource());
                 zEngineeringCivilExportVos.setEnginType(zEngineeringCivilExportVo.getEnginType());
                 zEngineeringCivilExportVos.setEnginClassification(zEngineeringCivilExportVo.getEnginClassification());

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

@@ -644,6 +644,7 @@
         h.`name` AS building_id,
         i.`name` AS unit_id,
         j.`name` AS house_id,
+        j.new_phone AS new_phone,
         (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,
@@ -738,6 +739,7 @@
             h.`name` AS building_id,
             i.`name` AS unit_id,
             j.`name` AS house_id,
+            j.new_phone AS new_phone,
             (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,
@@ -830,6 +832,7 @@
         a.building_name as building_id,
         a.unit_name as unit_id,
         a.house_name as house_id,
+        j.new_phone AS new_phone,
         e.dict_label as source,
         '室内' AS engin_classification,
         CASE
@@ -862,6 +865,7 @@
         null as phonenumber
         FROM
         z_engin_not_installed a
+        LEFT JOIN z_house j ON j.id = a.house_id
         LEFT JOIN sys_dict_data b ON a.district = b.dict_value AND b.dict_type = 'district'
         LEFT JOIN sys_dict_data c ON a.type = c.dict_value and c.dict_type = 'not_installed_type'
         left join z_house d on a.house_id=d.id
@@ -908,6 +912,7 @@
         h.`name` AS building_id,
         i.`name` AS unit_id,
         j.`name` AS house_id,
+        j.new_phone AS new_phone,
         (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,
@@ -970,6 +975,7 @@
             h.`name` AS building_id,
             i.`name` AS unit_id,
             j.`name` AS house_id,
+            j.new_phone AS new_phone,
             (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,