Commit ac0d7738 authored by suhuiguang's avatar suhuiguang

fix(大编辑):bug修复

1.使用登记审批完成时按照json更新技术参数、设计信息、安装信息 2管道es增加使用登记证编号
parent efc5a214
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapBuilder;
import cn.hutool.core.map.MapUtil;
......@@ -1198,6 +1199,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
}
if (!CollectionUtils.isEmpty(equipmentLists)) {
// 装置更新管道的技术参数、设计信息、安装信息
if(jgProjectContraption != null){
updatePieLineTechAndInspection(equipmentLists);
}
for (int i = 0; i < equipmentLists.size(); i++) {
Map<String, Object> equipment = equipmentLists.get(i);
// 设备ID
......@@ -1216,7 +1221,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
otherInfo.setSupervisoryCode(jgProjectContraption.getSupervisoryCode());
registerInfo.setEquCode(jgProjectContraption.getEquCode());
}
// 压力管道:[更新的原始引用]更新检验日期-nextInspectDate、检验结论-inspectConclusion、检验机构名称-inspectOrgName
// equipment.put("nextInspectDate", mapData.getOrDefault("nextInspectDate", ""));
// equipment.put("inspectOrgName", mapData.getOrDefault("inspectOrgName", ""));
......@@ -1263,6 +1267,42 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
commonServiceImpl.saveExecuteFlowData2Redis(jgUseRegistration.getInstanceId(), this.buildInstanceRuntimeData(jgUseRegistration));
}
/**
* 管道的技术参数及检验信息更新
* @return 更新的管道信息
*/
private void updatePieLineTechAndInspection(List<Map<String, Object>> piePines) {
for (Map<String, Object> piePine : piePines) {
JSONObject item = JSONObject.parseObject(JSON.toJSONString(piePine));
IdxBizJgTechParamsPipeline pipeline = new IdxBizJgTechParamsPipeline();
pipeline.setMedium(item.getString("medium"));
pipeline.setPressure(item.getString("pressure"));
pipeline.setNominalDiameter(item.getString("nominalDiameter"));
pipeline.setTemperature(item.getString("temperature"));
pipeline.setWallThickness(item.getString("wallThickness"));
pipeline.setWorkMedium(item.getString("workMedium"));
pipeline.setWorkPressure(item.getString("workPressure"));
pipeline.setWorkTemperature(item.getString("workTemperature"));
pipeline.setPipeLength(item.getString("pipeLength"));
LambdaUpdateWrapper<IdxBizJgTechParamsPipeline> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(IdxBizJgTechParamsPipeline::getRecord, item.getString("record"));
// 技术参数修改
idxBizJgTechParamsPipelineServiceImpl.update(pipeline, updateWrapper);
// 设计单位名称修改
LambdaUpdateWrapper<IdxBizJgDesignInfo> lambdaDes = new LambdaUpdateWrapper<>();
lambdaDes.eq(IdxBizJgDesignInfo::getRecord, item.getString("record"));
lambdaDes.set(IdxBizJgDesignInfo::getDesignUnitName, item.getString("designUnitName"));
idxBizJgDesignInfoService.update(lambdaDes);
// 安装信息修改
if (item.getString("constructionInfoSeq") != null) {
IdxBizJgConstructionInfo constructionInfo = idxBizJgConstructionInfoService.getById(item.getString("constructionInfoSeq"));
constructionInfo.setUscUnitName(item.getString("uscUnitName"));
constructionInfo.setUscDate(ValidationUtil.isEmpty(item.getString("uscDate")) ? null : DateUtil.parse(item.getString("uscDate"), DatePattern.NORM_MONTH_FORMAT));
idxBizJgConstructionInfoService.getBaseMapper().updateById(constructionInfo);
}
}
}
private void updateRegAndProjectContraption(JgUseRegistration jgUseRegistration, JSONObject mapData, IdxBizJgProjectContraption jgProjectContraption) {
//总工程装置
if(!StringUtils.isEmpty(jgProjectContraption)){
......
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