fix(jg):汇总表打印

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

@@ -2036,16 +2036,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     // 使用单位
                     exportParamsMap.put("useUnitName", jsonObject.get("useUnitName"));
                     // 使用单位地址
-                    exportParamsMap.put("fullAddress", ValidationUtil.isEmpty(jsonObject.get("fullAddress")) ? "" :jsonObject.get("fullAddress"));
+                    String useUnitCreditCode = String.valueOf(jsonObject.get("useUnitCreditCode"));
+                    CompanyModel companyModel = Privilege.companyClient.queryByCompanyCode(useUnitCreditCode).getResult();
+                    exportParamsMap.put("fullAddress", companyModel.getAddress());
                     // 工程（装置）名称 取第一个设备的技术参数”工程装置名称“
                     JSONObject eqJSON = (JSONObject) equipmentLists.get(0);
                     String eqId = !ValidationUtil.isEmpty(eqJSON) ? String.valueOf(eqJSON.get("record")) : "";
-                    EquipTechParamPipeline equipTechParamPipeline = equipTechParamPipelineMapper.queryTechParamInUse(eqId);
-                    String deviceName = Optional.ofNullable(equipTechParamPipeline)
-                            .map(EquipTechParamPipeline::getDeviceName)
-                            .filter(name -> !ValidationUtil.isEmpty(name))
-                            .orElse("");
-                    exportParamsMap.put("nameOfProjectDevice", deviceName);
+                    IdxBizJgUseInfo idxBizJgUseInfo = useInfoMapper.selectOne(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getRecord, eqId));
+                    exportParamsMap.put("nameOfProjectDevice", ValidationUtil.isEmpty(idxBizJgUseInfo) ? "" : idxBizJgUseInfo.getProjectContraption());
                     // 安全管理部门
                     exportParamsMap.put("orgBranchName", String.valueOf(jsonObject.get("orgBranchCode")).split("_")[1]);
                     // 安全管理员