Commit d44c4f97 authored by 刘林's avatar 刘林

fix:(jg):管道补证功能修改

parent 768b4152
...@@ -1014,7 +1014,11 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate ...@@ -1014,7 +1014,11 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
Map<String, Object> result = mapper.convertValue(certRep, new TypeReference<Map<String, Object>>() { Map<String, Object> result = mapper.convertValue(certRep, new TypeReference<Map<String, Object>>() {
}); });
result.put(EQU_LISTS, this.queryEquByCert(certRep.getUseRegistrationCode())); if (PipelineEnum.PRESSURE_PIPELINE.getCode().equals(certRep.getEquListCode())) {
result.put(EQU_LISTS, this.getProConByUseRegistrationCode(certRep.getUseRegistrationCode()));
} else {
result.put(EQU_LISTS, this.queryEquByCert(certRep.getUseRegistrationCode()));
}
result.put(LOSS_DAMAGE_TIME, certRep.getLossDamageTime()); result.put(LOSS_DAMAGE_TIME, certRep.getLossDamageTime());
JSONObject jsonObject = commonService.queryHistoryData(sequenceNbr); JSONObject jsonObject = commonService.queryHistoryData(sequenceNbr);
result.put(SAFETY_MANAGER_ID, jsonObject.get(SAFETY_MANAGER_ID)); result.put(SAFETY_MANAGER_ID, jsonObject.get(SAFETY_MANAGER_ID));
......
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