Commit b38d2184 authored by 刘林's avatar 刘林

fix(jg):批量移装登记证更新bug修改

parent 1d4bdf50
...@@ -947,7 +947,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -947,7 +947,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
//修改各类告知列表,置为废弃 //修改各类告知列表,置为废弃
this.updateInvalidStatusByHistory(device.getEquId(), device.getEquipTransferId()); this.updateInvalidStatusByHistory(device.getEquId(), device.getEquipTransferId());
//修改证管理表数据 //修改证管理表数据
this.updateUseRegistrationManage(transfer, historyData, useRegistrationCode.get(), isUpdateRegistrationCode.get()); this.updateUseRegistrationManage(device, transfer, historyData, useRegistrationCode.get(), isUpdateRegistrationCode.get());
}); });
} }
...@@ -963,7 +963,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -963,7 +963,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
this.updateTransferByBaseInfo(transfer); this.updateTransferByBaseInfo(transfer);
} }
private void updateUseRegistrationManage(JgChangeRegistrationTransfer transfer, JgRegistrationHistory historyData, String useRegistrationCode, boolean isUpdateRegistrationCode) { private void updateUseRegistrationManage(JgChangeRegistrationTransferEq device, JgChangeRegistrationTransfer transfer, JgRegistrationHistory historyData, String useRegistrationCode, boolean isUpdateRegistrationCode) {
JSONObject historyJson = JSON.parseObject(historyData.getChangeData()); JSONObject historyJson = JSON.parseObject(historyData.getChangeData());
List<JgUseRegistrationManage> registrationList = useRegistrationManageService.lambdaQuery() List<JgUseRegistrationManage> registrationList = useRegistrationManageService.lambdaQuery()
.in(BaseEntity::getSequenceNbr, .in(BaseEntity::getSequenceNbr,
...@@ -971,12 +971,14 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -971,12 +971,14 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
.map(obj -> ((JSONObject) obj).getString("sequenceNbr")) .map(obj -> ((JSONObject) obj).getString("sequenceNbr"))
.collect(Collectors.toList()) .collect(Collectors.toList())
).list(); ).list();
registrationList.forEach(registrationManage -> { registrationList.forEach(registrationManage -> {
registrationManage.setReceiveOrgName(transfer.getReceiveOrgName()); registrationManage.setReceiveOrgName(transfer.getReceiveOrgName());
registrationManage.setReceiveCompanyCode(transfer.getReceiveOrgCode()); registrationManage.setReceiveCompanyCode(transfer.getReceiveOrgCode());
registrationManage.setAuditPassDate(new Date()); registrationManage.setAuditPassDate(new Date());
registrationManage.setEquUseAddress(transfer.getFullAddress()); registrationManage.setEquUseAddress(transfer.getFullAddress());
if (isUpdateRegistrationCode) { if (isUpdateRegistrationCode && !StringUtils.isEmpty(registrationManage.getUseRegistrationCode())
&& device.getUseRegistrationCode() != null && device.getUseRegistrationCode().equals(registrationManage.getUseRegistrationCode())) {
registrationManage.setUseRegistrationCode(useRegistrationCode); registrationManage.setUseRegistrationCode(useRegistrationCode);
} }
registrationManage.setCertificateStatus("已登记"); registrationManage.setCertificateStatus("已登记");
......
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