From b7ae0ac05ea6e3660e17129a31a1be669a3cca94 Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Wed, 30 Mar 2022 18:39:22 +0800 Subject: [PATCH] =?UTF-8?q?add:=E7=BB=9F=E8=AE=A1=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/config/filter/csrf/CsrfFilter.java | 2 +- .../project/mapper/PayWorkingGroupMapper.java | 6 + .../mapper/xml/PayWorkingGroupMapper.xml | 2003 +++++++++++++---- .../xml/PayWorkingGroupSubItemMapper.xml | 52 +- .../service/IPayWorkingGroupService.java | 6 + .../impl/PayResearchProjectServiceImpl.java | 2 +- .../impl/PayWorkingGroupServiceImpl.java | 15 + .../AllProjectStatisticsController.java | 39 +- .../CompanyComeMoneyStatisticsController.java | 37 +- .../PrincipalPeopleStatisticsController.java | 18 +- .../com/jero/statistics/entity/AllMoney.java | 13 + .../entity/CompanyComeMoneyList.java | 3 + 12 files changed, 1760 insertions(+), 436 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllMoney.java diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java index f3d27b5a..487b952e 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java @@ -55,7 +55,7 @@ public class CsrfFilter implements Filter { // 获取来源 String referurl = req.getHeader("Referer"); // websocket 请求放过 - if(isWhiteReq(referurl) || url.contains("/websocket/") || url.contains("download")){ + if(isWhiteReq(referurl) || url.contains("/websocket/") || url.contains("download")||referurl==null){ chain.doFilter(request, response); } else { String log = ""; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java index 7dbb41e8..438d8658 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -189,4 +189,10 @@ public interface PayWorkingGroupMapper extends BaseMapper { List queryPageListForPrincipalDetailTwo(@Param("principalPeopleDetailSearch") PrincipalPeopleDetailSearch principalPeopleDetailSearch,@Param("ids") ArrayList ids); + AllMoney queryPageList33(@Param("allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch); + + AllMoney queryPageListForCompany33(@Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch, @Param("idList") List idList); + + AllMoney queryPageListForCompanyDetail33(@Param("CompanyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch, @Param("idList") List idList); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index d44937aa..a9942ed9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -132,19 +132,19 @@ pwgs.allMoney, pwgs.comeAllMoney, pwgs.createTime, - CONCAT(CAST(ROUND((pwgs.comeAllMoney/pwgs.allMoney)*100,2) AS CHAR),'%') AS moneyRate,pwgs.payment_date + CONCAT(CAST(ROUND((pwgs.comeAllMoney/pwgs.allMoney)*100,2) AS CHAR),'%') AS moneyRate FROM pay_working_group pwg left join ( SELECT id, createTime,working_group_id, - sum(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney,max(pwg2s.payment_date) as payment_date from + sum(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney from (select pwg1s.id,pwg1s.create_time AS createTime,working_group_id,receivable_amount AS - allMoney,paid_amount AS comeAllMoney,max(ppr.payment_date) as payment_date + allMoney,paid_amount AS comeAllMoney from pay_working_group_subitem pwg1s - inner join pay_payment_record ppr on(pwg1s.id=ppr.project_id) - - WHERE ppr.payment_date like concat('%',#{payWorkingGroupSearch.year},'%') - - group by pwg1s.id + + + + + ) pwg2s group by pwg2s.working_group_id ) pwgs on(pwg.id=pwgs.working_group_id) @@ -155,28 +155,32 @@ #{item} - and pwgs.comeAllMoney is not null - - and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%')) - - - - AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) >= #{payWorkingGroupSearch.allMoney} and if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) = - #{payWorkingGroupSearch.allMoneyTwo} - - - - AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) >= #{payWorkingGroupSearch.allMoney} - - - AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) = #{payWorkingGroupSearch.allMoneyTwo} - - - - ) ppp order by ppp.payment_date desc - + + + and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%')) + + + AND pwgs.createTime LIKE + concat(#{payWorkingGroupSearch.year},'%') + + + + AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) >= #{payWorkingGroupSearch.allMoney} and if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) = + #{payWorkingGroupSearch.allMoneyTwo} + + + + AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) >= #{payWorkingGroupSearch.allMoney} + + + AND if(pwgs.allMoney IS NULL OR pwgs.allMoney = '', 0, pwgs.allMoney ) = #{payWorkingGroupSearch.allMoneyTwo} + + + + ) ppp + - + + + + @@ -1228,25 +1697,27 @@ CONCAT(CAST(ROUND((comeAllMoney/allMoney)*100,2) AS CHAR),'%') AS finishRate from (select principalId,principalName,SUM(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney, - createTime,max(payment_date) as payment_date + createTime from (SELECT pwg.principal_id_a as principalId, pwg.principal_name_a as principalName, sum(pwgs.allMoney) as allMoney, sum(pwgs.comeAllMoney) as comeAllMoney, - pwg.create_time as createTime, - max(pwgs.payment_date) as payment_date + pwg.create_time as createTime FROM pay_working_group pwg right JOIN ( - select id,working_group_id,SUM(receivable_amount) AS allMoney,SUM(paid_amount) AS comeAllMoney,max(pwgs2.payment_date) as payment_date + select id,working_group_id,SUM(receivable_amount) AS allMoney,SUM(paid_amount) AS comeAllMoney, + create_time from (select - pwg1s.id,working_group_id,receivable_amount,paid_amount,max(ppr.payment_date) as payment_date - from pay_working_group_subitem pwg1s inner join pay_payment_record ppr on(pwg1s.id=ppr.project_id) - - WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%') - - group by pwg1s.id) pwgs2 + pwg1s.id,working_group_id,receivable_amount,paid_amount,create_time + from pay_working_group_subitem pwg1s + + + + + + ) pwgs2 GROUP BY pwgs2.working_group_id ) pwgs ON (pwg.id=pwgs.working_group_id) @@ -1261,6 +1732,10 @@ AND pwg.principal_id_a=#{principalPeopleSearch.principalId} + + AND pwgs.create_time LIKE + concat(#{principalPeopleSearch.year},'%') + AND su.org_code =#{principalPeopleSearch.departCode} @@ -1272,15 +1747,15 @@ pcp1.principal_name as principalName, sum(pcp1.receivable_amount) as allMoney, sum(pcp1.paid_amount) as comeAllMoney, - pcp1.create_time as createTime, - max(pcp1.payment_date) as payment_date + pcp1.create_time as createTime FROM - (select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time,max(ppr.payment_date) as payment_date from - pay_common_project pcp inner join pay_payment_record ppr on(pcp.id=ppr.project_id) - - WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%') - - group by pcp.id + (select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time from + pay_common_project pcp + + + + + ) pcp1 left JOIN sys_user su on(pcp1.principal_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) @@ -1294,7 +1769,10 @@ AND su.org_code =#{principalPeopleSearch.departCode} - + + AND pcp1.create_time LIKE + concat(#{principalPeopleSearch.year},'%') + AND pcp1.principal_id=#{principalPeopleSearch.principalId} @@ -1305,18 +1783,17 @@ su.realname as principalName, SUM(pmps.allMoney) AS allMoney, SUM(pmps.comeAllMoney) AS comeAllMoney, - pmp.create_time as createTime, - max(pmps.payment_date) as payment_date + pmp.create_time as createTime FROM pay_member_project pmp right join ( - select id,projectId,sum(amount_receivable) AS allMoney,sum(paid_amount) AS comeAllMoney,max(pmp1s.payment_date) as payment_date from( - select pmp1s.id,pmp1s.project_id as projectId,amount_receivable,paid_amount,max(ppr.payment_date) as payment_date from + select id,projectId,sum(amount_receivable) AS allMoney,sum(paid_amount) AS comeAllMoney,create_time from( + select pmp1s.id,pmp1s.project_id as projectId,amount_receivable,paid_amount,create_time from pay_member_project_subitem pmp1s - inner join pay_payment_record ppr on(pmp1s.id=ppr.project_id) - - WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%') - - GROUP BY pmp1s.id + + + + + ) pmp1s group by pmp1s.projectId ) pmps on(pmp.id=pmps.projectId) left JOIN sys_user su on(pmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) @@ -1326,6 +1803,10 @@ #{item} + + AND pmps.create_time LIKE + concat(#{principalPeopleSearch.year},'%') + AND su.org_code =#{principalPeopleSearch.departCode} @@ -1340,18 +1821,18 @@ su.realname as principalName, sum(pms.allMoney) as allMoney, sum(pms.comeAllMoney) as comeAllMoney, - pm.create_time as createTime, - max(pms.payment_date) as payment_date + pm.create_time as createTime FROM pay_meeting pm right join ( select id,meeting_id,SUM(amount_receivable) AS - allMoney,SUM(paid_amount) AS comeAllMoney,max(pms1.payment_date) as payment_date + allMoney,SUM(paid_amount) AS comeAllMoney,create_time from - (select pm1s.id,meeting_id,amount_receivable,paid_amount,max(ppr.payment_date) as payment_date from pay_meeting_situation pm1s - inner join pay_payment_record ppr on(pm1s.id=ppr.project_id) - - WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%') - - GROUP BY pm1s.id) pms1 group by pms1.meeting_id) pms on(pm.id=pms.meeting_id) + (select pm1s.id,meeting_id,amount_receivable,paid_amount,create_time from pay_meeting_situation pm1s + + + + + + ) pms1 group by pms1.meeting_id) pms on(pm.id=pms.meeting_id) left JOIN sys_user su on(pm.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) @@ -1364,6 +1845,10 @@ AND su.org_code =#{principalPeopleSearch.departCode} + + AND pms.create_time LIKE + concat(#{principalPeopleSearch.year},'%') + AND pm.director_id=#{principalPeopleSearch.principalId} @@ -1375,20 +1860,19 @@ su.realname as principalName, sum(tmps.allMoney) as allMoney, sum(tmps.comeAllMoney) as comeAllMoney, - tmp.create_time as createTime, - max(tmps.payment_date) as payment_date + tmp.create_time as createTime FROM tb_member_project tmp right join ( select id,project_id,SUM(amount_receivable) AS - allMoney,SUM(paid_amount) AS comeAllMoney,max(tmps2.payment_date) as payment_date + allMoney,SUM(paid_amount) AS comeAllMoney,create_time from - (select tmps1.id,tmps1.project_id,amount_receivable,paid_amount,max(ppr.payment_date) as payment_date from tb_member_project_subitem tmps1 - inner join pay_payment_record ppr on(tmps1.id=ppr.project_id) - - WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%') - - GROUP BY tmps1.id) tmps2 group by tmps2.project_id) tmps on(tmp.id=tmps.project_id) + (select tmps1.id,tmps1.project_id,amount_receivable,paid_amount,create_time from tb_member_project_subitem tmps1 + + + + + + ) tmps2 group by tmps2.project_id) tmps on(tmp.id=tmps.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) - tmp.director_id in @@ -1396,6 +1880,10 @@ #{item} + + AND tmps.create_time LIKE + concat(#{principalPeopleSearch.year},'%') + AND su.org_code =#{principalPeopleSearch.departCode} @@ -1410,18 +1898,18 @@ su.realname as principalName, sum(tmps.allMoney) as allMoney, sum(tmps.comeAllMoney) as comeAllMoney, - tmp.create_time as createTime, - max(tmps.payment_date) as payment_date + tmp.create_time as createTime FROM tb_member_project tmp right join ( select id,project_id,SUM(amount_receivable) AS - allMoney,SUM(paid_amount) AS comeAllMoney,max(tmps2.payment_date) as payment_date + allMoney,SUM(paid_amount) AS comeAllMoney,create_time from - (select tmps1.id,tmps1.project_id,amount_receivable,paid_amount,max(ppr.payment_date) as payment_date from tb_certificate_payment tmps1 - inner join pay_payment_record ppr on(tmps1.id=ppr.project_id) - - WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%') - - GROUP BY tmps1.id) tmps2 group by tmps2.project_id) tmps on(tmp.id=tmps.project_id) + (select tmps1.id,tmps1.project_id,amount_receivable,paid_amount ,create_time from tb_certificate_payment tmps1 + + + + + + ) tmps2 group by tmps2.project_id) tmps on(tmp.id=tmps.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) @@ -1434,7 +1922,10 @@ AND su.org_code =#{principalPeopleSearch.departCode} - + + AND tmps.create_time LIKE + concat(#{principalPeopleSearch.year},'%') + AND tmp.director_id=#{principalPeopleSearch.principalId} @@ -1457,7 +1948,6 @@ - order by ppp.payment_date desc @@ -2056,26 +2672,31 @@ CONCAT(CAST(ROUND((comeAllMoney/allMoney)*100,2) AS CHAR),'%') AS finishRate from (select chargeCompanyTemporaryId,chargeCompanyTemporaryName,SUM(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney, - createTime,payment_date + createTime from (SELECT pwgs.charge_company_id as chargeCompanyTemporaryId, pcm.company_name as chargeCompanyTemporaryName, allMoney, comeAllMoney, - pwgs.create_time as createTime, - pwgs.payment_date + pwgs.create_time as createTime FROM ( - select pwgs2.id,working_group_id,SUM(receivable_amount) AS allMoney,SUM(paid_amount) AS comeAllMoney,charge_company_id,pwgs2.create_time,max(pwgs2.payment_date) as payment_date + select pwgs2.id,working_group_id,SUM(receivable_amount) AS allMoney,SUM(paid_amount) AS comeAllMoney,charge_company_id,pwgs2.create_time from (select - pwg1s.id,working_group_id,receivable_amount,paid_amount,charge_company_id,pwg1s.create_time,max(ppr.payment_date) as payment_date - from pay_working_group_subitem pwg1s inner join pay_payment_record ppr on(pwg1s.id=ppr.project_id) - - WHERE ppr.payment_date like concat('%',#{companyComeMoneySearch.year},'%') - - group by pwg1s.id) pwgs2 left join pay_working_group pwg + pwg1s.id,working_group_id,receivable_amount,paid_amount,charge_company_id,pwg1s.create_time + from pay_working_group_subitem pwg1s + + + + + + ) pwgs2 left join pay_working_group pwg ON (pwg.id=pwgs2.working_group_id) + + AND pwgs2.create_time LIKE + concat(#{companyComeMoneySearch.year},'%') + pwg.principal_id_a in @@ -2098,15 +2719,15 @@ pcm.company_name as chargeCompanyTemporaryName, sum(pcp1.receivable_amount) as allMoney, sum(pcp1.paid_amount) as comeAllMoney, - pcp1.create_time as createTime, - max(pcp1.payment_date) as payment_date + pcp1.create_time as createTime FROM - (select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time,pcp.charge_company_id,max(ppr.payment_date) as payment_date from - pay_common_project pcp inner join pay_payment_record ppr on(pcp.id=ppr.project_id) - - WHERE ppr.payment_date like concat('%',#{companyComeMoneySearch.year},'%') - - group by pcp.id + (select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time,pcp.charge_company_id from + pay_common_project pcp + + + + + ) pcp1 left join pay_company_management pcm on(pcm.id=pcp1.charge_company_id) @@ -2116,6 +2737,10 @@ #{item} + + AND pcp1.create_time LIKE + concat(#{companyComeMoneySearch.year},'%') + AND pcp1.charge_company_id=#{companyComeMoneySearch.chargeCompanyId} @@ -2126,17 +2751,17 @@ company_name as chargeCompanyTemporaryName, allMoney, comeAllMoney, - create_time as createTime, - pmps.payment_date + create_time as createTime FROM ( - select projectId,sum(amount_receivable) AS allMoney,sum(paid_amount) AS comeAllMoney ,pmp1s.create_time,company_id,company_name,max(pmp1s.payment_date) as payment_date from( - select pmp2s.id,pmp2s.project_id as projectId,amount_receivable,paid_amount,pmp2s.create_time,company_id,company_name,max(ppr.payment_date) as payment_date from + select projectId,sum(amount_receivable) AS allMoney,sum(paid_amount) AS comeAllMoney ,pmp1s.create_time,company_id,company_name from( + select pmp2s.id,pmp2s.project_id as projectId,amount_receivable,paid_amount,pmp2s.create_time,company_id,company_name from pay_member_project_subitem pmp2s - inner join pay_payment_record ppr on(pmp2s.id=ppr.project_id) - - WHERE ppr.payment_date like concat('%',#{companyComeMoneySearch.year},'%') - - GROUP BY pmp2s.id) pmp1s left join pay_member_project pmp on(pmp.id=pmp1s.projectId) + + + + + + ) pmp1s left join pay_member_project pmp on(pmp.id=pmp1s.projectId) pmp.director_id in @@ -2144,10 +2769,15 @@ #{item} + + AND pmp1s.create_time LIKE + concat(#{companyComeMoneySearch.year},'%') + group by pmp1s.company_id ) pmps + AND pmps.company_id=#{companyComeMoneySearch.chargeCompanyId} @@ -2158,17 +2788,17 @@ company_name as chargeCompanyTemporaryName, allMoney, comeAllMoney, - createTime, - pmss.payment_date + createTime FROM (select SUM(allMoney) AS - allMoney,SUM(comeAllMoney) AS comeAllMoney,pms.create_time as createTime ,company_id,company_name,max(pms.payment_date) as payment_date - from (select pm1s.meeting_id,amount_receivable as allMoney ,paid_amount as comeAllMoney,pm1s.create_time,company_id,company_name,max(ppr.payment_date) as payment_date + allMoney,SUM(comeAllMoney) AS comeAllMoney,pms.create_time as createTime ,company_id,company_name + from (select pm1s.meeting_id,amount_receivable as allMoney ,paid_amount as comeAllMoney,pm1s.create_time,company_id,company_name from pay_meeting_situation pm1s - inner join pay_payment_record ppr on(pm1s.id=ppr.project_id) - - WHERE ppr.payment_date like concat('%',#{companyComeMoneySearch.year},'%') - - GROUP BY pm1s.id) pms left join pay_meeting pm on(pm.id=pms.meeting_id) + + + + + + ) pms left join pay_meeting pm on(pm.id=pms.meeting_id) pm.director_id in @@ -2176,6 +2806,10 @@ #{item} + + AND pms.create_time LIKE + concat(#{companyComeMoneySearch.year},'%') + group by pms.company_id) pmss @@ -2189,17 +2823,17 @@ company_name as chargeCompanyTemporaryName, allMoney, comeAllMoney, - createTime, - payment_date + createTime FROM (select SUM(amount_receivable) AS - allMoney,SUM(paid_amount) AS comeAllMoney,tpms.create_time as createTime ,company_id,company_name,max(tpms.payment_date) as payment_date - from(select amount_receivable,paid_amount,tmp1s.create_time,company_id,company_name,tmp1s.project_id,max(ppr.payment_date) as payment_date + allMoney,SUM(paid_amount) AS comeAllMoney,tpms.create_time as createTime ,company_id,company_name + from(select amount_receivable,paid_amount,tmp1s.create_time,company_id,company_name,tmp1s.project_id from tb_member_project_subitem tmp1s - inner join pay_payment_record ppr on(tmp1s.id=ppr.project_id) - - WHERE ppr.payment_date like concat('%',#{companyComeMoneySearch.year},'%') - - group by tmp1s.id) tpms + + + + + + ) tpms left join tb_member_project tmp on(tmp.id=tpms.project_id) @@ -2209,6 +2843,10 @@ + + AND tpms.create_time LIKE + concat(#{companyComeMoneySearch.year},'%') + group by tpms.company_id) ppp @@ -2223,17 +2861,17 @@ company_name as chargeCompanyTemporaryName, allMoney, comeAllMoney, - createTime, - payment_date + createTime FROM (select SUM(amount_receivable) AS - allMoney,SUM(paid_amount) AS comeAllMoney,tpms.create_time as createTime ,company_id,company_name,max(tpms.payment_date) as payment_date - from(select amount_receivable,paid_amount,tmp1s.create_time,company_id,company_name,tmp1s.project_id,max(ppr.payment_date) as payment_date + allMoney,SUM(paid_amount) AS comeAllMoney,tpms.create_time as createTime ,company_id,company_name + from(select amount_receivable,paid_amount,tmp1s.create_time,company_id,company_name,tmp1s.project_id from tb_certificate_payment tmp1s - inner join pay_payment_record ppr on(tmp1s.id=ppr.project_id) - - WHERE ppr.payment_date like concat('%',#{companyComeMoneySearch.year},'%') - - group by tmp1s.id) tpms + + + + + + ) tpms left join tb_member_project tmp on(tmp.id=tpms.project_id) @@ -2243,15 +2881,20 @@ + + AND tpms.create_time LIKE + concat(#{companyComeMoneySearch.year},'%') + group by tpms.company_id) ppp + AND ppp.company_id=#{companyComeMoneySearch.chargeCompanyId} ) pp - group by pp.chargeCompanyTemporaryId order by pp.payment_date desc) ppp + group by pp.chargeCompanyTemporaryId ) ppp @@ -2268,7 +2911,252 @@ - order by ppp.payment_date desc + + + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index eed1e0c1..520c530e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -85,6 +85,10 @@ AND pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%')) + + AND pwgs.create_time LIKE + concat(#{payWorkingGroupSubletSearch.year},'%') + AND pwgs.charge_use=#{payWorkingGroupSubletSearch.chargeUse} @@ -112,17 +116,17 @@ - group by pwgs.id) pwg1 - inner join - (select pwgs.id as id,working_group_id,max(ppr.payment_date) as payment_date - from pay_working_group_subitem pwgs - left join pay_payment_record ppr on(pwgs.id=ppr.project_id) - - WHERE ppr.payment_date like concat('%',#{payWorkingGroupSubletSearch.year},'%') - - GROUP BY pwgs.id - ) pwg2 on (pwg2.id=pwg1.id) - order by pwg2.payment_date + group by pwgs.id) pwg1 order by pwg1.create_time desc + + + + + + + + + + @@ -147,6 +151,10 @@ AND pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%')) + + AND pwgs.create_time LIKE + concat(#{payWorkingGroupSubletSearch.year},'%') + AND pwgs.charge_use=#{payWorkingGroupSubletSearch.chargeUse} @@ -174,17 +182,17 @@ - group by pwgs.id) pwg1 - inner join - (select pwgs.id as id,working_group_id,max(ppr.payment_date) as payment_date - from pay_working_group_subitem pwgs - left join pay_payment_record ppr on(pwgs.id=ppr.project_id) - - WHERE ppr.payment_date like concat('%',#{payWorkingGroupSubletSearch.year},'%') - - GROUP BY pwgs.id - ) pwg2 on (pwg2.id=pwg1.id) - order by pwg2.payment_date + group by pwgs.id) pwg1 order by pwg1.create_time desc + + + + + + + + + +