diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java index 73b3508f..b9b01c21 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java @@ -3,12 +3,18 @@ package com.jero.member.controller; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import cn.hutool.core.util.NumberUtil; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.DictModel; import com.jero.common.util.ValidUtil; import com.jero.member.entity.PayMemberProjectSubitem; import com.jero.member.service.IPayMemberProjectSubitemService; @@ -39,6 +45,8 @@ import com.jero.common.aspect.annotation.AutoLog; public class PayMemberProjectSubitemController extends JeroController { @Resource private IPayMemberProjectSubitemService memberProjectSubitemService; + @Resource + private ISysBaseAPI sysBaseAPI; /** * 分页列表查询 @@ -155,15 +163,42 @@ public class PayMemberProjectSubitemController extends JeroController errorMessage = new ArrayList<>(); for (Object obj :excelData) { + errorRowNum += 1; //复制属性 PayMemberProjectSubitemExcel projectSubitemExcel = (PayMemberProjectSubitemExcel)obj; PayMemberProjectSubitem projectSubitem = new PayMemberProjectSubitem(); + + //应收金额 + String amountReceivable = projectSubitemExcel.getAmountReceivable(); + if (!NumberUtil.isInteger(amountReceivable)) { + errorMessage.add("第"+errorRowNum+"行:应收金额不符合规范"); + }else { + projectSubitem.setAmountReceivable(Integer.parseInt(amountReceivable)); + } + //来款方式 + List paymentType = sysBaseAPI.queryDictItemsByCode("payment_type"); + Map paymentTypeMap = paymentType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue)); + String paymentMethod = projectSubitemExcel.getPaymentMethod(); + if (paymentTypeMap.containsKey(paymentMethod)){ + projectSubitem.setPaymentMethod(Integer.parseInt(paymentTypeMap.get(paymentMethod))); + }else { + errorMessage.add("第"+errorRowNum+"行:来款方式不符合规范"); + } + //需要发票 + List invoiceType = sysBaseAPI.queryDictItemsByCode("invoice_type"); + Map invoiceTypeMap = invoiceType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue)); + String needInvoice = projectSubitemExcel.getNeedInvoice(); + if (invoiceTypeMap.containsKey(needInvoice)){ + projectSubitem.setNeedInvoice(Integer.parseInt(invoiceTypeMap.get(needInvoice))); + }else { + errorMessage.add("第"+errorRowNum+"行:需要发票不符合规范"); + } + //复制属性 BeanUtils.copyProperties(projectSubitemExcel,projectSubitem); - errorRowNum += 1; try { ValidUtil.validate(projectSubitem); - add(projectSubitem); + memberProjectSubitemService.add(projectSubitem); }catch (JeroBootException e){ errorMessage.add("第"+errorRowNum+"行:"+e.getMessage()); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java index b58f0303..f25ada62 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java @@ -3,6 +3,7 @@ import java.util.Date; import com.jero.common.exception.JeroBootException; import com.jero.common.util.ValidUtil; +import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; @@ -45,6 +46,11 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl