|
|
@@ -655,7 +655,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
// 只存储需要【修改】的数据
|
|
|
List<InsPlyIncome> updateExcel = new ArrayList<>();
|
|
|
|
|
|
- // ===================== 第一步:校验Excel内部保单号重复 =====================
|
|
|
+ // 校验Excel内部保单号重复
|
|
|
Set<String> existPolicyNoSet = new HashSet<>();
|
|
|
Set<String> repeatPolicyNoSet = new HashSet<>();
|
|
|
|
|
|
@@ -691,7 +691,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
InsPlyIncome existIncome = baseMapper.selectOne(new LambdaQueryWrapper<InsPlyIncome>()
|
|
|
.eq(InsPlyIncome::getJqPolicyNo, vo.getJqPolicyNo()));
|
|
|
|
|
|
- // ===================== 【关键修改】数据库不存在 → 直接失败 =====================
|
|
|
+ // 数据库不存在 → 直接失败
|
|
|
if (Objects.isNull(existIncome)) {
|
|
|
failedNumber++;
|
|
|
vo.setErrorMessage("保单号不存在,不允许新增");
|
|
|
@@ -699,7 +699,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- // ===================== 数据库已存在 → 继续后续校验(需求3顺序) =====================
|
|
|
+ // 数据库已存在 → 继续后续校验
|
|
|
// 判断已开票 / 已结算
|
|
|
if ("1".equals(existIncome.getSuperviseSettlement()) || "1".equals(existIncome.getOtherSettlement())
|
|
|
|| "1".equals(existIncome.getJySuperviseSettlement()) || "1".equals(existIncome.getJyOtherSettlement())) {
|
|
|
@@ -711,7 +711,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
|
|
|
// 封装修改数据
|
|
|
InsPlyIncome insPlyIncome = new InsPlyIncome();
|
|
|
- insPlyIncome.setId(existIncome.getId()); // 必须带ID才能修改
|
|
|
+ insPlyIncome.setId(existIncome.getId());
|
|
|
insPlyIncome.setLicenseNo(vo.getLicenseNo());
|
|
|
insPlyIncome.setJqPolicyNo(vo.getJqPolicyNo());
|
|
|
insPlyIncome.setJqSuperviseCostsProportion(vo.getJqSuperviseCostsProportion());
|