Commit be15dbb6 authored by 刘林's avatar 刘林

fix(jg):单位变更bug修改

parent b6e8c3b2
...@@ -1222,18 +1222,21 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -1222,18 +1222,21 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
dto.getRegistrationList().forEach(v -> { dto.getRegistrationList().forEach(v -> {
String useCode = String.valueOf(v.get("useRegistrationCode")); String useCode = String.valueOf(v.get("useRegistrationCode"));
String newCarNumber = String.valueOf(v.get("newCarNumber")); String newCarNumber = String.valueOf(v.get("newCarNumber"));
String[] estateData = String.valueOf(v.get("estateUnitName")).split("_", 2); String estateUnitSeq = String.valueOf(v.get("estateUnitName"));
TzBaseEnterpriseInfo enterpriseInfo = (estateUnitSeq != null && !estateUnitSeq.isEmpty())
? tzBaseEnterpriseInfoMapper.selectById(estateUnitSeq)
: null;
List<String> records = idxBizJgRegisterInfoService.getBaseMapper() List<String> records = idxBizJgRegisterInfoService.getBaseMapper()
.selectList(new LambdaQueryWrapper<IdxBizJgRegisterInfo>() .selectList(new LambdaQueryWrapper<IdxBizJgRegisterInfo>()
.eq(IdxBizJgRegisterInfo::getUseOrgCode, useCode)) .eq(IdxBizJgRegisterInfo::getUseOrgCode, useCode))
.stream() .stream()
.map(IdxBizJgRegisterInfo::getRecord) .map(IdxBizJgRegisterInfo::getRecord)
.collect(Collectors.toList()); .collect(Collectors.toList());
if (!records.isEmpty()) { if (!records.isEmpty() && enterpriseInfo !=null) {
idxBizJgUseInfoService.update( idxBizJgUseInfoService.update(
new IdxBizJgUseInfo() new IdxBizJgUseInfo()
.setEstateUnitCreditCode(estateData[0]) .setEstateUnitCreditCode(enterpriseInfo.getUseCode())
.setEstateUnitName(estateData[1]), .setEstateUnitName(enterpriseInfo.getUseUnit()),
new LambdaQueryWrapper<IdxBizJgUseInfo>() new LambdaQueryWrapper<IdxBizJgUseInfo>()
.in(IdxBizJgUseInfo::getRecord, records) .in(IdxBizJgUseInfo::getRecord, records)
); );
...@@ -1336,7 +1339,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -1336,7 +1339,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
for (Map<String, Object> map : projectContraptionList) { for (Map<String, Object> map : projectContraptionList) {
String useRegistrationCode = (String) map.get("useRegistrationCode"); String useRegistrationCode = (String) map.get("useRegistrationCode");
String sequenceNbr = (String) map.get("sequenceNbr"); String sequenceNbr = (String) map.get("sequenceNbr");
String[] estateData = String.valueOf(map.get("estateUnitName")).split("_", 2); String estateUnitSeq = String.valueOf(map.get("estateUnitName"));
TzBaseEnterpriseInfo enterpriseInfo = (estateUnitSeq != null && !estateUnitSeq.isEmpty())
? tzBaseEnterpriseInfoMapper.selectById(estateUnitSeq)
: null;
LambdaQueryWrapper<IdxBizJgProjectContraption> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IdxBizJgProjectContraption> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(IdxBizJgProjectContraption::getUseRegistrationCode, useRegistrationCode) wrapper.eq(IdxBizJgProjectContraption::getUseRegistrationCode, useRegistrationCode)
.isNotNull(IdxBizJgProjectContraption::getUseRegistrationCode) .isNotNull(IdxBizJgProjectContraption::getUseRegistrationCode)
...@@ -1346,10 +1352,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -1346,10 +1352,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
throw new BadRequest("使用登记证编号:" + useRegistrationCode + "对应的工程/装置列表不存在"); throw new BadRequest("使用登记证编号:" + useRegistrationCode + "对应的工程/装置列表不存在");
} }
//更新产权信息 //更新产权信息
idxBizJgUseInfoService.update( if (enterpriseInfo != null){
new IdxBizJgUseInfo().setEstateUnitCreditCode(estateData[0]).setEstateUnitName(estateData[1]), idxBizJgUseInfoService.update(
new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, sequenceNbr) new IdxBizJgUseInfo().setEstateUnitCreditCode(enterpriseInfo.getUseCode())
); .setEstateUnitName(enterpriseInfo.getUseUnit()),
new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, sequenceNbr)
);
}
//如果工程装置对应一个证就直接变更给新单位 否则重新生成一个登记证 //如果工程装置对应一个证就直接变更给新单位 否则重新生成一个登记证
if (jgProjectContraptions.size() == 1) { if (jgProjectContraptions.size() == 1) {
......
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