hanfucheng 1 year ago
parent
commit
2480f46d3b

+ 6 - 0
src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionViewServiceImpl.java

@@ -1,6 +1,8 @@
 package com.sooka.sponest.data.housingconstruction.service.impl;
 
+import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
+import com.ruoyi.system.api.RemoteConfigService;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.housingconstruction.domain.*;
 import com.sooka.sponest.data.housingconstruction.mapper.CenterdataTHousingconstructionEnterpriseMapper;
@@ -250,7 +252,11 @@ public class CenterdataTHousingconstructionViewServiceImpl extends BaseServiceIm
                 setSookaDataBase(enterprise);
                 enterprise.setId(storagetank.getEnterpriseId());
                 enterprise.setEnterpriseName(storagetank.getName());
+                String fileUrl = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey("fileUrl").getData();
                 mapList = centerdataTHousingconstructionEnterpriseMapper.getEnterpriseList(enterprise);
+                for (Map<String,Object> map : mapList) {
+                    map.put("attachPaths",fileUrl + map.get("attachPaths"));
+                }
                 break;
             case "5":
                 //配送员

+ 4 - 2
src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionEnterpriseMapper.xml

@@ -147,7 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getEnterpriseList" parameterType="CenterdataTHousingconstructionEnterprise" resultType="map">
         SELECT
-            id enterpriseId,
+            a.id enterpriseId,
             enterprise_name enterpriseName,
             enterprise_administrative_area enterpriseAdministrativeArea,
             legal_representative legalRepresentative,
@@ -159,9 +159,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             license_period_end licensePeriodEnd,
             issuing_authority issuingAuthority,
             longitude,
-            latitude
+            latitude,
+            b.attach_path attachPaths
         FROM
             centerdata_t_housingconstruction_enterprise a
+            left join centerdata_t_housingconstruction_attach b on a.id = b.bus_id
                 LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
      <where>
          <if test="id != null  and id != ''"> and a.id = #{id}</if>