修复导出问题

data-ui/src/views/data/housingconstruction/enterprise/index.vue

@@ -256,6 +256,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import ISuperMap from "@/views/data/common/ISuperMap.vue";
 import supermap from "@/views/components/supermap.vue";
 import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
+import {format_date} from "@/views/data/common/dateExport";
 
 export default {
   name: "Enterprise",
@@ -519,9 +520,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('Housingconstruction/enterprise/export', {
+      this.download('sooka-sponest-center-data/enterprise/export', {
         ...this.queryParams
-      }, `企业信息_${new Date().getTime()}.xlsx`)
+      }, `企业信息_${format_date(new Date())}.xlsx`)
     }
   }
 };

data-ui/src/views/data/housingconstruction/enterpriseproductionreport/index.vue

@@ -78,11 +78,19 @@
     <el-table v-loading="loading" :data="enterpriseproductionreportList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="企业名称" align="center" prop="enterpriseName"/>
-      <el-table-column label="报告类型" align="center" prop="reportType">
+      <el-table-column label="报告类型" align="center" prop="reportType" v-if="this.$route.query.requestType === '1'">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.enterprise_production_report" :value="scope.row.reportType"/>
         </template>
       </el-table-column>
+
+      <el-table-column label="文件类型" align="center" prop="reportType" v-if="this.$route.query.requestType === '2'">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.enterprise_qualification_file" :value="scope.row.reportType"/>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="上传时间" align="center" prop="createTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -167,6 +175,7 @@ import {
 } from "@/api/data/housingconstruction/enterpriseproductionreport";
 import {getListAll} from "@/api/data/housingconstruction/enterprise";
 import FileUpload from "@/views/components/FileUpload/index.vue";
+import {format_date} from "@/views/data/common/dateExport";
 
 export default {
   name: "Enterpriseproductionreport",
@@ -356,9 +365,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('housingconstruction/enterpriseproductionreport/export', {
+      this.download('sooka-sponest-center-data/enterpriseproductionreport/export', {
         ...this.queryParams
-      }, `enterpriseproductionreport_${new Date().getTime()}.xlsx`)
+      }, `企业生产报告_${format_date(new Date())}.xlsx`)
     }
   }
 };

data-ui/src/views/data/housingconstruction/gassource/index.vue

@@ -178,7 +178,7 @@
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
-            <el-form-item label="运输车辆车牌号" prop="carId">
+            <el-form-item label="运输车辆" prop="carId">
               <el-select v-model="form.carId" filterable placeholder="请选择运输车辆"  @change="handleCarChange">
                 <el-option
                   v-for="data in carList"
@@ -191,7 +191,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="运输体积" prop="weight">
-              <el-input v-model="form.weight" placeholder="请输入重量"/>
+              <el-input v-model="form.weight" placeholder="请输入运输体积"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -209,7 +209,7 @@
           </el-form-item>
         </el-row>
         <el-row :gutter="24">
-          <el-form-item label="危化品运输车车辆许可" prop="attachPaths" label-width="170px">
+          <el-form-item label="危化品运输车辆许可" prop="attachPaths" label-width="160px">
             <ImageUpload v-model="form.attachPaths" ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.attachPaths" @input="getUrl" :limit="10"></ImageUpload>
           </el-form-item>
         </el-row>
@@ -497,9 +497,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('housingconstruction/gassource/export', {
+      this.download('sooka-sponest-center-data/gassource/export', {
         ...this.queryParams
-      }, `gassource_${new Date().getTime()}.xlsx`)
+      }, `气源数据_${format_date(new Date())}.xlsx`)
     }
   }
 };

data-ui/src/views/data/housingconstruction/log/index.vue

@@ -151,24 +151,24 @@
         <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="液体液位" prop="level">
-              <el-input v-model="form.level" placeholder="请输入液体液位"/>
+              <el-input v-model="form.level" placeholder="请输入液体液位(单位: m)"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="温度" prop="heat">
-              <el-input v-model="form.heat" placeholder="请输入温度"/>
+              <el-input v-model="form.heat" placeholder="请输入温度(单位: ℃)"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="内部气压" prop="pressure">
-              <el-input v-model="form.pressure" placeholder="请输入内部气压"/>
+              <el-input v-model="form.pressure" placeholder="请输入内部气压(单位: MPa)"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="周边可燃性气体泄漏" prop="gasLeak">
-              <el-input v-model="form.gasLeak" placeholder="请输入周边可燃性气体泄漏"/>
+              <el-input v-model="form.gasLeak" placeholder="请输入周边可燃性气体泄漏(单位: %LEL)"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -184,6 +184,7 @@
 <script>
 import {addLog, delLog, getLog, listLog, updateLog} from "@/api/data/housingconstruction/log";
 import {getStoragetankList} from "@/api/data/housingconstruction/storagetank"
+import {format_date} from "@/views/data/common/dateExport";
 
 export default {
   name: "Log",
@@ -352,7 +353,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除储罐存储数据日志编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除选中的数据项？').then(function () {
         return delLog(ids);
       }).then(() => {
         this.getList();
@@ -362,9 +363,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('housingconstruction/log/export', {
+      this.download('sooka-sponest-center-data/log/export', {
         ...this.queryParams
-      }, `log_${new Date().getTime()}.xlsx`)
+      }, `储罐运营数据_${format_date(new Date())}xlsx`)
     }
   }
 };

data-ui/src/views/data/housingconstruction/realnameuser/index.vue

@@ -130,7 +130,7 @@
     />
 
     <!-- 添加或修改住建-实名用户对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body class="form-style">
+    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body class="form-style">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="24">
           <el-col :span="12">
@@ -252,6 +252,7 @@ import ISuperMap from "@/views/data/common/ISuperMap.vue";
 import supermap from "@/views/components/supermap.vue";
 import {treeselect} from "@/api/system/dept";
 import {checkLat, checkLon, validPhoneMobile} from "@/api/rules/rules";
+import {format_date} from "@/views/data/common/dateExport";
 
 export default {
   name: "Realnameuser",
@@ -501,9 +502,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('housingconstruction/realnameuser/export', {
+      this.download('sooka-sponest-center-data/realnameuser/export', {
         ...this.queryParams
-      }, `实名用户_${new Date().getTime()}.xlsx`)
+      }, `实名用户_${format_date(new Date())}.xlsx`)
     }
   }
 };

data-ui/src/views/data/housingconstruction/steelcylinder/index.vue

@@ -260,8 +260,8 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="钢瓶阈值（月）" prop="threshold">
-              <el-input v-model="form.threshold" placeholder="请输入钢瓶阈值" maxlength="20"/>
+            <el-form-item label="钢瓶阈值" prop="threshold">
+              <el-input v-model="form.threshold" placeholder="请输入钢瓶阈值(单位: 天)" maxlength="20"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">

data-ui/src/views/data/housingconstruction/storagetank/index.vue

@@ -180,36 +180,36 @@
         <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="存储量" prop="storageCapacity">
-              <el-input v-model="form.storageCapacity" placeholder="请输入存储量(单位为: L)"/>
+              <el-input v-model="form.storageCapacity" placeholder="请输入存储量(单位: L)"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="温度" prop="heat">
-              <el-input v-model="form.heat" placeholder="请输入温度(单位为: ℃)"/>
+              <el-input v-model="form.heat" placeholder="请输入温度(单位: ℃)"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="液体液位上限" prop="levelCeiling">
-              <el-input v-model="form.levelCeiling" placeholder="请输入液体液位上限(单位为: m)"/>
+              <el-input v-model="form.levelCeiling" placeholder="请输入液体液位上限(单位: m)"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="液体液位下限" prop="levelFloor">
-              <el-input v-model="form.levelFloor" placeholder="请输入液体液位下限(单位为: m)"/>
+              <el-input v-model="form.levelFloor" placeholder="请输入液体液位下限(单位: m)"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="内部气压" prop="pressure">
-              <el-input v-model="form.pressure" placeholder="请输入内部气压(单位为: MPa)"/>
+              <el-input v-model="form.pressure" placeholder="请输入内部气压(单位: MPa)"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="周边可燃性气体泄漏" prop="gasLeak">
-              <el-input v-model="form.gasLeak" placeholder="请输入周边可燃性气体泄漏(单位为: %LEL)"/>
+              <el-input v-model="form.gasLeak" placeholder="请输入周边可燃性气体泄漏(单位: %LEL)"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -457,9 +457,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/storagetank/export', {
+      this.download('sooka-sponest-center-data/storagetank/export', {
         ...this.queryParams
-      }, `储罐基础信息_${new Date().getTime()}.xlsx`)
+      }, `储罐基础信息_${format_date(new Date())}.xlsx`)
     },
     formatStorageCapacity(cellValue) {
       return `${cellValue.storageCapacity} L`;

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionAttach.java

@@ -31,37 +31,31 @@ public class CenterdataTHousingconstructionAttach extends BaseBusinessEntity {
     /**
      * 业务id
      */
-    @Excel(name = "业务id")
     private String busId;
 
     /**
      * 附件属性
      */
-    @Excel(name = "附件属性")
     private String dictType;
 
     /**
      * 附件属性明细
      */
-    @Excel(name = "附件属性明细")
     private String dictValue;
 
     /**
      * 附件路径
      */
-    @Excel(name = "附件路径")
     private String attachPath;
 
     /**
      * 附件名称
      */
-    @Excel(name = "附件名称")
     private String fileName;
 
     /**
      * 排序
      */
-    @Excel(name = "排序")
     private Long attachSorts;
 
     /**

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionGassource.java

@@ -62,10 +62,15 @@ public class CenterdataTHousingconstructionGassource extends BaseBusinessEntity
     /**
      * 燃气成分
      */
-    @Excel(name = "燃气成分")
     private String component;
 
     /**
+     * 燃气成分
+     */
+    @Excel(name = "燃气成分")
+    private String componentLabel;
+
+    /**
      * 入站时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionRealnameuser.java

@@ -36,10 +36,15 @@ public class CenterdataTHousingconstructionRealnameuser extends BaseBusinessEnti
     /**
      * 用户类别
      */
-    @Excel(name = "用户类别")
     private String enterpriseUserType;
 
     /**
+     * 用户类别
+     */
+    @Excel(name = "用户类别")
+    private String enterpriseUserTypeLabel;
+
+    /**
      * 用户代码
      */
     @Excel(name = "用户代码")
@@ -91,13 +96,11 @@ public class CenterdataTHousingconstructionRealnameuser extends BaseBusinessEnti
     /**
      * 所属部门
      */
-    @Excel(name = "所属部门")
     private Long deptId;
 
     /**
      * 部门名称
      */
-    @Excel(name = "部门名称")
     private String deptName;
 
     @Override

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionSafetyinspectionitem.java

@@ -27,19 +27,16 @@ public class CenterdataTHousingconstructionSafetyinspectionitem extends BaseBusi
     /**
      * 检查类型
      */
-    @Excel(name = "检查类型")
     private String enterpriseInspectionType;
 
     /**
      * 检查名称
      */
-    @Excel(name = "检查名称")
     private String inspectionName;
 
     /**
      * 排序
      */
-    @Excel(name = "排序")
     private Integer inspectionSort;
 
     /**

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionSafetyinspectionrecords.java

@@ -29,7 +29,6 @@ public class CenterdataTHousingconstructionSafetyinspectionrecords extends BaseB
     /**
      * 检察员id
      */
-    @Excel(name = "检察员id")
     private String censorId;
 
     /**
@@ -41,7 +40,6 @@ public class CenterdataTHousingconstructionSafetyinspectionrecords extends BaseB
     /**
      * 用户id
      */
-    @Excel(name = "用户id")
     private String clientId;
 
     /**
@@ -79,7 +77,6 @@ public class CenterdataTHousingconstructionSafetyinspectionrecords extends BaseB
     /**
      * 所属部门
      */
-    @Excel(name = "所属部门")
     private Long deptId;
 
     /**

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionSafetyinspectionrecordsdetail.java

@@ -29,13 +29,11 @@ public class CenterdataTHousingconstructionSafetyinspectionrecordsdetail extends
     /**
      * 安全检查记录id
      */
-    @Excel(name = "安全检查记录id")
     private String recordId;
 
     /**
      * 安全检查项id
      */
-    @Excel(name = "安全检查项id")
     private String itemId;
 
 
@@ -66,6 +64,7 @@ public class CenterdataTHousingconstructionSafetyinspectionrecordsdetail extends
      */
     private String deptName;
 
+    @Excel(name = "备注")
     private String remark;
 
     private List<CenterdataTHousingconstructionAttach> attachList;

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionSteelcylinderLog.java

@@ -26,7 +26,6 @@ public class CenterdataTHousingconstructionSteelcylinderLog extends BaseBusiness
     /**
      * 钢瓶id
      */
-    @Excel(name = "钢瓶id")
     private String steelcylinderId;
 
     /**
@@ -58,7 +57,6 @@ public class CenterdataTHousingconstructionSteelcylinderLog extends BaseBusiness
     /**
      * 操作员id
      */
-    @Excel(name = "操作员id")
     private String operatorId;
 
     /**
@@ -70,7 +68,6 @@ public class CenterdataTHousingconstructionSteelcylinderLog extends BaseBusiness
     /**
      * 车辆id
      */
-    @Excel(name = "车辆id")
     private String carId;
 
     /**
@@ -89,7 +86,6 @@ public class CenterdataTHousingconstructionSteelcylinderLog extends BaseBusiness
     /**
      * 配送员id
      */
-    @Excel(name = "配送员id")
     private String deliveryId;
 
     /**
@@ -108,7 +104,6 @@ public class CenterdataTHousingconstructionSteelcylinderLog extends BaseBusiness
     /**
      * 入户用户id
      */
-    @Excel(name = "入户用户id")
     private String joinHouseId;
 
     /**

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionStoragetank.java

@@ -47,7 +47,6 @@ public class CenterdataTHousingconstructionStoragetank extends BaseBusinessEntit
     /**
      * 企业id
      */
-    @Excel(name = "企业id")
     private String enterpriseId;
 
     /**
@@ -59,37 +58,37 @@ public class CenterdataTHousingconstructionStoragetank extends BaseBusinessEntit
     /**
      * 存储量
      */
-    @Excel(name = "存储量")
+    @Excel(name = "存储量(单位: L)")
     private Double storageCapacity;
 
     /**
      * 液体液位上限
      */
-    @Excel(name = "液体液位上限")
+    @Excel(name = "液体液位上限(单位: m)")
     private Double levelCeiling;
 
     /**
      * 液体液位下限
      */
-    @Excel(name = "液体液位下限")
+    @Excel(name = "液体液位下限(单位: m)")
     private Double levelFloor;
 
     /**
      * 温度
      */
-    @Excel(name = "温度")
+    @Excel(name = "温度(单位: ℃)")
     private Double heat;
 
     /**
      * 内部气压
      */
-    @Excel(name = "内部气压")
+    @Excel(name = "内部气压(单位: MPa)")
     private Double pressure;
 
     /**
      * 周边可燃性气体泄漏
      */
-    @Excel(name = "周边可燃性气体泄漏")
+    @Excel(name = "周边可燃性气体泄漏(单位: %LEL)")
     private Double gasLeak;
 
     private String state;

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionStoragetankLog.java

@@ -37,7 +37,6 @@ public class CenterdataTHousingconstructionStoragetankLog extends BaseBusinessEn
     /**
      * 储罐id
      */
-    @Excel(name = "储罐id")
     private String storagetankId;
 
     /**
@@ -49,31 +48,30 @@ public class CenterdataTHousingconstructionStoragetankLog extends BaseBusinessEn
     /**
      * 液体液位
      */
-    @Excel(name = "液体液位")
+    @Excel(name = "液体液位(单位: m)")
     private Double level;
 
     /**
      * 温度
      */
-    @Excel(name = "温度")
+    @Excel(name = "温度(单位: ℃)")
     private Double heat;
 
     /**
      * 内部气压
      */
-    @Excel(name = "内部气压")
+    @Excel(name = "内部气压(单位: MPa)")
     private Double pressure;
 
     /**
      * 周边可燃性气体泄漏
      */
-    @Excel(name = "周边可燃性气体泄漏")
+    @Excel(name = "周边可燃性气体泄漏(单位: %LEL)")
     private Double gasLeak;
 
     /**
      * 安全状态
      */
-    @Excel(name = "安全状态")
     private String securityState;
 
     /**

src/main/java/com/sooka/sponest/data/housingconstruction/handler/TaskHandler.java

@@ -26,6 +26,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/taskHandler")
 public class TaskHandler {
+
     @Autowired
     private ICenterdataTHousingconstructionEnterpriseproductionreportService reportService;
 

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionAttachServiceImpl.java

@@ -4,7 +4,6 @@ import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.system.api.RemoteConfigService;
 import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionAttach;
-import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionSafetyinspectionrecords;
 import com.sooka.sponest.data.housingconstruction.mapper.CenterdataTHousingconstructionAttachMapper;
 import com.sooka.sponest.data.housingconstruction.service.ICenterdataTHousingconstructionAttachService;
 import org.apache.commons.collections4.MapUtils;
@@ -27,6 +26,7 @@ public class CenterdataTHousingconstructionAttachServiceImpl implements ICenterd
     private CenterdataTHousingconstructionAttachMapper centerdataTHousingconstructionAttachMapper;
 
     //*******************************************删除*****************************************************/
+
     /**
      * 根据业务数据id删除附件信息
      */
@@ -36,8 +36,10 @@ public class CenterdataTHousingconstructionAttachServiceImpl implements ICenterd
     }
 
     //*******************************************新增List<CenterdataTHousingconstructionAttach>*****************************************************/
+
     /**
      * 新增附件
+     *
      * @param attachList 参数为附件实体的集合
      * @return int 写入的数据条数
      */
@@ -49,13 +51,14 @@ public class CenterdataTHousingconstructionAttachServiceImpl implements ICenterd
 
     /**
      * 根据业务id获取附件集合
+     *
      * @return List<CenterdataTHousingconstructionAttach> 附件实体集合
      */
     @Override
     public List<CenterdataTHousingconstructionAttach> getAttachPathToEntityArray(String busId) {
         List<CenterdataTHousingconstructionAttach> attachListByBusId = centerdataTHousingconstructionAttachMapper.getAttachListByBusId(busId);
         String fileUrl = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey("fileUrl").getData();
-        attachListByBusId.forEach(attach->{
+        attachListByBusId.forEach(attach -> {
             attach.setAttachPath(fileUrl + attach.getAttachPath());
         });
         return attachListByBusId;
@@ -63,12 +66,14 @@ public class CenterdataTHousingconstructionAttachServiceImpl implements ICenterd
 
 
     //*******************************************新增List<String>*****************************************************/
+
     /**
      * 新增附件
+     *
      * @param attachList 参数为附件路径集合
-     * @param busId 业务数据id
-     * @param dictType 字典key，可以为null
-     * @param dictValue 字典值，可以为null
+     * @param busId      业务数据id
+     * @param dictType   字典key，可以为null
+     * @param dictValue  字典值，可以为null
      * @return int 写入的数据条数
      */
     @Override
@@ -77,10 +82,10 @@ public class CenterdataTHousingconstructionAttachServiceImpl implements ICenterd
         int index = 0;
         String[] fileNameArray = fileName.split(",");
         for (String s : attachList) {
-            if(fileNameArray.length < 0 || StringUtils.isEmpty(fileName)){
+            if (fileNameArray.length < 0 || StringUtils.isEmpty(fileName)) {
                 String[] split = s.split("/");
                 dataList.add(new CenterdataTHousingconstructionAttach(busId, dictType, dictValue, s, split[split.length - 1], 0L));
-            }else{
+            } else {
                 dataList.add(new CenterdataTHousingconstructionAttach(busId, dictType, dictValue, s, fileNameArray[index], 0L));
                 index++;
             }
@@ -91,6 +96,7 @@ public class CenterdataTHousingconstructionAttachServiceImpl implements ICenterd
 
     /**
      * 根据业务id获取附件集合
+     *
      * @return List<String> 附件路径集合
      */
     @Override
@@ -106,11 +112,13 @@ public class CenterdataTHousingconstructionAttachServiceImpl implements ICenterd
     }
 
     //*******************************************新增String*****************************************************/
+
     /**
      * 新增附件
+     *
      * @param attachStr 参数为附件路径字符串拼接，以英文逗号分隔
-     * @param busId 业务数据id
-     * @param dictType 字典key，可以为null
+     * @param busId     业务数据id
+     * @param dictType  字典key，可以为null
      * @param dictValue 字典值，可以为null
      * @return int 写入的数据条数
      */
@@ -121,6 +129,7 @@ public class CenterdataTHousingconstructionAttachServiceImpl implements ICenterd
 
     /**
      * 根据业务id获取附件集合
+     *
      * @return String 附件路径拼接字符串，以英文逗号分隔
      */
     @Override
@@ -142,17 +151,19 @@ public class CenterdataTHousingconstructionAttachServiceImpl implements ICenterd
     }
 
     //*******************************************新增List<Map<String, Object>>*****************************************************/
+
     /**
      * 新增附件
+     *
      * @param attachList 新增的附件集合
-     * 请求样例：[{
-     *  "key":"字段名",
-     *  "value":"附件路径"
-     * },{
-     *  "key":"字段名",
-     *  "value":"附件路径"
-     * }]
-     * @param busId 业务id
+     *                   请求样例：[{
+     *                   "key":"字段名",
+     *                   "value":"附件路径"
+     *                   },{
+     *                   "key":"字段名",
+     *                   "value":"附件路径"
+     *                   }]
+     * @param busId      业务id
      * @return int 新增的数据条数
      */
     @Override
@@ -169,25 +180,25 @@ public class CenterdataTHousingconstructionAttachServiceImpl implements ICenterd
 
     /**
      * 根据业务id获取附件
+     *
      * @param busId 业务id
      * @return Map<String, Object>
      * 返回样例：{
-     *  "新增时设置的key":"附件路径",
-     *  "新增时设置的key":"附件路径"
+     * "新增时设置的key":"附件路径",
+     * "新增时设置的key":"附件路径"
      * }
      */
     @Override
-    public Map<String, Object> getAttachToMap(String busId){
+    public Map<String, Object> getAttachToMap(String busId) {
         List<CenterdataTHousingconstructionAttach> attachPathToEntityArray = getAttachPathToEntityArray(busId);
         HashMap<String, Object> result = new HashMap<>();
-        attachPathToEntityArray.forEach(attach->{
+        attachPathToEntityArray.forEach(attach -> {
             result.put(attach.getDictType(), attach.getAttachPath());
         });
         return result;
     }
 
 
-
     /**
      * 新增时路径处理（私有方法）
      */
@@ -221,33 +232,32 @@ public class CenterdataTHousingconstructionAttachServiceImpl implements ICenterd
 
     /**
      * 针对文件类型数据处理
+     *
      * @param busId 业务id
-     * @param type 要与附件表中dict_type匹配的字符串
+     * @param type  要与附件表中dict_type匹配的字符串
      * @return String   附件路径+文件名 以逗号拼接
      */
     @Override
-    public String replasePathToFile(String busId,String type){
+    public String replasePathToFile(String busId, String type) {
         List<CenterdataTHousingconstructionAttach> attachList = getAttachPathToEntityArray(busId);
         StringBuilder newDiles = new StringBuilder();
         String fileurl = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey(DOWNLOAD_URL).getData();
-        attachList.forEach(attach->{
-            if(StringUtils.isNotEmpty(type)){
-                if(type.equals(attach.getDictType())){
-                    String filename = attach.getFileName(); //新建 Microsoft Excel 工作表 (2).xlsx
-                    String url = attach.getAttachPath().substring(attach.getAttachPath().indexOf("group1"),attach.getAttachPath().length()); //group1/M00/00/84/wKgKEGawNfGAW7bwAAAxRySSUAM25.xlsx
-                    String group = url.substring(0, url.indexOf('/')); //group1
-                    newDiles.append(fileurl + "Download?fileName=" + filename + "&&group=" + group + "&&path=" + url.substring(url.indexOf('/') + 1) + "+" + filename + ",");
-                }
-            }else{
-                if(type.equals(attach.getDictValue())){
+        attachList.forEach(attach -> {
+            if (StringUtils.isNotEmpty(type)) {
+                if (type.equals(attach.getDictType())) {
                     String filename = attach.getFileName(); //新建 Microsoft Excel 工作表 (2).xlsx
-                    String url = attach.getAttachPath().substring(attach.getAttachPath().indexOf("group1"),attach.getAttachPath().length()); //group1/M00/00/84/wKgKEGawNfGAW7bwAAAxRySSUAM25.xlsx
+                    String url = attach.getAttachPath().substring(attach.getAttachPath().indexOf("group1"), attach.getAttachPath().length()); //group1/M00/00/84/wKgKEGawNfGAW7bwAAAxRySSUAM25.xlsx
                     String group = url.substring(0, url.indexOf('/')); //group1
                     newDiles.append(fileurl + "Download?fileName=" + filename + "&&group=" + group + "&&path=" + url.substring(url.indexOf('/') + 1) + "+" + filename + ",");
                 }
+            } else {
+                String filename = attach.getFileName(); //新建 Microsoft Excel 工作表 (2).xlsx
+                String url = attach.getAttachPath().substring(attach.getAttachPath().indexOf("group1"), attach.getAttachPath().length()); //group1/M00/00/84/wKgKEGawNfGAW7bwAAAxRySSUAM25.xlsx
+                String group = url.substring(0, url.indexOf('/')); //group1
+                newDiles.append(fileurl + "Download?fileName=" + filename + "&&group=" + group + "&&path=" + url.substring(url.indexOf('/') + 1) + "+" + filename + ",");
             }
         });
-        if(newDiles.length() > 0){
+        if (newDiles.length() > 0) {
             newDiles.deleteCharAt(newDiles.length() - 1);
         }
         return newDiles.toString();

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionGassourceServiceImpl.java

@@ -5,8 +5,11 @@ import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
+import com.ruoyi.common.redis.service.RedisService;
+import com.ruoyi.common.security.utils.DictUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.RemoteConfigService;
+import com.ruoyi.system.api.domain.SysDictData;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionAttach;
 import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionGassource;
@@ -17,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 import static com.sooka.sponest.data.utils.DataConstants.DOWNLOAD_URL;
 
@@ -82,7 +86,15 @@ public class CenterdataTHousingconstructionGassourceServiceImpl extends BaseServ
     @Override
     public List<CenterdataTHousingconstructionGassource> selectCenterdataTHousingconstructionGassourceList(CenterdataTHousingconstructionGassource centerdataTHousingconstructionGassource) {
         setSookaDataBase(centerdataTHousingconstructionGassource);
-        return centerdataTHousingconstructionGassourceMapper.selectCenterdataTHousingconstructionGassourceList(centerdataTHousingconstructionGassource);
+        List<CenterdataTHousingconstructionGassource> dataList = centerdataTHousingconstructionGassourceMapper.selectCenterdataTHousingconstructionGassourceList(centerdataTHousingconstructionGassource);
+        Map<String, Object> housingconstructionComponent = DictUtils.getDictCacheToMap("housingconstruction_component");
+        dataList.forEach(data->{
+            String label = String.valueOf(housingconstructionComponent.get(data.getComponent()));
+            if(StringUtils.isNotEmpty(label)){
+                data.setComponentLabel(label);
+            }
+        });
+        return dataList;
     }
 
     /**

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionRealnameuserServiceImpl.java

@@ -1,7 +1,9 @@
 package com.sooka.sponest.data.housingconstruction.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
+import com.ruoyi.common.security.utils.DictUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionRealnameuser;
@@ -11,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 住建-实名用户Service业务层处理
@@ -44,7 +47,15 @@ public class CenterdataTHousingconstructionRealnameuserServiceImpl extends BaseS
     @DataScopeMutiDept(deptAlias = "d")
     public List<CenterdataTHousingconstructionRealnameuser> selectCenterdataTHousingconstructionRealnameuserList(CenterdataTHousingconstructionRealnameuser centerdataTHousingconstructionRealnameuser) {
         setSookaDataBase(centerdataTHousingconstructionRealnameuser);
-        return centerdataTHousingconstructionRealnameuserMapper.selectCenterdataTHousingconstructionRealnameuserList(centerdataTHousingconstructionRealnameuser);
+        List<CenterdataTHousingconstructionRealnameuser> dataList = centerdataTHousingconstructionRealnameuserMapper.selectCenterdataTHousingconstructionRealnameuserList(centerdataTHousingconstructionRealnameuser);
+        Map<String, Object> housingconstructionComponent = DictUtils.getDictCacheToMap("enterprise_user_type");
+        dataList.forEach(data->{
+            String label = String.valueOf(housingconstructionComponent.get(data.getEnterpriseUserType()));
+            if(StringUtils.isNotEmpty(label)){
+                data.setEnterpriseUserTypeLabel(label);
+            }
+        });
+        return dataList;
     }
 
     /**