Skip to content

A
amos-boot-biz
Commit b38f90b0 authored by 刘林's avatar 刘林
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents 0f5f8241 f0a95987
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 16 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/changeRegistrationReform/ChangeRegistrationReformEditUpdateService.java
View file @ b38f90b0
......@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
......@@ -18,7 +17,6 @@ import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformEqServiceImpl;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformServiceImpl;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
......@@ -99,11 +97,7 @@ public class ChangeRegistrationReformEditUpdateService {
mainService.update(updateWrapper);
} else { // 完成时，把管道更新为已纳管状态
// 按照装置id查询装置下管道，更新为已纳管状态
List<IdxBizJgUseInfo> useInfos = commonEquipDataProcessService.getIdxBizJgUseInfoService().list(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, jgChangeRegistrationReform.getProjectContraptionId()).eq(IdxBizJgUseInfo::getIsIntoManagement, false).select(TzsBaseEntity::getSequenceNbr, IdxBizJgUseInfo::getRecord));
useInfos.parallelStream().forEach(e -> {
commonEquipDataProcessService.setNewPipeline2InUseState(e, jgChangeRegistrationReform.getUseRegistrationCode());
commonEquipDataProcessService.updateUseOrgCode2NewPipeline(e, jgChangeRegistrationReform.getUseRegistrationCode());
});
commonEquipDataProcessService.updatePipeline2InUse(jgChangeRegistrationReform.getProjectContraptionId(), jgChangeRegistrationReform.getUseRegistrationCode());
}
// 记录本次维护管道的日志
this.updatePipelineData(allChangeColumns, applyNo, model);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/newProject/NewProjectEditUpdateService.java
View file @ b38f90b0
......@@ -33,7 +33,7 @@ public class NewProjectEditUpdateService {
// 按照装置id查询装置下管道，更新为已纳管状态写入使用登记证编号
List<IdxBizJgUseInfo> useInfos = useInfoService.list(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, projectContraptionId).eq(IdxBizJgUseInfo::getIsIntoManagement, false).select(IdxBizJgUseInfo::getRecord, TzsBaseEntity::getSequenceNbr));
useInfos.parallelStream().forEach(e -> {
commonEquipDataProcessService.setNewPipeline2InUseState(e, projectContraption.getUseRegistrationCode());
commonEquipDataProcessService.setNewPipelineUseState(e, projectContraption.getUseRegistrationCode());
commonEquipDataProcessService.updateUseOrgCode2NewPipeline(e, projectContraption.getUseRegistrationCode());
});
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/useRegister/UseRegisterUpdateService.java
View file @ b38f90b0
......@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.constant.EditConstant;
import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.strategy.IBizDataChangeHandleStrategy;
import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.CommonEquipDataProcessService;
import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.PieLineDataChangeServiceImpl;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgUseInfoServiceImpl;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationEqServiceImpl;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
......@@ -86,11 +87,7 @@ public class UseRegisterUpdateService {
jgUseRegistrationService.update(wrapper);
} else { // 完成时，把管道更新为已纳管状态
// 按照装置id查询装置下管道，更新为已纳管状态
List<IdxBizJgUseInfo> useInfos = jgUseRegistrationService.getIdxBizJgUseInfoService().list(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, useRegistration.getProjectContraptionId()).eq(IdxBizJgUseInfo::getIsIntoManagement, false).select(TzsBaseEntity::getSequenceNbr, IdxBizJgUseInfo::getRecord));
useInfos.parallelStream().forEach(e -> {
commonEquipDataProcessService.setNewPipeline2InUseState(e, useRegistration.getUseRegistrationCode());
commonEquipDataProcessService.updateUseOrgCode2NewPipeline(e, useRegistration.getUseRegistrationCode());
});
commonEquipDataProcessService.updatePipeline2InUse(useRegistration.getProjectContraptionId(), useRegistration.getUseRegistrationCode());
}
// 记录本次维护管道的日志
this.updatePipelineData(allChangeColumns, applyNo, model);
......@@ -98,7 +95,6 @@ public class UseRegisterUpdateService {
}
private List<JgUseRegistrationEq> buildPipelineEqs(Map<String, List<PipelineChangeItemDto>> pipelineChangeItemMap) {
List<PipelineChangeItemDto> newPipelines = pipelineChangeItemMap.get(EditConstant.NEW_PIPELINES);
List<PipelineChangeItemDto> updPipelines = pipelineChangeItemMap.get(EditConstant.UPDATE_PIPELINES);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java
View file @ b38f90b0
......@@ -1127,7 +1127,7 @@ public class CommonEquipDataProcessService {
.collect(Collectors.toList());
}
public void setNewPipeline2InUseState(IdxBizJgUseInfo useInfo, String useOrgCode) {
public void setNewPipelineUseState(IdxBizJgUseInfo useInfo, String useOrgCode) {
// es 更新为已纳管
LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TzsBaseEntity::getSequenceNbr, useInfo.getSequenceNbr());
......@@ -1150,4 +1150,12 @@ public class CommonEquipDataProcessService {
updateWrapper.set(IdxBizJgRegisterInfo::getUseOrgCode, useOrgCode);
jgUseRegistrationService.getIdxBizJgRegisterInfoService().update(updateWrapper);
}
public void updatePipeline2InUse( String projectContraptionId, String useRegistrationCode) {
List<IdxBizJgUseInfo> useInfos = idxBizJgUseInfoService.list(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, projectContraptionId).eq(IdxBizJgUseInfo::getIsIntoManagement, false).select(TzsBaseEntity::getSequenceNbr, IdxBizJgUseInfo::getRecord));
useInfos.parallelStream().forEach(e -> {
this.setNewPipelineUseState(e, useRegistrationCode);
this.updateUseOrgCode2NewPipeline(e, useRegistrationCode);
});
}
}
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
View file @ b38f90b0
......@@ -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,43 @@ 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) {
LambdaUpdateWrapper<IdxBizJgConstructionInfo> updateWrapper1 = new LambdaUpdateWrapper<>();
updateWrapper1.eq(TzsBaseEntity::getSequenceNbr, item.getString("constructionInfoSeq"));
updateWrapper1.set(IdxBizJgConstructionInfo::getUscUnitName, item.getString("uscUnitName"));
updateWrapper1.set(IdxBizJgConstructionInfo::getUscDate, ValidationUtil.isEmpty(item.getString("uscDate")) ? null : DateUtil.parse(item.getString("uscDate"), DatePattern.NORM_MONTH_FORMAT));
idxBizJgConstructionInfoService.update(updateWrapper1);
}
}
}
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