Commit e54333a9 authored by 韩桐桐's avatar 韩桐桐

fix(jg):工业管道汇总表打印的使用单位地址调整

parent a9ef89f9
...@@ -2442,8 +2442,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2442,8 +2442,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
exportParamsMap.put("useUnitName", jsonObject.get("useUnitName")); exportParamsMap.put("useUnitName", jsonObject.get("useUnitName"));
// 使用单位地址 // 使用单位地址
String useUnitCreditCode = String.valueOf(jsonObject.get("useUnitCreditCode")); String useUnitCreditCode = String.valueOf(jsonObject.get("useUnitCreditCode"));
CompanyModel companyModel = Privilege.companyClient.queryByCompanyCode(useUnitCreditCode).getResult(); TzBaseEnterpriseInfo enterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new LambdaQueryWrapper<TzBaseEnterpriseInfo>().eq(TzBaseEnterpriseInfo::getUseCode, useUnitCreditCode));
exportParamsMap.put("fullAddress", companyModel.getAddress()); exportParamsMap.put("fullAddress", this.spliceFullAddress(enterpriseInfo));
// 工程(装置)名称 取第一个设备的技术参数”工程装置名称“ // 工程(装置)名称 取第一个设备的技术参数”工程装置名称“
JSONObject eqJSON = (JSONObject) equipmentLists.get(0); JSONObject eqJSON = (JSONObject) equipmentLists.get(0);
String eqId = !ValidationUtil.isEmpty(eqJSON) ? String.valueOf(eqJSON.get("record")) : ""; String eqId = !ValidationUtil.isEmpty(eqJSON) ? String.valueOf(eqJSON.get("record")) : "";
...@@ -2478,6 +2478,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2478,6 +2478,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
return futures; return futures;
} }
private String spliceFullAddress(TzBaseEnterpriseInfo enterpriseInfo) {
String address = enterpriseInfo.getAddress();
boolean hasProvince = address.contains("省");
boolean hasCity = address.contains("市");
boolean hasDistrict = address.contains("区");
if (hasProvince && hasCity && hasDistrict) {
return address;
}
return enterpriseInfo.getProvince() + enterpriseInfo.getCity() + enterpriseInfo.getDistrict() + enterpriseInfo.getStreet() + enterpriseInfo.getCommunity() + enterpriseInfo.getAddress();
}
/** /**
* 气瓶设备数据填充 * 气瓶设备数据填充
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment