diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java index e9127dc1..4bdfe35e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillProject.java @@ -52,4 +52,8 @@ public class PayMailBillProject implements Serializable { @DecimalMax(value = "9999999999.99",message = "开票金额格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal invoiceAmount; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String remark; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java index 5999bb93..2f6dc57d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; import com.jero.mail.entity.PayMailBill; +import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.entity.PayMailBillSearch; import java.util.List; @@ -33,7 +34,7 @@ public interface IPayMailBillService extends IService { * @param payMailBill * @return */ - Result addPayBill(PayMailBill payMailBill,String projectIds,String projectTypes,String invoiceAmounts); + Result addPayBill(PayMailBill payMailBill, List bmpList); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index a8c23acb..3a89f40d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -99,24 +99,20 @@ public class PayMailBillServiceImpl extends ServiceImpl addPayBill(PayMailBill payMailBill, String projectIds, String projectTypes,String invoiceAmounts) { - - String[] projectIdArray = projectIds.split(","); - String[] projectTypeArray = projectTypes.split(","); - String[] invoiceAmountArrays = invoiceAmounts.split(","); - + public Result addPayBill(PayMailBill payMailBill, List bmpList) { + //校验不同项目是否属于同一个公司 - String res = checkCompanyProject(projectIdArray, projectTypeArray,invoiceAmountArrays); + String res = checkCompanyProject(bmpList); if (!"success".equals(res)) { return Result.error(res); } - for (int i = 0; i < projectIdArray.length; i++) { - if (PayIncomeContractCommon.PROJECT_TYPE5.equals(String.valueOf(projectIdArray[i]))) { + for (int i = 0; i < bmpList.size(); i++) { + if (PayIncomeContractCommon.PROJECT_TYPE5.equals(String.valueOf(bmpList.get(i).getProjectType()))) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayMailBillProject::getProjectId, projectIdArray[i]); + wrapper.eq(PayMailBillProject::getProjectId, bmpList.get(i).getId()); wrapper.eq(PayMailBillProject::getProjectType, PayIncomeContractCommon.PROJECT_TYPE5); List type5List = payMailBillProjectService.list(wrapper); @@ -130,38 +126,47 @@ public class PayMailBillServiceImpl extends ServiceImpl bmpList) { String standardCompanyId = null;//基准公司id - for (int i = 0; i < projectTypeArray.length; i++) { + for (int i = 0; i < bmpList.size(); i++) { //之前开票总额 BigDecimal oldInvoiceAmount=new BigDecimal("0"); //之前开票总额+本次开票金额 BigDecimal invoiceAmount=new BigDecimal("0"); - switch (projectTypeArray[i]) { + switch (bmpList.get(i).getProjectType().toString()) { // 普通项目 case PayIncomeContractCommon.PROJECT_TYPE1: - PayCommonProject payCommonProject = payCommonProjectMapper.selectById(projectIdArray[i]); + PayCommonProject payCommonProject = payCommonProjectMapper.selectById(bmpList.get(i).getId()); //将第一个项目作为基准公司 if (i == 0) { standardCompanyId = payCommonProject.getChargeCompanyId(); @@ -171,7 +176,7 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(payCommonProject.getReceivableAmount()) == 1){ return "开票金额大于当前欠未开票金额,输入有误!"; @@ -179,7 +184,7 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(workingGroup.getReceivableAmount()) == 1){ return "开票金额大于当前欠未开票金额,输入有误!"; @@ -197,7 +202,7 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(meeting.getAmountReceivable()) == 1){ return "开票金额大于当前欠未开票金额,输入有误!"; @@ -215,7 +220,7 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(memberProject.getAmountReceivable()) == 1){ return "开票金额大于当前欠未开票金额,输入有误!"; @@ -233,7 +238,7 @@ public class PayMailBillServiceImpl extends ServiceImpl应收 if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) == 1){ return "开票金额大于当前欠未开票金额,输入有误!"; @@ -261,7 +266,7 @@ public class PayMailBillServiceImpl extends ServiceImpl addPayBill(@RequestBody PayMailBill payMailBill,String projectIds,String projectTypes,String invoiceAmounts) { - return payMailBillService.addPayBill(payMailBill, projectIds, projectTypes, invoiceAmounts); + public Result addPayBill(@RequestBody PayMailBill payMailBill,@RequestBody List bmpList) { + return payMailBillService.addPayBill(payMailBill, bmpList); } /**