*）气瓶列表增加字段

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/api/dto/CylinderFillingMessageModel.java

@@ -11,4 +11,5 @@ public class CylinderFillingMessageModel extends BaseModel {
     private String message;
     private String appId;
     private String orgCode;
+    private String useUnitCode;
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/api/mapper/TzBaseEnterpriseInfoMapper.java

@@ -47,4 +47,6 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
 	IPage<TzBaseEnterpriseInfoDto> pageList(Page<TzBaseEnterpriseInfoDto> page, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto, List orgCodeList);
 
 	List<TzBaseEnterpriseInfoDto> queryByUseCode(@Param("useCodes") List<String> useCode);
+
+	List<TzBaseEnterpriseInfoDto> queryByAppId(@Param("appIds") List<String> appIds);
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/api/service/CylinderFillingMessageService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFillingMessageModel;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.PageParam;
+import com.yeejoin.amos.boot.module.cylinder.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.cylinder.api.mapper.CylinderFillingMessageMapper;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.CylinderFillingMessageEntity;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -11,6 +12,7 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import joptsimple.internal.Strings;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -24,15 +26,26 @@ import java.util.stream.Collectors;
 
 @Component
 public class CylinderFillingMessageService extends BaseService<CylinderFillingMessageModel, CylinderFillingMessageEntity, CylinderFillingMessageMapper> {
+
+    @Autowired
+    ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService;
+
     public IPage<CylinderFillingMessageModel> getUploadCylinderLogs(PageParam pageParam, String regionCode) {
         CompanyModel result = Privilege.companyClient.queryByCompanyCode(regionCode).getResult();
         Page<CylinderFillingMessageModel> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
-        return getUploadCylinderLogsByOrgCode(page, result.getOrgCode());
+        IPage<CylinderFillingMessageModel> uploadCylinderLogsByOrgCode = getUploadCylinderLogsByOrgCode(page, result.getOrgCode());
+        List<String> appIds = uploadCylinderLogsByOrgCode.getRecords().stream().map(CylinderFillingMessageModel::getAppId).collect(Collectors.toList()).stream().filter(x -> !ValidationUtil.isEmpty(x)).distinct().collect(Collectors.toList());
+        List<TzBaseEnterpriseInfoDto> tzBaseEnterpriseInfoDtos = iTzBaseEnterpriseInfoService.queryByAppId(appIds);
+        if (!ValidationUtil.isEmpty(tzBaseEnterpriseInfoDtos)){
+            Map<String, String> map = tzBaseEnterpriseInfoDtos.stream().collect(Collectors.toMap(TzBaseEnterpriseInfoDto::getAppId, TzBaseEnterpriseInfoDto::getUseUnitCode));
+            uploadCylinderLogsByOrgCode.getRecords().stream().forEach(x -> {
+                x.setUseUnitCode(map.get(x.getAppId()));
+            });
+        }
+        return page;
     }
 
-    public IPage<CylinderFillingMessageModel> getUploadCylinderLogsByOrgCode( Page<CylinderFillingMessageModel> page, @Condition(Operator.likeRight) String orgCode) {
+    public IPage<CylinderFillingMessageModel> getUploadCylinderLogsByOrgCode(Page<CylinderFillingMessageModel> page, @Condition(Operator.likeRight) String orgCode) {
         return queryForPage(page, null, false, orgCode);
     }
-
-
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/api/service/ITzBaseEnterpriseInfoService.java

@@ -46,4 +46,6 @@ public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseI
 	String setLabel(List<Long> enterpriseIds, List<String> enterpriseLabels);
 
 	List<TzBaseEnterpriseInfoDto> queryByUseCode(List<String> useCode);
+
+	List<TzBaseEnterpriseInfoDto> queryByAppId(List<String> appIds);
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -164,4 +164,13 @@
 													</foreach>
 											  </if>
 	</select>
+
+	<select id="queryByAppId" resultType="com.yeejoin.amos.boot.module.cylinder.api.dto.TzBaseEnterpriseInfoDto">
+		select * from tz_base_enterprise_info where app_id in
+		<if test="appIds != null">
+			<foreach collection="appIds" item="appId" open="(" close=")" separator=",">
+				#{appId}
+			</foreach>
+		</if>
+	</select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -4,6 +4,7 @@ package com.yeejoin.amos.boot.module.cylinder.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -514,6 +515,12 @@ public class TzBaseEnterpriseInfoServiceImpl
         return this.baseMapper.queryByUseCode(useCode);
     }
 
+    @Override
+    @DS("tzs")
+    public List<TzBaseEnterpriseInfoDto> queryByAppId(@Condition(Operator.in) List<String> appId) {
+        return this.baseMapper.queryByAppId(appId);
+    }
+
     private String checkLabel(List<String> enterpriseLabels, String result) {
         List<String> strings = Arrays.asList(result.split(","));
         ArrayList<String> res = new ArrayList<>(strings);