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

批量开票

Browse Source
This commit is contained in:
baozhipeng
2021-09-15 19:54:57 +08:00
parent ed8b88c625
commit 42471c905b
7 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java
-2
View File
@@ -29,8 +29,6 @@ public interface PayMailBillMapper extends BaseMapper<PayMailBill> {
*/
List<PayMailBill> selectCommonProjectMailBillVO(@Param("projectId") String projectId);
// 开票总额
BigDecimal sumInvoiceAmount(@Param("projectId") String projectId);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java
+5
View File
@@ -2,6 +2,9 @@ package com.jero.mail.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.mail.entity.PayMailBillProject;
import io.lettuce.core.dynamic.annotation.Param;
import java.math.BigDecimal;
/**
* @Description: pay_mail_bill_project
@@ -11,4 +14,6 @@ import com.jero.mail.entity.PayMailBillProject;
*/
public interface PayMailBillProjectMapper extends BaseMapper<PayMailBillProject> {
// 开票总额
BigDecimal sumInvoiceAmount(@Param("projectId") String projectId);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
-7
View File
@@ -42,12 +42,5 @@
WHERE pmb.id IN (SELECT bill_id FROM pay_mail_bill_project WHERE project_id=#{projectId})
</select>
<!-- 开票总额-->
<select id="sumInvoiceAmount" resultType="Decimal">
select sum(b.invoice_amount)
from pay_mail_bill b
left join pay_mail_bill_project bp on b.id = bp.bill_id
where bp.project_id= #{projectId}
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillProjectMapper.xml
+7 -1
View File
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.mailBill.mapper.PayMailBillProjectMapper">
<mapper namespace="com.jero.mail.mapper.PayMailBillProjectMapper">
<!-- 开票总额-->
<select id="sumInvoiceAmount" resultType="Decimal">
select sum(invoice_amount)
from pay_mail_bill_project
where project_id= #{projectId}
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java
+1 -1
View File
@@ -33,7 +33,7 @@ public interface IPayMailBillService extends IService<PayMailBill> {
* @param payMailBill
* @return
*/
Result<?> addPayBill(PayMailBill payMailBill,String projectIds,String projectTypes);
Result<?> addPayBill(PayMailBill payMailBill,String projectIds,String projectTypes,String invoiceAmounts);
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+35 -4
View File
@@ -15,6 +15,7 @@ import com.jero.mail.entity.PayMailBill;
import com.jero.mail.entity.PayMailBillProject;
import com.jero.mail.entity.PayMailBillSearch;
import com.jero.mail.mapper.PayMailBillMapper;
import com.jero.mail.mapper.PayMailBillProjectMapper;
import com.jero.mail.service.IPayMailBillProjectService;
import com.jero.mail.service.IPayMailBillService;
import com.jero.meeting.entity.PayMeetingSituation;
@@ -71,6 +72,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
private TbMemberProjectSubitemMapper tbMemberProjectSubitemMapper;
@Resource
private PayMailBillMapper payMailBillMapper;
@Resource
private PayMailBillProjectMapper payMailBillProjectMapper;
@Override
public List<PayMailBill> selectMailBillVO(String projectId) {
@@ -96,13 +99,14 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
* @param payMailBill
* @return
*/
public Result<?> addPayBill(PayMailBill payMailBill, String projectIds, String projectTypes) {
public Result<?> addPayBill(PayMailBill payMailBill, String projectIds, String projectTypes,String invoiceAmounts) {
String[] projectIdArray = projectIds.split(",");
String[] projectTypeArray = projectTypes.split(",");
String[] invoiceAmountArrays = invoiceAmounts.split(",");
//校验不同项目是否属于同一个公司
String res = checkCompanyProject(projectIdArray, projectTypeArray);
String res = checkCompanyProject(projectIdArray, projectTypeArray,invoiceAmountArrays);
if (!"success".equals(res)) {
return Result.error(res);
}
@@ -120,6 +124,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
throw new JeroBootException("标协会员项目，只能开票一次。");
}
}
}
//新增票据邮寄表
@@ -131,6 +136,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
payMailBillProject.setBillId(payMailBill.getId());
payMailBillProject.setProjectId(projectIdArray[i]);
payMailBillProject.setProjectType(Integer.valueOf(projectTypeArray[i]));
payMailBillProject.setInvoiceAmount(new BigDecimal(invoiceAmountArrays[i]));
payMailBillProjectService.save(payMailBillProject);
// 更新项目表开票状态
@@ -141,11 +147,16 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
//校验不同项目是否属于同一个公司
private String checkCompanyProject(String[] projectIdArray, String[] projectTypeArray) {
private String checkCompanyProject(String[] projectIdArray, String[] projectTypeArray,String[] invoiceAmountArrays) {
String standardCompanyId = null;//基准公司id
for (int i = 0; i < projectTypeArray.length; i++) {
//之前开票总额
BigDecimal oldInvoiceAmount = payMailBillProjectMapper.sumInvoiceAmount(projectIdArray[i]);
//加上本次开票金额
BigDecimal invoiceAmount = oldInvoiceAmount.add(new BigDecimal(invoiceAmountArrays[i])).setScale(2, BigDecimal.ROUND_HALF_UP);
switch (projectTypeArray[i]) {
// 普通项目
@@ -158,6 +169,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
if (!standardCompanyId.equals(payCommonProject.getChargeCompanyId())) {
return "打包开票只能是同一个企业";
}
//开票总额>应收
if(invoiceAmount.compareTo(payCommonProject.getReceivableAmount()) == 1){
return "开票金额大于当前欠未开票金额，输入有误！";
}
break;
// 工作组项目
case PayIncomeContractCommon.PROJECT_TYPE2:
@@ -169,6 +184,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
if (!standardCompanyId.equals(workingGroup.getChargeCompanyId())) {
return "打包开票只能是同一个企业";
}
//开票总额>应收
if(invoiceAmount.compareTo(workingGroup.getReceivableAmount()) == 1){
return "开票金额大于当前欠未开票金额，输入有误！";
}
break;
//会议项目
case PayIncomeContractCommon.PROJECT_TYPE3:
@@ -180,6 +199,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
if (!standardCompanyId.equals(meeting.getCompanyId())) {
return "打包开票只能是同一个企业";
}
//开票总额>应收
if(invoiceAmount.compareTo(meeting.getAmountReceivable()) == 1){
return "开票金额大于当前欠未开票金额，输入有误！";
}
break;
//会员项目
case PayIncomeContractCommon.PROJECT_TYPE4:
@@ -191,6 +214,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
if (!standardCompanyId.equals(memberProject.getCompanyId())) {
return "打包开票只能是同一个企业";
}
//开票总额>应收
if(invoiceAmount.compareTo(memberProject.getAmountReceivable()) == 1){
return "开票金额大于当前欠未开票金额，输入有误！";
}
break;
//标协会员
case PayIncomeContractCommon.PROJECT_TYPE5:
@@ -202,6 +229,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
if (!standardCompanyId.equals(tbMemberProject.getCompanyId())) {
return "打包开票只能是同一个企业";
}
//开票总额>应收
if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) == 1){
return "开票金额大于当前欠未开票金额，输入有误！";
}
break;
default:
break;
@@ -256,7 +287,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
break;
}
// 开票总额
BigDecimal invoiceAmount = payMailBillMapper.sumInvoiceAmount(projectId);
BigDecimal invoiceAmount = payMailBillProjectMapper.sumInvoiceAmount(projectId);
if(invoiceAmount==null){
invoiceAmount =new BigDecimal("0");
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+1 -1
View File
@@ -231,7 +231,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
payMailBill.setBillDate(new Date());
payMailBill.setProjectName(payMeeting.getMeetingName());
payMailBill.setChargeCompanyName(payMeetingSituation.getCompanyName());
payMailBillService.addPayBill(payMailBill, projectIds.toString(), PayIncomeContractCommon.PROJECT_TYPE3);
payMailBillService.addPayBill(payMailBill, projectIds.toString(), PayIncomeContractCommon.PROJECT_TYPE3,allAmount.toString());
}
/**