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

add：统计打包变更

Browse Source
This commit is contained in:
zhangqinlin
2022-07-08 15:07:16 +08:00
parent c35e8f0a24
commit add8cccb15
21 changed files with 525 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java
+7 -7
View File
@@ -26,21 +26,21 @@ public class PayWorkGroupSubletStatistics {
@Excel(name = "打包", width = 15)
private String packText;
@Excel(name = "应收总金额", width = 15)
@Excel(name = "合同金额", width = 15)
@ApiModelProperty(value = "应收总金额")
private String allMoney;
@Excel(name = "实收总金额", width = 15)
@ApiModelProperty(value = "实收总金额")
private String comeAllMoney;
@Excel(name = "确认收入金额", width = 15)
@ApiModelProperty(value = "确认收入金额")
private String confirmAmount;
@Excel(name = "开票金额", width = 15)
@ApiModelProperty(value = "开票金额")
private String billMoney;
@Excel(name = "确认到账金额", width = 15)
@ApiModelProperty(value = "确认到账金额")
private String confirmAmount;
@Excel(name = "到账金额", width = 15)
@ApiModelProperty(value = "到账金额")
private String comeAllMoney;
@Excel(name = "来款用途", width = 15, dicCode="payment_charge_use")
@Dict(dicCode = "payment_charge_use")
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java
+6
View File
@@ -22,6 +22,12 @@ public class PayWorkingGroupSearch {
@ApiModelProperty(value = "应收总金额")
private String allMoney;
/**
* 2022.7.7 billYear->paymentYear
*/
@ApiModelProperty(value = "确认年份")
private String paymentYear;
@ApiModelProperty(value = "应收总金额范围")
private String allMoneyTwo;
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java
+10 -10
View File
@@ -19,20 +19,20 @@ public class PayWorkingGroupStatistics {
@Excel(name = "工作组", width = 15)
@ApiModelProperty(value = "工作组")
private String workGroup;
@Excel(name = "应收总金额", width = 15)
@ApiModelProperty(value = "应收总金额")
@Excel(name = "合同总金额", width = 15)
@ApiModelProperty(value = "合同总金额")
private String allMoney;
@Excel(name = "实收总金额", width = 15)
@ApiModelProperty(value = "实收总金额")
@Excel(name = "确认收入金额", width = 15)
@ApiModelProperty(value = "确认收入金额")
private String confirmAmount;
@Excel(name = "开票金额", width = 15)
@ApiModelProperty(value = "开票金额")
private String billMoney;
@Excel(name = "到账总金额", width = 15)
@ApiModelProperty(value = "到账总金额")
private String comeAllMoney;
@Excel(name = "实收完成率", width = 15)
@ApiModelProperty(value = "实收完成率")
private String moneyRate;
@Excel(name = "开票金额", width = 15)
@ApiModelProperty(value = "开票金额")
private String billMoney;
@Excel(name = "确认到账金额", width = 15)
@ApiModelProperty(value = "确认到账金额")
private String confirmAmount;
}
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java
+5 -2
View File
@@ -32,8 +32,11 @@ public class PayWorkingGroupSubletSearch {
@ApiModelProperty(value = "来款年份")
private String year;
@ApiModelProperty(value = "开票年份")
private String billYear;
/**
* 2022.7.7 billYear->paymentYear
*/
@ApiModelProperty(value = "确认年份")
private String paymentYear;
@ApiModelProperty(value = "来款用途")
private String chargeUse;
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+384 -326
View File
File diff suppressed because it is too large Load Diff
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+6 -4
View File
@@ -82,6 +82,7 @@
FROM v_statistical v
left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id
left join pay_mail_bill pmb on pmbp.bill_id = pmb.id
left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id)
<where>
superId = #{id}
<if test="payWorkingGroupSubletSearch.projectName != null and payWorkingGroupSubletSearch.projectName != ''">
@@ -118,8 +119,8 @@
</if>
</otherwise>
</choose>
<if test="payWorkingGroupSubletSearch.billYear != null and payWorkingGroupSubletSearch.billYear != ''">
and DATE_FORMAT (pmb.bill_date,'%Y') like concat(#{payWorkingGroupSubletSearch.billYear}, '%')
<if test="payWorkingGroupSubletSearch.paymentYear != null and payWorkingGroupSubletSearch.paymentYear != ''">
and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{payWorkingGroupSubletSearch.paymentYear}, '%')
</if>
</where>
group by id
@@ -144,6 +145,7 @@
FROM v_statistical v
left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id
left join pay_mail_bill pmb on pmbp.bill_id = pmb.id
left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id)
<where>
superId = #{id}
<if test="payWorkingGroupSubletSearch.projectName != null and payWorkingGroupSubletSearch.projectName != ''">
@@ -180,8 +182,8 @@
</if>
</otherwise>
</choose>
<if test="payWorkingGroupSubletSearch.billYear != null and payWorkingGroupSubletSearch.billYear != ''">
and DATE_FORMAT (pmb.bill_date,'%Y') like concat(#{payWorkingGroupSubletSearch.billYear}, '%')
<if test="payWorkingGroupSubletSearch.paymentYear != null and payWorkingGroupSubletSearch.paymentYear != ''">
and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{payWorkingGroupSubletSearch.paymentYear}, '%')
</if>
</where>
group by id) p