|
|
@@ -729,36 +729,37 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
return false;
|
|
|
}
|
|
|
long result = 0;
|
|
|
+ final String number = "1";
|
|
|
switch (invoiceType) {
|
|
|
- case "1":
|
|
|
+ case number:
|
|
|
result = baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
|
|
|
.in(InsPlyIncome::getId, invoiceIds)
|
|
|
- .set(InsPlyIncome::getSuperviseSettlement, "1"));
|
|
|
+ .set(InsPlyIncome::getSuperviseSettlement, number));
|
|
|
break;
|
|
|
case "2":
|
|
|
result = baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
|
|
|
.in(InsPlyIncome::getId, invoiceIds)
|
|
|
- .set(InsPlyIncome::getOtherSettlement, "1"));
|
|
|
+ .set(InsPlyIncome::getOtherSettlement, number));
|
|
|
break;
|
|
|
case "3":
|
|
|
result = baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
|
|
|
.in(InsPlyIncome::getId, invoiceIds)
|
|
|
- .set(InsPlyIncome::getJySuperviseSettlement, "1"));
|
|
|
+ .set(InsPlyIncome::getJySuperviseSettlement, number));
|
|
|
break;
|
|
|
case "4":
|
|
|
result = baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
|
|
|
.in(InsPlyIncome::getId, invoiceIds)
|
|
|
- .set(InsPlyIncome::getJyOtherSettlement, "1"));
|
|
|
+ .set(InsPlyIncome::getJyOtherSettlement, number));
|
|
|
break;
|
|
|
case "5":
|
|
|
result = baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
|
|
|
.in(InsPlyIncome::getId, invoiceIds)
|
|
|
- .set(InsPlyIncome::getPlatformSuperviseSettlement, "1").set(InsPlyIncome::getSettlementStatus, "1"));
|
|
|
+ .set(InsPlyIncome::getPlatformSuperviseSettlement, number).set(InsPlyIncome::getSettlementStatus, number));
|
|
|
break;
|
|
|
case "6":
|
|
|
result = baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
|
|
|
.in(InsPlyIncome::getId, invoiceIds)
|
|
|
- .set(InsPlyIncome::getPlatformOtherSettlement, "1").set(InsPlyIncome::getSettlementStatus, "1"));
|
|
|
+ .set(InsPlyIncome::getPlatformOtherSettlement, number).set(InsPlyIncome::getSettlementStatus, number));
|
|
|
break;
|
|
|
default:
|
|
|
result = 0;
|
|
|
@@ -962,9 +963,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
|
|
|
// 数据库已存在 → 继续后续校验
|
|
|
// 判断已开票 / 已结算
|
|
|
- if ("1".equals(existIncome.getSuperviseSettlement()) || "1".equals(existIncome.getOtherSettlement())
|
|
|
- || "1".equals(existIncome.getJySuperviseSettlement()) || "1".equals(existIncome.getJyOtherSettlement())
|
|
|
- || "1".equals(existIncome.getPlatformSuperviseSettlement()) || "1".equals(existIncome.getPlatformOtherSettlement())) {
|
|
|
+ String settlementFlag = "1";
|
|
|
+ if (settlementFlag.equals(existIncome.getSuperviseSettlement()) || settlementFlag.equals(existIncome.getOtherSettlement())
|
|
|
+ || settlementFlag.equals(existIncome.getJySuperviseSettlement()) || settlementFlag.equals(existIncome.getJyOtherSettlement())
|
|
|
+ || settlementFlag.equals(existIncome.getPlatformSuperviseSettlement()) || settlementFlag.equals(existIncome.getPlatformOtherSettlement())) {
|
|
|
failedNumber++;
|
|
|
vo.setErrorMessage("应收数据已结算");
|
|
|
failedExcel.add(vo);
|
|
|
@@ -1401,9 +1403,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
|
|
|
// 数据库已存在 → 继续后续校验
|
|
|
// 判断已开票 / 已结算
|
|
|
- if ("1".equals(existIncome.getSuperviseSettlement()) || "1".equals(existIncome.getOtherSettlement())
|
|
|
- || "1".equals(existIncome.getJySuperviseSettlement()) || "1".equals(existIncome.getJyOtherSettlement())
|
|
|
- || "1".equals(existIncome.getPlatformSuperviseSettlement()) || "1".equals(existIncome.getPlatformOtherSettlement())) {
|
|
|
+ String settlementFlag = "1";
|
|
|
+ if (settlementFlag.equals(existIncome.getSuperviseSettlement()) || settlementFlag.equals(existIncome.getOtherSettlement())
|
|
|
+ || settlementFlag.equals(existIncome.getJySuperviseSettlement()) || settlementFlag.equals(existIncome.getJyOtherSettlement())
|
|
|
+ || settlementFlag.equals(existIncome.getPlatformSuperviseSettlement()) || settlementFlag.equals(existIncome.getPlatformOtherSettlement())) {
|
|
|
failedNumber++;
|
|
|
vo.setErrorMessage("应收数据已结算");
|
|
|
failedExcel.add(vo);
|