LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 41475 资料网员项目--会员项目--导入--导入失败后的提示语有误

Browse Source
This commit is contained in:
lijiarao
2021-10-26 16:55:41 +08:00
parent 9bdcb64bb4
commit 81827eab08
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+7 -3
View File
@@ -227,7 +227,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
//应收金额
String amountReceivable = projectSubitemExcel.getAmountReceivable();
if (!NumberUtil.isNumber(amountReceivable)) {
errorMessage.add("第" + errorRowNum + "行：应收金额不符合规范");
errorMessage.add("第" + errorRowNum + "行：应收金额格式错误");
} else {
projectSubitem.setAmountReceivable(new BigDecimal(amountReceivable));
}
@@ -235,7 +235,9 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
List<DictModel> paymentType = sysBaseAPI.queryDictItemsByCode("payment_type");
Map<String, String> paymentTypeMap = paymentType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
String paymentMethod = projectSubitemExcel.getPaymentMethod();
if (paymentTypeMap.containsKey(paymentMethod)) {
if (StringUtils.isBlank(paymentMethod)){
errorMessage.add("第" + errorRowNum + "行：来款方式不能为空");
}else if (paymentTypeMap.containsKey(paymentMethod)) {
projectSubitem.setPaymentMethod(Integer.parseInt(paymentTypeMap.get(paymentMethod)));
} else {
errorMessage.add("第" + errorRowNum + "行：来款方式不符合规范");
@@ -244,7 +246,9 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
List<DictModel> invoiceType = sysBaseAPI.queryDictItemsByCode("invoice_type");
Map<String, String> invoiceTypeMap = invoiceType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
String needInvoice = projectSubitemExcel.getNeedInvoice();
if (invoiceTypeMap.containsKey(needInvoice)) {
if (StringUtils.isBlank(needInvoice)){
errorMessage.add("第" + errorRowNum + "行：需要发票不能为空");
}else if (invoiceTypeMap.containsKey(needInvoice)) {
projectSubitem.setNeedInvoice(Integer.parseInt(invoiceTypeMap.get(needInvoice)));
} else {
errorMessage.add("第" + errorRowNum + "行：需要发票不符合规范");