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 17:37:01 +08:00
parent add8cccb15
commit 32f33837d0
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+7 -5
View File
@@ -2116,7 +2116,7 @@
comeAllMoney, comeAllMoney,
departName, departName,
billMoney, billMoney,
CONCAT(CAST(ROUND((comeAllMoney / allMoney) * 100, 2) AS CHAR), '%') AS finishRate, CONCAT(CAST(ROUND((confirmAmount / allMoney) * 100, 2) AS CHAR), '%') AS finishRate,
confirmAmount confirmAmount
from from
(select (select
@@ -2128,6 +2128,7 @@
from v_statistical v from v_statistical v
left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id 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_mail_bill pmb on pmbp.bill_id = pmb.id
left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id)
<where> <where>
<foreach item="item" open="departId in(" separator="," close=")" collection="idList"> <foreach item="item" open="departId in(" separator="," close=")" collection="idList">
#{item} #{item}
@@ -2136,8 +2137,8 @@
AND year LIKE AND year LIKE
concat(#{departStatisticsSearch.year}, '%') concat(#{departStatisticsSearch.year}, '%')
</if> </if>
<if test="departStatisticsSearch.billYear != null and departStatisticsSearch.billYear != ''"> <if test="departStatisticsSearch.paymentYear != null and departStatisticsSearch.paymentYear != ''">
and DATE_FORMAT (pmb.bill_date,'%Y') like concat(#{departStatisticsSearch.billYear}, '%') and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{departStatisticsSearch.paymentYear}, '%')
</if> </if>
</where> </where>
group by v.departId) p group by v.departId) p
@@ -2177,6 +2178,7 @@
from v_statistical v from v_statistical v
left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id 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_mail_bill pmb on pmbp.bill_id = pmb.id
left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id)
<where> <where>
<foreach item="item" open="departId in(" separator="," close=")" collection="idList"> <foreach item="item" open="departId in(" separator="," close=")" collection="idList">
#{item} #{item}
@@ -2185,8 +2187,8 @@
AND year LIKE AND year LIKE
concat(#{departStatisticsSearch.year}, '%') concat(#{departStatisticsSearch.year}, '%')
</if> </if>
<if test="departStatisticsSearch.billYear != null and departStatisticsSearch.billYear != ''"> <if test="departStatisticsSearch.paymentYear != null and departStatisticsSearch.paymentYear != ''">
and DATE_FORMAT (pmb.bill_date,'%Y') like concat(#{departStatisticsSearch.billYear}, '%') and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{departStatisticsSearch.paymentYear}, '%')
</if> </if>
</where> </where>
</select> </select>
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java
+14 -12
View File
@@ -14,23 +14,25 @@ public class DepartStatistics {
@ApiModelProperty(value = "部门名称") @ApiModelProperty(value = "部门名称")
private String departName; private String departName;
@Excel(name = "应收总金额", width = 15) @Excel(name = "合同总金额", width = 15)
@ApiModelProperty(value = "应收总金额") @ApiModelProperty(value = "合同金额")
private String allMoney; private String allMoney;
@Excel(name = "实收总金额", width = 15) @Excel(name = "确认收入金额", width = 15)
@ApiModelProperty(value = "实收总金额") @ApiModelProperty(value = "确认收入金额")
private String comeAllMoney; private String confirmAmount;
@Excel(name = "到账率", width = 15)
@ApiModelProperty(value = "到账率")
private String finishRate;
@Excel(name = "开票金额", width = 15) @Excel(name = "开票金额", width = 15)
@ApiModelProperty(value = "开票金额") @ApiModelProperty(value = "开票金额")
private String billMoney; private String billMoney;
@Excel(name = "确认到账金额", width = 15) @Excel(name = "到账总金额", width = 15)
@ApiModelProperty(value = "确认到账金额") @ApiModelProperty(value = "到账总金额")
private String confirmAmount; private String comeAllMoney;
@Excel(name = "确收率", width = 15)
@ApiModelProperty(value = "确收率")
private String finishRate;
} }
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatisticsSearch.java
+5 -2
View File
@@ -10,8 +10,11 @@ public class DepartStatisticsSearch {
@ApiModelProperty(value = "来款年份") @ApiModelProperty(value = "来款年份")
private String year; private String year;
@ApiModelProperty(value = "开票年份") /**
private String billYear; * 2022.7.7 billYear->paymentYear
*/
@ApiModelProperty(value = "确认年份")
private String paymentYear;
@ApiModelProperty(value = "字段") @ApiModelProperty(value = "字段")
private String column; private String column;