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:
lijiarao
2022-06-09 18:28:20 +08:00
parent be734da2a2
commit c03d0234bf
13 changed files with 483 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/统计视图.sql
+182 -165
View File
@@ -1,166 +1,177 @@
create view v_statistical as create view v_statistical as
select pp.id as projectId, select pp.id as projectId,
pp.superId, pp.superId,
pp.projectName, pp.projectName,
principalName, principalName,
chargeCompanyTemporaryId, chargeCompanyId,
chargeCompanyTemporaryName, chargeCompanyTemporaryId,
allMoney, chargeCompanyTemporaryName,
comeAllMoney, allMoney,
chargeUse, comeAllMoney,
depart, chargeUse,
createTime, depart,
if(pp.pack = 0, '否', '是') as packText, createTime,
year, if(pp.pack = 0, '否', '是') as packText,
payStatue, year,
departCode, payStatue,
confirmAmount, departCode,
principalNameId, principalNameId,
type, type,
pp.pack billMoney,
from (SELECT pwgs.id, confirmAmount,
pwg.id as superId, pp.pack
pwg.working_group_project AS projectName, from (SELECT pwgs.id,
pwg.principal_name_a as principalName, pwg.id as superId,
pwgs.charge_company_temporary_id as chargeCompanyTemporaryId, pwg.working_group_project AS projectName,
pwgs.charge_company_temporary_name AS chargeCompanyTemporaryName, pwg.principal_name_a as principalName,
pwgs.receivable_amount as allMoney, pwgs.charge_company_id AS chargeCompanyId,
pwgs.paid_amount as comeAllMoney, pwgs.charge_company_temporary_id as chargeCompanyTemporaryId,
pwgs.charge_use as chargeUse, pwgs.charge_company_temporary_name AS chargeCompanyTemporaryName,
sd.depart_name as depart, pwgs.receivable_amount as allMoney,
pwgs.pack as pack, pwgs.paid_amount as comeAllMoney,
pwg.year as year, pwgs.charge_use as chargeUse,
pwgs.in_account as payStatue, sd.depart_name as depart,
su.org_code as departCode, pwgs.pack as pack,
pcpr.amount_received as confirmAmount, pwg.year as year,
pwg.principal_id_a as principalNameId, pwgs.in_account as payStatue,
2 as type, su.org_code as departCode,
pwgs.create_time as createTime pwg.principal_id_a as principalNameId,
FROM pay_working_group pwg 2 as type,
right join pay_working_group_subitem pwgs on (pwg.id = pwgs.working_group_id) pwgs.invoice_amount AS billMoney,
left JOIN pay_confirm_payment_record pcpr on (pwgs.id = pcpr.project_id) confirm_amount as confirmAmount,
left JOIN sys_user su on (pwg.principal_id_a = su.id) pwgs.create_time as createTime
left join sys_depart sd on (su.org_code = sd.org_code) FROM pay_working_group pwg
union all right join pay_working_group_subitem pwgs on (pwg.id = pwgs.working_group_id)
SELECT pcp.id, left JOIN sys_user su on (pwg.principal_id_a = su.id)
pcp.id as superId, left join sys_depart sd on (su.org_code = sd.org_code)
pcp.charge_project AS projectName, union all
pcp.principal_name as principalName, SELECT pcp.id,
pcp.charge_company_temporary_id as chargeCompanyTemporaryId, pcp.id as superId,
pcp.charge_company_temporary_name AS chargeCompanyTemporaryName, pcp.charge_project AS projectName,
pcp.receivable_amount as allMoney, pcp.principal_name as principalName,
pcp.paid_amount as comeAllMoney, pcp.charge_company_id AS chargeCompanyId,
pcp.charge_use as chargeUse, pcp.charge_company_temporary_id as chargeCompanyTemporaryId,
sd.depart_name as depart, pcp.charge_company_temporary_name AS chargeCompanyTemporaryName,
pcp.pack as pack, pcp.receivable_amount as allMoney,
pcp.year as year, pcp.paid_amount as comeAllMoney,
pcp.in_account as payStatue, pcp.charge_use as chargeUse,
su.org_code as departCode, sd.depart_name as depart,
pcpr.amount_received as confirmAmount, pcp.pack as pack,
pcp.principal_id as principalNameId, pcp.year as year,
1 as type, pcp.in_account as payStatue,
pcp.create_time as createTime su.org_code as departCode,
FROM pay_common_project pcp pcp.principal_id as principalNameId,
left JOIN pay_confirm_payment_record pcpr on (pcp.id = pcpr.project_id) 1 as type,
left JOIN sys_user su on (pcp.principal_id = su.id) pcp.invoice_amount AS billMoney,
left join sys_depart sd on (su.org_code = sd.org_code) confirm_amount as confirmAmount,
union all pcp.create_time as createTime
SELECT pmps.id, FROM pay_common_project pcp
pmp.id as superId, left JOIN sys_user su on (pcp.principal_id = su.id)
pmp.project_name AS projectName, left join sys_depart sd on (su.org_code = sd.org_code)
su.realname as principalName, union all
pmps.company_id as chargeCompanyTemporaryId, SELECT pmps.id,
pmps.company_name AS chargeCompanyTemporaryName, pmp.id as superId,
pmps.amount_receivable as allMoney, pmp.project_name AS projectName,
pmps.paid_amount as comeAllMoney, su.realname as principalName,
pmps.charge_use as chargeUse, pmps.company_id AS chargeCompanyId,
sd.depart_name as depart, pmps.company_id as chargeCompanyTemporaryId,
pmps.pack as pack, pmps.company_name AS chargeCompanyTemporaryName,
pmp.particular_year as year, pmps.amount_receivable as allMoney,
pmps.in_account as payStatue, pmps.paid_amount as comeAllMoney,
su.org_code as departCode, pmps.charge_use as chargeUse,
pcpr.amount_received as confirmAmount, sd.depart_name as depart,
pmp.director_id as principalNameId, pmps.pack as pack,
4 as type, pmp.particular_year as year,
pmps.create_time as createTime pmps.in_account as payStatue,
FROM pay_member_project pmp su.org_code as departCode,
right join pay_member_project_subitem pmps on (pmp.id = pmps.project_id) pmp.director_id as principalNameId,
left JOIN pay_confirm_payment_record pcpr on (pmp.id = pcpr.project_id) 4 as type,
left JOIN sys_user su on (pmp.director_id = su.id) pmps.invoice_amount AS billMoney,
left join sys_depart sd on (su.org_code = sd.org_code) confirm_amount as confirmAmount,
union all pmps.create_time as createTime
SELECT pms.id, FROM pay_member_project pmp
pm.id as superId, right join pay_member_project_subitem pmps on (pmp.id = pmps.project_id)
pm.meeting_name AS projectName, left JOIN sys_user su on (pmp.director_id = su.id)
su.realname as principalName, left join sys_depart sd on (su.org_code = sd.org_code)
pms.company_id as chargeCompanyTemporaryId, union all
pms.company_name AS chargeCompanyTemporaryName, SELECT pms.id,
pms.amount_receivable as allMoney, pm.id as superId,
pms.paid_amount as comeAllMoney, pm.meeting_name AS projectName,
pms.charge_use as chargeUse, su.realname as principalName,
sd.depart_name as depart, pms.company_id AS chargeCompanyId,
pms.pack as pack, pms.company_id as chargeCompanyTemporaryId,
pm.particular_year as year, pms.company_name AS chargeCompanyTemporaryName,
pms.in_account as payStatue, pms.amount_receivable as allMoney,
su.org_code as departCode, pms.paid_amount as comeAllMoney,
0 as confirmAmount, pms.charge_use as chargeUse,
pm.director_id as principalNameId, sd.depart_name as depart,
3 as type, pms.pack as pack,
pms.create_time as createTime pm.particular_year as year,
FROM pay_meeting pm pms.in_account as payStatue,
right join pay_meeting_situation pms on (pm.id = pms.meeting_id) su.org_code as departCode,
left JOIN sys_user su on (pm.director_id = su.id) pm.director_id as principalNameId,
left join sys_depart sd on (su.org_code = sd.org_code) 3 as type,
union all pms.invoice_amount AS billMoney,
SELECT tmps.id, confirm_amount as confirmAmount,
tmp.id as superId, pms.create_time as createTime
tmp.project_name AS projectName, FROM pay_meeting pm
su.realname as principalName, right join pay_meeting_situation pms on (pm.id = pms.meeting_id)
tmps.company_id as chargeCompanyTemporaryId, left JOIN sys_user su on (pm.director_id = su.id)
tmps.company_name AS chargeCompanyTemporaryName, left join sys_depart sd on (su.org_code = sd.org_code)
tmps.amount_receivable as allMoney, union all
tmps.paid_amount as comeAllMoney, SELECT tmps.id,
tmps.charge_use as chargeUse, tmp.id as superId,
sd.depart_name as depart, tmp.project_name AS projectName,
tmps.pack as pack, su.realname as principalName,
tmp.year as year, tmps.company_id AS chargeCompanyId,
tmps.in_account as payStatue, tmps.company_id as chargeCompanyTemporaryId,
su.org_code as departCode, tmps.company_name AS chargeCompanyTemporaryName,
0 as confirmAmount, tmps.amount_receivable as allMoney,
tmp.director_id as principalNameId, tmps.paid_amount as comeAllMoney,
5 as type, tmps.charge_use as chargeUse,
tmps.create_time as createTime sd.depart_name as depart,
FROM tb_member_project tmp tmps.pack as pack,
left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id) tmp.year as year,
left JOIN sys_user su on (tmp.director_id = su.id) tmps.in_account as payStatue,
left join sys_depart sd on (su.org_code = sd.org_code) su.org_code as departCode,
union all tmp.director_id as principalNameId,
SELECT tcp.id, 5 as type,
tmp.id as superId, tmps.invoice_amount AS billMoney,
tmp.project_name AS projectName, confirm_amount as confirmAmount,
su.realname as principalName, tmps.create_time as createTime
tcp.company_id as chargeCompanyTemporaryId, FROM tb_member_project tmp
tcp.company_name AS chargeCompanyTemporaryName, left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id)
tcp.amount_receivable as allMoney, left JOIN sys_user su on (tmp.director_id = su.id)
tcp.paid_amount as comeAllMoney, left join sys_depart sd on (su.org_code = sd.org_code)
tcp.charge_use as chargeUse, union all
sd.depart_name as depart, SELECT tcp.id,
tcp.pack as pack, tmp.id as superId,
tmp.year as year, tmp.project_name AS projectName,
tcp.in_account as payStatue, su.realname as principalName,
su.org_code as departCode, tcp.company_id AS chargeCompanyId,
0 as confirmAmount, tcp.company_id as chargeCompanyTemporaryId,
tmp.director_id as principalNameId, tcp.company_name AS chargeCompanyTemporaryName,
6 as type, tcp.amount_receivable as allMoney,
tcp.create_time as createTime tcp.paid_amount as comeAllMoney,
FROM tb_member_project tmp tcp.charge_use as chargeUse,
left join tb_certificate_payment tcp on (tmp.id = tcp.project_id) sd.depart_name as depart,
left JOIN sys_user su on (tmp.director_id = su.id) tcp.pack as pack,
left join sys_depart sd on (su.org_code = sd.org_code) tmp.year as year,
) pp tcp.in_account as payStatue,
where pp.allMoney is not null su.org_code as departCode,
and pp.allMoney != 0 tmp.director_id as principalNameId,
order by pp.createTime; 6 as type,
tcp.invoice_amount AS billMoney,
confirm_amount as confirmAmount,
tcp.create_time as createTime
FROM tb_member_project tmp
left join tb_certificate_payment tcp on (tmp.id = tcp.project_id)
left JOIN sys_user su on (tmp.director_id = su.id)
left join sys_depart sd on (su.org_code = sd.org_code)
) pp
where pp.allMoney is not null
and pp.allMoney != 0
order by pp.createTime;
create table pay_confirm_payment_record create table pay_confirm_payment_record
( (
@@ -176,8 +187,14 @@ create table pay_confirm_payment_record
remark varchar(200) null comment '备注' remark varchar(200) null comment '备注'
) comment '确认来款记录表'; ) comment '确认来款记录表';
alter table pay_common_project alter table pay_common_project
add column confirm_amount decimal(12, 2) null comment '确认金额'; add column confirm_amount decimal(12, 2) default 0 null comment '确认金额';
alter table pay_working_group_subitem alter table pay_working_group_subitem
add column confirm_amount decimal(12, 2) null comment '确认金额'; add column confirm_amount decimal(12, 2) default 0 null comment '确认金额';
alter table pay_member_project_subitem alter table pay_member_project_subitem
add column confirm_amount decimal(12, 2) null comment '确认金额'; add column confirm_amount decimal(12, 2) default 0 null comment '确认金额';
alter table pay_meeting_situation
add column confirm_amount decimal(12, 2) default 0 null comment '确认金额';
alter table tb_member_project_subitem
add column confirm_amount decimal(12, 2) default 0 null comment '确认金额';
alter table tb_certificate_payment
add column confirm_amount decimal(12, 2) default 0 null comment '确认金额';
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java
+6
View File
@@ -28,4 +28,10 @@ public class PayWorkingGroupSearch {
@ApiModelProperty(value = "来款年份") @ApiModelProperty(value = "来款年份")
private String year; private String year;
@ApiModelProperty(value = "字段")
private String column;
@ApiModelProperty(value = "排序规则")
private String order;
} }
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+244 -87
View File
@@ -125,15 +125,20 @@
<!-- 工作组统计--> <!-- 工作组统计-->
<select id="queryPageListForStatistics" resultType="com.jero.project.entity.PayWorkingGroupStatistics"> <select id="queryPageListForStatistics" resultType="com.jero.project.entity.PayWorkingGroupStatistics">
select id,workGroup, allMoney,comeAllMoney,CONCAT(CAST(ROUND((comeAllMoney/allMoney)*100,2) AS CHAR),'%') AS moneyRate select *
from ( from (
select select
superId as id, superId as id,
projectName as workGroup, projectName as workGroup,
sum(allMoney) as allMoney, sum(allMoney) as allMoney,
sum(comeAllMoney) as comeAllMoney sum(comeAllMoney) as comeAllMoney,
CONCAT(CAST(ROUND((comeAllMoney/allMoney)*100,2) AS CHAR),'%') AS moneyRate,
if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney,
sum(confirmAmount) as confirmAmount
from from
v_statistical 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
<where> <where>
type = 2 type = 2
@@ -166,19 +171,44 @@
</choose> </choose>
</where> </where>
group by superId group by superId
) ppp ) p
<if test="payWorkingGroupSearch.column != null and payWorkingGroupSearch.column != ''">
<if test="payWorkingGroupSearch.column == 'allMoney' and payWorkingGroupSearch.order == 'desc'">
order by allMoney desc
</if>
<if test="payWorkingGroupSearch.column == 'comeAllMoney' and payWorkingGroupSearch.order == 'desc'">
order by comeAllMoney desc
</if>
<if test="payWorkingGroupSearch.column == 'billMoney' and payWorkingGroupSearch.order == 'desc'">
order by billMoney desc
</if>
<if test="payWorkingGroupSearch.column == 'allMoney' and payWorkingGroupSearch.order == 'asc'">
order by allMoney
</if>
<if test="payWorkingGroupSearch.column == 'comeAllMoney' and payWorkingGroupSearch.order == 'asc'">
order by comeAllMoney
</if>
<if test="payWorkingGroupSearch.column == 'billMoney' and payWorkingGroupSearch.order == 'asc'">
order by billMoney
</if>
</if>
</select> </select>
<!-- 工作组统计总金额--> <!-- 工作组统计总金额-->
<select id="queryPageListForStatistics33" resultType="com.jero.statistics.entity.AllMoney"> <select id="queryPageListForStatistics33" resultType="com.jero.statistics.entity.AllMoney">
select sum(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney select sum(allMoney) as allMoney,
sum(comeAllMoney) as comeAllMoney,
SUM(ppp.billMoney) as billMoney,
SUM(ppp.confirmAmount) as confirmAmount
from ( from (
select select superId as id,
superId as id, projectName as workGroup,
projectName as workGroup, sum(allMoney) as allMoney,
sum(allMoney) as allMoney, sum(comeAllMoney) as comeAllMoney,
sum(comeAllMoney) as comeAllMoney if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney,
from sum(confirmAmount) as confirmAmount
v_statistical 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
<where> <where>
type = 2 type = 2
<if test="ids != null and ids != ''"> <if test="ids != null and ids != ''">
@@ -188,23 +218,25 @@
</foreach> </foreach>
</if> </if>
<if test="payWorkingGroupSearch.workGroup != null and payWorkingGroupSearch.workGroup != ''"> <if test="payWorkingGroupSearch.workGroup != null and payWorkingGroupSearch.workGroup != ''">
and projectName LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%')) and projectName LIKE concat('%', concat(#{payWorkingGroupSearch.workGroup}, '%'))
</if> </if>
<if test="payWorkingGroupSearch.year != null and payWorkingGroupSearch.year != ''"> <if test="payWorkingGroupSearch.year != null and payWorkingGroupSearch.year != ''">
AND year LIKE AND year LIKE
concat(#{payWorkingGroupSearch.year},'%') concat(#{payWorkingGroupSearch.year}, '%')
</if> </if>
<choose> <choose>
<when test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != '' and payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''"> <when test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != '' and payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''">
AND if(allMoney IS NULL OR allMoney = '', 0, allMoney ) >= #{payWorkingGroupSearch.allMoney} and if(allMoney IS NULL OR allMoney = '', 0, allMoney ) <![CDATA[<]]>= AND if(allMoney IS NULL OR allMoney = '', 0, allMoney) >= #{payWorkingGroupSearch.allMoney}
#{payWorkingGroupSearch.allMoneyTwo} and if(allMoney IS NULL OR allMoney = '', 0, allMoney) <![CDATA[<]]>=
#{payWorkingGroupSearch.allMoneyTwo}
</when> </when>
<otherwise> <otherwise>
<if test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != ''"> <if test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != ''">
AND if(allMoney IS NULL OR allMoney = '', 0, allMoney ) >= #{payWorkingGroupSearch.allMoney} AND if(allMoney IS NULL OR allMoney = '', 0, allMoney) >= #{payWorkingGroupSearch.allMoney}
</if> </if>
<if test="payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''"> <if test="payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''">
AND if(allMoney IS NULL OR allMoney = '', 0, allMoney ) <![CDATA[<]]>= #{payWorkingGroupSearch.allMoneyTwo} AND if(allMoney IS NULL OR allMoney = '', 0, allMoney) <![CDATA[<]]>=
#{payWorkingGroupSearch.allMoneyTwo}
</if> </if>
</otherwise> </otherwise>
</choose> </choose>
@@ -314,7 +346,8 @@
createTime, createTime,
packText, packText,
pack, pack,
if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney,
confirmAmount
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
@@ -374,21 +407,23 @@
</where> </where>
group by v.projectId) p group by v.projectId) p
<if test="allProjectStatisticsSearch.column != null and allProjectStatisticsSearch.column != ''"> <if test="allProjectStatisticsSearch.column != null and allProjectStatisticsSearch.column != ''">
order by <if test="allProjectStatisticsSearch.column == 'allMoney' and allProjectStatisticsSearch.order == 'desc'">
<if test="allProjectStatisticsSearch.column == 'allMoney'"> order by allMoney desc
allMoney
</if> </if>
<if test="allProjectStatisticsSearch.column == 'comeAllMoney'"> <if test="allProjectStatisticsSearch.column == 'comeAllMoney' and allProjectStatisticsSearch.order == 'desc'">
comeAllMoney order by comeAllMoney desc
</if> </if>
<if test="allProjectStatisticsSearch.column == 'billMoney'"> <if test="allProjectStatisticsSearch.column == 'billMoney' and allProjectStatisticsSearch.order == 'desc'">
billMoney order by billMoney desc
</if> </if>
<if test="allProjectStatisticsSearch.order == 'desc'"> <if test="allProjectStatisticsSearch.column == 'allMoney' and allProjectStatisticsSearch.order == 'asc'">
desc order by allMoney
</if> </if>
<if test="allProjectStatisticsSearch.order == 'asc'"> <if test="allProjectStatisticsSearch.column == 'comeAllMoney' and allProjectStatisticsSearch.order == 'asc'">
asc order by comeAllMoney
</if>
<if test="allProjectStatisticsSearch.column == 'billMoney' and allProjectStatisticsSearch.order == 'asc'">
order by billMoney
</if> </if>
</if> </if>
</select> </select>
@@ -396,7 +431,8 @@
<select id="queryPageList33" resultType="com.jero.statistics.entity.AllMoney"> <select id="queryPageList33" resultType="com.jero.statistics.entity.AllMoney">
select sum(allMoney) as allMoney, select sum(allMoney) as allMoney,
sum(comeAllMoney) as comeAllMoney, sum(comeAllMoney) as comeAllMoney,
if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney,
sum(confirmAmount) as confirmAmount
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
@@ -1030,13 +1066,25 @@
<!--个人来款统计--> <!--个人来款统计-->
<select id="queryPageListForPrincipal" resultType="com.jero.statistics.entity.PrincipalPeopleList"> <select id="queryPageListForPrincipal" resultType="com.jero.statistics.entity.PrincipalPeopleList">
select principalId, principalName,allMoney,comeAllMoney,createTime, select principalId,
CONCAT(CAST(ROUND((comeAllMoney/allMoney)*100,2) AS CHAR),'%') AS finishRate from principalName,
(select allMoney,
principalNameId as principalId,principalName,SUM(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney, comeAllMoney,
createTime createTime,
CONCAT(CAST(ROUND((comeAllMoney / allMoney) * 100, 2) AS CHAR), '%') AS finishRate,
billMoney,
confirmAmount
from from
v_statistical (select principalNameId as principalId,
principalName,
SUM(allMoney) as allMoney,
sum(comeAllMoney) as comeAllMoney,
createTime,
if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney,
sum(confirmAmount) as confirmAmount
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
<where> <where>
<if test="idList != null and idList != ''"> <if test="idList != null and idList != ''">
principalNameId in principalNameId in
@@ -1045,22 +1093,23 @@
</foreach> </foreach>
</if> </if>
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''"> <if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
AND principalNameId=#{principalPeopleSearch.principalId} AND principalNameId = #{principalPeopleSearch.principalId}
</if> </if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''"> <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND year LIKE AND year LIKE
concat('%',#{principalPeopleSearch.year},'%') concat('%', #{principalPeopleSearch.year}, '%')
</if> </if>
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''"> <if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
AND departCode =#{principalPeopleSearch.departCode} AND departCode = #{principalPeopleSearch.departCode}
</if> </if>
</where> </where>
group by principalId ) ppp group by principalId ) ppp
<where> <where>
<choose> <choose>
<when test="principalPeopleSearch.allMoney != null and principalPeopleSearch.allMoney != '' and principalPeopleSearch.allMoneyTwo != null and principalPeopleSearch.allMoneyTwo != ''"> <when test="principalPeopleSearch.allMoney != null and principalPeopleSearch.allMoney != '' and principalPeopleSearch.allMoneyTwo != null and principalPeopleSearch.allMoneyTwo != ''">
ppp.allMoney >= #{principalPeopleSearch.allMoney} and ppp.allMoney <![CDATA[<]]>= ppp.allMoney >= #{principalPeopleSearch.allMoney}
#{principalPeopleSearch.allMoneyTwo} and ppp.allMoney <![CDATA[<]]>=
#{principalPeopleSearch.allMoneyTwo}
</when> </when>
<otherwise> <otherwise>
<if test="principalPeopleSearch.allMoney != null and principalPeopleSearch.allMoney != ''"> <if test="principalPeopleSearch.allMoney != null and principalPeopleSearch.allMoney != ''">
@@ -1072,15 +1121,43 @@
</otherwise> </otherwise>
</choose> </choose>
</where> </where>
<if test="principalPeopleSearch.column != null and principalPeopleSearch.column != ''">
<if test="principalPeopleSearch.column == 'allMoney' and principalPeopleSearch.order == 'desc'">
order by allMoney desc
</if>
<if test="principalPeopleSearch.column == 'comeAllMoney' and principalPeopleSearch.order == 'desc'">
order by comeAllMoney desc
</if>
<if test="principalPeopleSearch.column == 'billMoney' and principalPeopleSearch.order == 'desc'">
order by billMoney desc
</if>
<if test="principalPeopleSearch.column == 'allMoney' and principalPeopleSearch.order == 'asc'">
order by allMoney
</if>
<if test="principalPeopleSearch.column == 'comeAllMoney' and principalPeopleSearch.order == 'asc'">
order by comeAllMoney
</if>
<if test="principalPeopleSearch.column == 'billMoney' and principalPeopleSearch.order == 'asc'">
order by billMoney
</if>
</if>
</select> </select>
<!--个人来款统计--> <!--个人来款统计-->
<select id="queryPageListForPrincipal33" resultType="com.jero.statistics.entity.AllMoney"> <select id="queryPageListForPrincipal33" resultType="com.jero.statistics.entity.AllMoney">
select sum(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney from select sum(allMoney) as allMoney,
(select sum(comeAllMoney) as comeAllMoney,
principalNameId as principalId,principalName,SUM(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney, sum(billMoney) as billMoney,
createTime sum(confirmAmount) as confirmAmount from
from (select principalNameId as principalId,
v_statistical principalName,
SUM(allMoney) as allMoney,
sum(comeAllMoney) as comeAllMoney,
createTime,
if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney,
sum(confirmAmount) as confirmAmount
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
<where> <where>
<if test="idList != null and idList != ''"> <if test="idList != null and idList != ''">
principalNameId in principalNameId in
@@ -1089,22 +1166,23 @@
</foreach> </foreach>
</if> </if>
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''"> <if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
AND principalNameId=#{principalPeopleSearch.principalId} AND principalNameId = #{principalPeopleSearch.principalId}
</if> </if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''"> <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND year LIKE AND year LIKE
concat('%',#{principalPeopleSearch.year},'%') concat('%', #{principalPeopleSearch.year}, '%')
</if> </if>
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''"> <if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
AND departCode =#{principalPeopleSearch.departCode} AND departCode = #{principalPeopleSearch.departCode}
</if> </if>
</where> </where>
group by principalId ) ppp group by principalId ) ppp
<where> <where>
<choose> <choose>
<when test="principalPeopleSearch.allMoney != null and principalPeopleSearch.allMoney != '' and principalPeopleSearch.allMoneyTwo != null and principalPeopleSearch.allMoneyTwo != ''"> <when test="principalPeopleSearch.allMoney != null and principalPeopleSearch.allMoney != '' and principalPeopleSearch.allMoneyTwo != null and principalPeopleSearch.allMoneyTwo != ''">
ppp.allMoney >= #{principalPeopleSearch.allMoney} and ppp.allMoney <![CDATA[<]]>= ppp.allMoney >= #{principalPeopleSearch.allMoney}
#{principalPeopleSearch.allMoneyTwo} and ppp.allMoney <![CDATA[<]]>=
#{principalPeopleSearch.allMoneyTwo}
</when> </when>
<otherwise> <otherwise>
<if test="principalPeopleSearch.allMoney != null and principalPeopleSearch.allMoney != ''"> <if test="principalPeopleSearch.allMoney != null and principalPeopleSearch.allMoney != ''">
@@ -1586,14 +1664,25 @@
<!--企业来款统计--> <!--企业来款统计-->
<select id="queryPageListForCompany" resultType="com.jero.statistics.entity.CompanyComeMoneyList"> <select id="queryPageListForCompany" resultType="com.jero.statistics.entity.CompanyComeMoneyList">
select chargeCompanyTemporaryId as chargeCompanyId, chargeCompanyTemporaryName as select * from (
chargeCompanyName,allMoney,comeAllMoney,createTime, select chargeCompanyTemporaryId as chargeCompanyId,
CONCAT(CAST(ROUND((comeAllMoney/allMoney)*100,2) AS CHAR),'%') AS finishRate from chargeCompanyTemporaryName as chargeCompanyName,
(select allMoney,
chargeCompanyId as chargeCompanyTemporaryId,chargeCompanyTemporaryName,SUM(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney, comeAllMoney,
createTime createTime,
from CONCAT(CAST(ROUND((comeAllMoney / allMoney) * 100, 2) AS CHAR), '%') AS finishRate,
v_statistical v billMoney,
confirmAmount from
(select chargeCompanyId as chargeCompanyTemporaryId,
chargeCompanyTemporaryName,
SUM(allMoney) as allMoney,
sum(comeAllMoney) as comeAllMoney,
createTime,
if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney,
sum(confirmAmount) as confirmAmount
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
<where> <where>
<if test="idList != null and idList != ''"> <if test="idList != null and idList != ''">
principalNameId in principalNameId in
@@ -1603,7 +1692,7 @@
</if> </if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''"> <if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND year LIKE AND year LIKE
concat(#{companyComeMoneySearch.year},'%') concat(#{companyComeMoneySearch.year}, '%')
</if> </if>
<if test="companyComeMoneySearch.chargeCompanyId != null and companyComeMoneySearch.chargeCompanyId != ''"> <if test="companyComeMoneySearch.chargeCompanyId != null and companyComeMoneySearch.chargeCompanyId != ''">
AND chargeCompanyId = #{companyComeMoneySearch.chargeCompanyId} AND chargeCompanyId = #{companyComeMoneySearch.chargeCompanyId}
@@ -1614,8 +1703,9 @@
<where> <where>
<choose> <choose>
<when test="companyComeMoneySearch.allMoney != null and companyComeMoneySearch.allMoney != '' and companyComeMoneySearch.allMoneyTwo != null and companyComeMoneySearch.allMoneyTwo != ''"> <when test="companyComeMoneySearch.allMoney != null and companyComeMoneySearch.allMoney != '' and companyComeMoneySearch.allMoneyTwo != null and companyComeMoneySearch.allMoneyTwo != ''">
ppp.allMoney >= #{companyComeMoneySearch.allMoney} and ppp.allMoney <![CDATA[<]]>= ppp.allMoney >= #{companyComeMoneySearch.allMoney}
#{companyComeMoneySearch.allMoneyTwo} and ppp.allMoney <![CDATA[<]]>=
#{companyComeMoneySearch.allMoneyTwo}
</when> </when>
<otherwise> <otherwise>
<if test="companyComeMoneySearch.allMoney != null and companyComeMoneySearch.allMoney != ''"> <if test="companyComeMoneySearch.allMoney != null and companyComeMoneySearch.allMoney != ''">
@@ -1627,15 +1717,44 @@
</otherwise> </otherwise>
</choose> </choose>
</where> </where>
) p
<if test="companyComeMoneySearch.column != null and companyComeMoneySearch.column != ''">
<if test="companyComeMoneySearch.column == 'allMoney' and companyComeMoneySearch.order == 'desc'">
order by allMoney desc
</if>
<if test="companyComeMoneySearch.column == 'comeAllMoney' and companyComeMoneySearch.order == 'desc'">
order by comeAllMoney desc
</if>
<if test="companyComeMoneySearch.column == 'billMoney' and companyComeMoneySearch.order == 'desc'">
order by billMoney desc
</if>
<if test="companyComeMoneySearch.column == 'allMoney' and companyComeMoneySearch.order == 'asc'">
order by allMoney
</if>
<if test="companyComeMoneySearch.column == 'comeAllMoney' and companyComeMoneySearch.order == 'asc'">
order by comeAllMoney
</if>
<if test="companyComeMoneySearch.column == 'billMoney' and companyComeMoneySearch.order == 'asc'">
order by billMoney
</if>
</if>
</select> </select>
<!--企业来款统计统计总金额--> <!--企业来款统计统计总金额-->
<select id="queryPageListForCompany33" resultType="com.jero.statistics.entity.AllMoney"> <select id="queryPageListForCompany33" resultType="com.jero.statistics.entity.AllMoney">
select SUM(ppp.allMoney) as allMoney,SUM(ppp.comeAllMoney) as comeAllMoney from select SUM(ppp.allMoney) as allMoney,
(select SUM(ppp.comeAllMoney) as comeAllMoney,
chargeCompanyTemporaryId,chargeCompanyTemporaryName,SUM(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney, SUM(ppp.billMoney) as billMoney,
createTime SUM(ppp.confirmAmount) as confirmAmount from
from (select chargeCompanyTemporaryId,
v_statistical v chargeCompanyTemporaryName,
SUM(allMoney) as allMoney,
sum(comeAllMoney) as comeAllMoney,
createTime,
if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney,
sum(confirmAmount) as confirmAmount
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
<where> <where>
<if test="idList != null and idList != ''"> <if test="idList != null and idList != ''">
principalNameId in principalNameId in
@@ -1645,7 +1764,7 @@
</if> </if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''"> <if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND year LIKE AND year LIKE
concat(#{companyComeMoneySearch.year},'%') concat(#{companyComeMoneySearch.year}, '%')
</if> </if>
<if test="companyComeMoneySearch.chargeCompanyId != null and companyComeMoneySearch.chargeCompanyId != ''"> <if test="companyComeMoneySearch.chargeCompanyId != null and companyComeMoneySearch.chargeCompanyId != ''">
AND chargeCompanyId = #{companyComeMoneySearch.chargeCompanyId} AND chargeCompanyId = #{companyComeMoneySearch.chargeCompanyId}
@@ -1656,8 +1775,9 @@
<where> <where>
<choose> <choose>
<when test="companyComeMoneySearch.allMoney != null and companyComeMoneySearch.allMoney != '' and companyComeMoneySearch.allMoneyTwo != null and companyComeMoneySearch.allMoneyTwo != ''"> <when test="companyComeMoneySearch.allMoney != null and companyComeMoneySearch.allMoney != '' and companyComeMoneySearch.allMoneyTwo != null and companyComeMoneySearch.allMoneyTwo != ''">
ppp.allMoney >= #{companyComeMoneySearch.allMoney} and ppp.allMoney <![CDATA[<]]>= ppp.allMoney >= #{companyComeMoneySearch.allMoney}
#{companyComeMoneySearch.allMoneyTwo} and ppp.allMoney <![CDATA[<]]>=
#{companyComeMoneySearch.allMoneyTwo}
</when> </when>
<otherwise> <otherwise>
<if test="companyComeMoneySearch.allMoney != null and companyComeMoneySearch.allMoney != ''"> <if test="companyComeMoneySearch.allMoney != null and companyComeMoneySearch.allMoney != ''">
@@ -1784,9 +1904,13 @@
<!-- 企业来款详情统计--> <!-- 企业来款详情统计-->
<select id="queryPageListForCompanyDetail" resultType="com.jero.statistics.entity.CompanyComeMoneyDetail"> <select id="queryPageListForCompanyDetail" resultType="com.jero.statistics.entity.CompanyComeMoneyDetail">
select projectId,projectName,allMoney,comeAllMoney,chargeUse,packText,pack select * from(
from select projectId,projectName,allMoney,comeAllMoney,chargeUse,packText,pack,
v_statistical pmb.invoice_amount as billMoney,
confirmAmount
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
<where> <where>
chargeCompanyId = #{CompanyComeMoneyDetailSearch.chargeCompanyId} chargeCompanyId = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
<if test="idList != null and idList != ''"> <if test="idList != null and idList != ''">
@@ -1826,14 +1950,46 @@
</if> </if>
</otherwise> </otherwise>
</choose> </choose>
</where> </where>) p
<if test="CompanyComeMoneyDetailSearch.column != null and CompanyComeMoneyDetailSearch.column != ''">
<if test="CompanyComeMoneyDetailSearch.column == 'allMoney' and CompanyComeMoneyDetailSearch.order == 'desc'">
order by allMoney desc
</if>
<if test="CompanyComeMoneyDetailSearch.column == 'comeAllMoney' and CompanyComeMoneyDetailSearch.order == 'desc'">
order by comeAllMoney desc
</if>
<if test="CompanyComeMoneyDetailSearch.column == 'billMoney' and CompanyComeMoneyDetailSearch.order == 'desc'">
order by billMoney desc
</if>
<if test="CompanyComeMoneyDetailSearch.column == 'allMoney' and CompanyComeMoneyDetailSearch.order == 'asc'">
order by allMoney
</if>
<if test="CompanyComeMoneyDetailSearch.column == 'comeAllMoney' and CompanyComeMoneyDetailSearch.order == 'asc'">
order by comeAllMoney
</if>
<if test="CompanyComeMoneyDetailSearch.column == 'billMoney' and CompanyComeMoneyDetailSearch.order == 'asc'">
order by billMoney
</if>
</if>
</select> </select>
<!-- 企业来款详情统计总金额--> <!-- 企业来款详情统计总金额-->
<select id="queryPageListForCompanyDetail33" resultType="com.jero.statistics.entity.AllMoney"> <select id="queryPageListForCompanyDetail33" resultType="com.jero.statistics.entity.AllMoney">
select sum(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney from ( select sum(allMoney) as allMoney,
select projectId,projectName,allMoney,comeAllMoney,chargeUse,packText,pack sum(comeAllMoney) as comeAllMoney,
from sum(billMoney) as billMoney,
v_statistical sum(confirmAmount) as confirmAmount from (
select projectId,
projectName,
allMoney,
comeAllMoney,
chargeUse,
packText,
pack,
pmb.invoice_amount as billMoney,
confirmAmount
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
<where> <where>
chargeCompanyId = #{CompanyComeMoneyDetailSearch.chargeCompanyId} chargeCompanyId = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
<if test="idList != null and idList != ''"> <if test="idList != null and idList != ''">
@@ -1844,25 +2000,26 @@
</if> </if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''"> <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
AND projectName LIKE AND projectName LIKE
concat('%'#{CompanyComeMoneyDetailSearch.projectName},'%') concat('%'#{CompanyComeMoneyDetailSearch.projectName}, '%')
</if> </if>
<if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''"> <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
AND payStatue =#{CompanyComeMoneyDetailSearch.inAccountStatue} AND payStatue = #{CompanyComeMoneyDetailSearch.inAccountStatue}
</if> </if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''"> <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND year LIKE AND year LIKE
concat('%',#{CompanyComeMoneyDetailSearch.year},'%') concat('%', #{CompanyComeMoneyDetailSearch.year}, '%')
</if> </if>
<if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''"> <if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
AND chargeUse=#{CompanyComeMoneyDetailSearch.chargeUse} AND chargeUse = #{CompanyComeMoneyDetailSearch.chargeUse}
</if> </if>
<choose> <choose>
<when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''"> <when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
AND allMoney >= #{CompanyComeMoneyDetailSearch.allMoney} and allMoney <![CDATA[<]]>= AND allMoney >= #{CompanyComeMoneyDetailSearch.allMoney}
#{CompanyComeMoneyDetailSearch.allMoneyTwo} and allMoney <![CDATA[<]]>=
#{CompanyComeMoneyDetailSearch.allMoneyTwo}
</when> </when>
<otherwise> <otherwise>
<if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''"> <if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+4
View File
@@ -95,6 +95,8 @@ public class AllProjectStatisticsController {
hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney()); hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney()); hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney());
hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
hashMap.put("pageList", pageList); hashMap.put("pageList", pageList);
return Result.OK(hashMap); return Result.OK(hashMap);
@@ -162,6 +164,8 @@ public class AllProjectStatisticsController {
hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney()); hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney()); hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney());
hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
hashMap.put("pageList", pageList); hashMap.put("pageList", pageList);
return Result.OK(hashMap); return Result.OK(hashMap);
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+4
View File
@@ -80,6 +80,8 @@ public class CompanyComeMoneyStatisticsController {
hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney()); hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney()); hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney());
hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
hashMap.put("pageList", pageList); hashMap.put("pageList", pageList);
return Result.OK(hashMap); return Result.OK(hashMap);
@@ -128,6 +130,8 @@ public class CompanyComeMoneyStatisticsController {
AllMoney allMoney = payWorkingGroupService.queryPageListForCompanyDetail33(companyComeMoneyDetailSearch, null); AllMoney allMoney = payWorkingGroupService.queryPageListForCompanyDetail33(companyComeMoneyDetailSearch, null);
hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney()); hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney()); hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney());
hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
hashMap.put("pageList", pageList); hashMap.put("pageList", pageList);
return Result.OK(hashMap); return Result.OK(hashMap);
} }
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
+4
View File
@@ -90,6 +90,8 @@ public class PayWorkingGroupStatisticsController {
hashMap.put("pageList", pageList.setRecords(records)); hashMap.put("pageList", pageList.setRecords(records));
hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney()); hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney()); hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney());
hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
return Result.OK(hashMap); return Result.OK(hashMap);
} }
@@ -179,6 +181,8 @@ public class PayWorkingGroupStatisticsController {
hashMap.put("pageList", pageList); hashMap.put("pageList", pageList);
hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney()); hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney()); hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney());
hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
return Result.OK(hashMap); return Result.OK(hashMap);
} }
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
+4 -6
View File
@@ -98,12 +98,6 @@ public class PrincipalPeopleStatisticsController {
AllMoney allMoney = payWorkingGroupService.queryPageListForPrincipal33(principalPeopleSearch, idList); AllMoney allMoney = payWorkingGroupService.queryPageListForPrincipal33(principalPeopleSearch, idList);
HashMap<String, Object> hashMap = new HashMap<>(); HashMap<String, Object> hashMap = new HashMap<>();
// double sum=0;
// double sumTwo =0;
// if(ObjectUtils.isNotEmpty(pageList.getRecords())) {
// sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0;
// sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0;
// }
//处理为空数据为0 //处理为空数据为0
for (PrincipalPeopleList s : pageList.getRecords()) { for (PrincipalPeopleList s : pageList.getRecords()) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) { if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
@@ -119,6 +113,8 @@ public class PrincipalPeopleStatisticsController {
DecimalFormat df = new DecimalFormat("#,##0.00"); DecimalFormat df = new DecimalFormat("#,##0.00");
hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney()); hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney()); hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney());
hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
hashMap.put("pageList", pageList); hashMap.put("pageList", pageList);
return Result.OK(hashMap); return Result.OK(hashMap);
@@ -158,6 +154,8 @@ public class PrincipalPeopleStatisticsController {
} }
hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney()); hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney());
hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney()); hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney());
hashMap.put("sumOfBillMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getBillMoney());
hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount());
hashMap.put("pageList", pageList); hashMap.put("pageList", pageList);
return Result.OK(hashMap); return Result.OK(hashMap);
} }
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllMoney.java
+2
View File
@@ -12,4 +12,6 @@ public class AllMoney {
private String comeAllMoney; private String comeAllMoney;
private String billMoney; private String billMoney;
private String confirmAmount;
} }
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java
+4
View File
@@ -34,6 +34,10 @@ public class AllProjectStatistics {
@ApiModelProperty(value = "开票金额") @ApiModelProperty(value = "开票金额")
private String billMoney; private String billMoney;
@Excel(name = "确认金额", width = 15)
@ApiModelProperty(value = "确认金额")
private String confirmAmount;
@ApiModelProperty(value = "来款用途编码") @ApiModelProperty(value = "来款用途编码")
private String chargeUse; private String chargeUse;
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java
+8
View File
@@ -26,6 +26,14 @@ public class CompanyComeMoneyDetail {
@ApiModelProperty(value = "实收金额") @ApiModelProperty(value = "实收金额")
private String comeAllMoney; private String comeAllMoney;
@Excel(name = "开票金额", width = 15)
@ApiModelProperty(value = "开票金额")
private String billMoney;
@Excel(name = "确认金额", width = 15)
@ApiModelProperty(value = "确认金额")
private String confirmAmount;
@ApiModelProperty(value = "来款用途编码") @ApiModelProperty(value = "来款用途编码")
private String chargeUse; private String chargeUse;
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java
+9
View File
@@ -25,6 +25,15 @@ public class CompanyComeMoneyList {
@Excel(name = "实收总金额", width = 15) @Excel(name = "实收总金额", width = 15)
@ApiModelProperty(value = "实收总金额") @ApiModelProperty(value = "实收总金额")
private String comeAllMoney; private String comeAllMoney;
@Excel(name = "开票金额", width = 15)
@ApiModelProperty(value = "开票金额")
private String billMoney;
@Excel(name = "确认金额", width = 15)
@ApiModelProperty(value = "确认金额")
private String confirmAmount;
@Excel(name = "到账率", width = 15) @Excel(name = "到账率", width = 15)
@ApiModelProperty(value = "到账率") @ApiModelProperty(value = "到账率")
private String finishRate; private String finishRate;
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java
+4
View File
@@ -19,5 +19,9 @@ public class DepartStatistics {
@ApiModelProperty(value = "实收总金额") @ApiModelProperty(value = "实收总金额")
private String comeAllMoney; private String comeAllMoney;
@Excel(name = "开票金额", width = 15)
@ApiModelProperty(value = "开票金额")
private String billMoney;
private String departName; private String departName;
} }
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleList.java
+8
View File
@@ -26,6 +26,14 @@ public class PrincipalPeopleList {
@ApiModelProperty(value = "实收总金额") @ApiModelProperty(value = "实收总金额")
private String comeAllMoney; private String comeAllMoney;
@Excel(name = "开票金额", width = 15)
@ApiModelProperty(value = "开票金额")
private String billMoney;
@Excel(name = "确认金额", width = 15)
@ApiModelProperty(value = "确认金额")
private String confirmAmount;
@Excel(name = "个人完成率", width = 15) @Excel(name = "个人完成率", width = 15)
@ApiModelProperty(value = "个人完成率") @ApiModelProperty(value = "个人完成率")
private String finishRate; private String finishRate;