Skip to content

A
amos-boot-biz
Commit 0e65bb8d authored by suhuiguang's avatar suhuiguang
Browse files
Options

移转变更设备详情调整

调整逻辑： 1. 草稿及流程中时显示设备的最新信息 2. 流程为已完成时，设备详情信息不再变更，显示最后一刻数据。
parent db1c61b1
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 2 deletions
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/IdxBizJgRegisterInfoServiceImpl.java
View file @ 0e65bb8d
...@@ -303,6 +303,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -303,6 +303,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
Map<String, Object> equIpClassMap = this.getEquIpClassMap(record, "CamelCase"); Map<String, Object> equIpClassMap = this.getEquIpClassMap(record, "CamelCase");
// 设备注册信息 // 设备注册信息
Map<String, Object> equipInfoMap = this.getEquipInfoMap(record, "CamelCase"); Map<String, Object> equipInfoMap = this.getEquipInfoMap(record, "CamelCase");
SuperviseInfo superviseInfo = superviseInfoMapper.selectOne(new LambdaQueryWrapper<SuperviseInfo>().eq(AbstractEquipBaseEntity::getRecord, record));
if (!ValidationUtil.isEmpty(equIpClassMap)) { if (!ValidationUtil.isEmpty(equIpClassMap)) {
resultMap.putAll(equIpClassMap); resultMap.putAll(equIpClassMap);
} }
...@@ -316,6 +317,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -316,6 +317,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
resultMap.putAll(equipParamsMap); resultMap.putAll(equipParamsMap);
} }
} }
if (!ValidationUtil.isEmpty(superviseInfo)) {
resultMap.put("orgBranchCode", superviseInfo.getOrgBranchCode());
resultMap.put("orgBranchName", superviseInfo.getOrgBranchName());
}
resultMap.remove("instanceId"); resultMap.remove("instanceId");
return resultMap; return resultMap;
} }
......
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/JgChangeRegistrationTransferServiceImpl.java
View file @ 0e65bb8d
...@@ -588,6 +588,23 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -588,6 +588,23 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
Map<String, Object> transferToMap = Bean.BeantoMap(transferById); Map<String, Object> transferToMap = Bean.BeantoMap(transferById);
resultDataMap.putAll(transferToMap); resultDataMap.putAll(transferToMap);
} }
JgRegistrationHistory historyData = jgRegistrationHistoryService.getDteailByRecord(equipId, transferById.getApplyNo());
Map<String,Object> changeData = JSON.parseObject(historyData.getChangeData(),Map.class);
// 省市区街道字段等业务字段
resultDataMap.put("transferProvince", changeData.get("transferProvince"));
resultDataMap.put("transferCity", changeData.get("transferCity"));
resultDataMap.put("transferCounty", changeData.get("transferCounty"));
resultDataMap.put("transferStreet", changeData.get("transferStreet"));
resultDataMap.put("transferUsePlace", changeData.get("transferUsePlace"));
resultDataMap.put("transferAddress", changeData.get("transferAddress"));
resultDataMap.put("transferLongitudeLatitude", changeData.get("transferLongitudeLatitude"));
resultDataMap.put("orgBranchCode", changeData.get("orgBranchCode"));
resultDataMap.put("orgBranchName", changeData.get("orgBranchName"));
resultDataMap.put("transferIsXixian", changeData.get("transferIsXixian"));
resultDataMap.put("transferSafetyManager", changeData.get("transferSafetyManager"));
resultDataMap.put("transferPhone", changeData.get("transferPhone"));
resultDataMap.put("transferUseInfo", changeData.get("transferUseInfo"));
resultDataMap.put("useInnerCode", equipDetailMap.get("equCode"));
resultDataMap.put("receiveOrgCode", transferById.getReceiveCompanyCode() + "_" + transferById.getReceiveOrgName()); resultDataMap.put("receiveOrgCode", transferById.getReceiveCompanyCode() + "_" + transferById.getReceiveOrgName());
} }
String transferSafetyManager = Optional.ofNullable(resultDataMap.get("transferSafetyManager")).orElse("").toString(); String transferSafetyManager = Optional.ofNullable(resultDataMap.get("transferSafetyManager")).orElse("").toString();
...@@ -1252,8 +1269,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -1252,8 +1269,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
result.put("transferAddress",result.get("useAddress")); result.put("transferAddress",result.get("useAddress"));
//移装变更-经纬度 //移装变更-经纬度
result.put("transferLongitudeLatitude",result.get("longitudeLatitude")); result.put("transferLongitudeLatitude",result.get("longitudeLatitude"));
//移装变更-所属监管单位 //移装变更-属地监管部门
result.put("transferSupervisionUnit",result.get("orgBranchCode")+"_"+result.get("orgBranchName")); result.put("orgBranchCode",result.get("orgBranchCode")+"_"+result.get("orgBranchName"));
//移装变更-所属经营单位 //移装变更-所属经营单位
result.put("transferIsXixian",result.get("isNotXiXian")); result.put("transferIsXixian",result.get("isNotXiXian"));
//移装变更-安全管理员 //移装变更-安全管理员
......
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