Commit d3b204c8 authored by suhuiguang's avatar suhuiguang

1.单位更名变更三级审核通过,二级撤回时报错报流程已经执行

parent 59e97f60
......@@ -779,7 +779,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
.build();
}
@Transactional
@Transactional(rollbackFor = Exception.class)
public void accept(JgChangeRegistrationUnitDto dto, String op) {
String lockKey = CommonServiceImpl.buildJgExecuteLockKey(dto.getInstanceId());
RLock lock = redissonClient.getLock(lockKey);
......@@ -854,8 +854,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
useInfo.setUseUnitName(jgChangeRegistrationUnit.getNewUseUnitName());
useInfo.setUseUnitCreditCode(jgChangeRegistrationUnit.getNewUseUnitCreditCode());
// String code = getCode(tzsJgOtherInfo.getSupervisoryCode());
String code = commonServiceImpl.generateRegistrationCode(jgChangeRegistrationUnitEq.getEquId(), tzsJgOtherInfo.getSupervisoryCode(), dto.getReceiveCompanyCode());
if (ValidationUtil.isEmpty(code)) {
log.error("生成新的使用登记证编号失败");
......@@ -865,6 +863,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
jgChangeRegistrationUnit.setUseRegistCode(code);
//更新使用注册登记证编号
idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(equipId, code);
jgChangeRegistrationUnit.setNextExecuteUserIds(nextTaskId);
useInfoMapper.updateById(useInfo);
//es中的编号信息
Map<String, Map<String, Object>> resultMap = new HashMap<>();
......
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