Commit efc5a214 authored by suhuiguang's avatar suhuiguang

refactor(大编辑):管道增减功能开发

1.公共方法抽取
parent 5a1ac925
......@@ -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);
......
......@@ -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());
});
}
......
......@@ -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);
......
......@@ -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);
});
}
}
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