Commit c26e1493 authored by suhuiguang's avatar suhuiguang

fix(大编辑):bug修复

1.bug29158修改了电梯设备单位内部编号,提交后申请单的单位内部编号依然显示旧数据
parent 5f8b4ef3
package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.useRegister; package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.useRegister;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta; import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration; import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq; import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum; import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.biz.controller.BizDataChangeController;
import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher; import com.yeejoin.amos.boot.module.jg.biz.edit.core.RouterEventPublisher;
import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent; import com.yeejoin.amos.boot.module.jg.biz.edit.event.BaseBizDataChangeEvent;
import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler; import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.DefaultBizDataChangeHandler;
...@@ -43,19 +41,19 @@ public class UseRegisterDataChangeHandler extends DefaultBizDataChangeHandler<Ba ...@@ -43,19 +41,19 @@ public class UseRegisterDataChangeHandler extends DefaultBizDataChangeHandler<Ba
* 保存 * 保存
* *
* @param applyNo 单据编号 * @param applyNo 单据编号
* @param model single, batch * @param model @see IBizDataChangeHandleStrategy.ModelType
* @param changeData 前端不支持分组-目前为平铺数据结构 * @param changeData 前端不支持分组-目前为平铺数据结构
*/ */
@Override @Override
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) { public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
List<FieldChangeMeta> bizEditColumns = new ArrayList<>(); List<FieldChangeMeta> bizEditColumns = new ArrayList<>();
// 1.流程中时-更新单据-业务冗余的字段 // 1.流程中时-更新单据-业务冗余的字段
this.updateBizInfo(changeData); this.updateBizInfo(bizId, applyNo, model);
return bizEditColumns; return bizEditColumns;
} }
private void updateBizInfo(Map<String, Object> changeData) { private void updateBizInfo(String bizId, String applyNo, ModelType model) {
useRegisterUpdateService.updateBizInfo(changeData); useRegisterUpdateService.updateBizInfo(bizId, applyNo, model);
} }
@Override @Override
......
package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.useRegister; package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.useRegister;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper; import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
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.CommonEquipDataProcessService;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgProjectContraptionServiceImpl;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationEqServiceImpl; 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.jg.biz.service.impl.JgUseRegistrationServiceImpl;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper; import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
...@@ -26,30 +25,24 @@ import java.util.function.Function; ...@@ -26,30 +25,24 @@ import java.util.function.Function;
@Slf4j @Slf4j
public class UseRegisterUpdateService { public class UseRegisterUpdateService {
private final IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
private final IdxBizJgProjectContraptionServiceImpl idxBizJgProjectContraptionService;
private final RedisUtils redisUtils;
private final JgUseRegistrationServiceImpl jgUseRegistrationService; private final JgUseRegistrationServiceImpl jgUseRegistrationService;
private final Map<String, Function<JSONObject, Boolean>> bizHandlers = new ConcurrentHashMap<>();
private final CommonEquipDataProcessService commonEquipDataProcessService; private final CommonEquipDataProcessService commonEquipDataProcessService;
private final CommonMapper commonMapper;
private final JgUseRegistrationEqServiceImpl useRegistrationEqService; private final JgUseRegistrationEqServiceImpl useRegistrationEqService;
public void updateBizInfo(Map<String, Object> changeData) { public void updateBizInfo(String bizId, String applyNo, IBizDataChangeHandleStrategy.ModelType model) {
if(model.equals(IBizDataChangeHandleStrategy.ModelType.singleEquip)){
JgUseRegistration useRegistration = jgUseRegistrationService.getOne(new LambdaQueryWrapper<JgUseRegistration>().select(BaseEntity::getSequenceNbr, JgUseRegistration::getStatus).eq(JgUseRegistration::getApplyNo, applyNo));
// 非管道类设备且非已完成状态时,在编辑后进行内部设备代码的更新
if(!useRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())){
JSONObject jsonObject = jgUseRegistrationService.getHisData(useRegistration);
IdxBizJgUseInfo bizJgUseInfo = commonEquipDataProcessService.getIdxBizJgUseInfoService().getOneData(bizId);
String useInnerCode = bizJgUseInfo.getUseInnerCode();
jsonObject.put("useInnerCode", useInnerCode);
jgUseRegistrationService.updateHistory(jsonObject, bizId, useRegistration.getSequenceNbr() + "", null );
}
} }
public List<FieldChangeMeta> updCertDataIfBizFin(String applyNo, JSONObject data) {
// 更新证信息
return new ArrayList<>();
} }
} }
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