fix: 打包管理到账bug
This commit is contained in:
+1
@@ -29,6 +29,7 @@
|
|||||||
</select>
|
</select>
|
||||||
<select id="queryPageList" resultType="com.jero.pack.entity.PayPackCompany">
|
<select id="queryPageList" resultType="com.jero.pack.entity.PayPackCompany">
|
||||||
select ppc.*,pcmt.phone,pcmt.email from pay_pack_company ppc
|
select ppc.*,pcmt.phone,pcmt.email from pay_pack_company ppc
|
||||||
|
LEFT JOIN pay_payment_record ppr ON ppr.project_id = ppc.id
|
||||||
LEFT JOIN pay_company_management pcm on ppc.company_id = pcm.id
|
LEFT JOIN pay_company_management pcm on ppc.company_id = pcm.id
|
||||||
LEFT JOIN pay_contacts_management_temporary pcmt ON pcmt.id = ppc.company_contact_temporary_id
|
LEFT JOIN pay_contacts_management_temporary pcmt ON pcmt.id = ppc.company_contact_temporary_id
|
||||||
<where>
|
<where>
|
||||||
|
|||||||
+16
@@ -1348,6 +1348,22 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
|
|||||||
//标协证书
|
//标协证书
|
||||||
case PayIncomeContractCommon.PROJECT_TYPE6:
|
case PayIncomeContractCommon.PROJECT_TYPE6:
|
||||||
throw new JeroBootException("标协证书类型不可撤销!");
|
throw new JeroBootException("标协证书类型不可撤销!");
|
||||||
|
// 打包项目
|
||||||
|
case PayIncomeContractCommon.PROJECT_TYPE8:
|
||||||
|
PayPackCompany company = payPackCompanyService.getById(payPaymentRecord.getProjectId());
|
||||||
|
|
||||||
|
newPaidAmount = subtract(company.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
|
||||||
|
inAccount = getInAccount(company.getReceivableAmount(), newPaidAmount);//到账状态
|
||||||
|
tax = subtract(company.getPaidTax(),payPaymentRecord.getTax());
|
||||||
|
noTaxAmount = subtract(company.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
|
||||||
|
company.setPaidTax(tax);
|
||||||
|
company.setPaidNoTaxAmount(noTaxAmount);
|
||||||
|
//更新主列表
|
||||||
|
company.setPaidAmount(newPaidAmount);
|
||||||
|
company.setInAccount(inAccount);
|
||||||
|
payPackCompanyService.updateById(company);
|
||||||
|
|
||||||
|
break;
|
||||||
default:break;
|
default:break;
|
||||||
}
|
}
|
||||||
this.removeById(id);
|
this.removeById(id);
|
||||||
|
|||||||
Reference in New Issue
Block a user