From 95ec40663ac3a1446bf6b6fd3217dbee4d0b66e3 Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Wed, 15 Dec 2021 20:33:45 +0800 Subject: [PATCH] =?UTF-8?q?add:=E7=BB=9F=E8=AE=A1=E8=AF=81=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/mapper/xml/ProjectDetailMapper.xml | 13 +- .../mapper/xml/PayWorkingGroupMapper.xml | 307 +++++++++++++++++- .../PrincipalPeopleStatisticsController.java | 1 + .../entity/PrincipalPeopleDetail.java | 1 + 4 files changed, 319 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml index f6e306a5..62f470fb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml @@ -56,6 +56,17 @@ AND tmsub.id = #{projectId} + + UNION ALL + select tmps.id,tmember.project_name,tmps.charge_use,tmember.director_id,su.realname,tmps.liaison_man_id,tmps.liaison_man,tmps.company_name,tmps.amount_receivable,tmps.paid_amount,tmps.invoice_requirements,tmps.pack,tmps.in_account,tmps.make_invoice,tmps.mail,tmps.create_time,5,'','','','',tmps.company_id,tmps.payment_method,'','','',tmember.year,'' + from tb_member_project tmember + left join sys_user su on tmember.director_id = su.id + inner join tb_certificate_payment tmps on tmember.id=tmps.project_id + + + AND tmps.id = #{projectId} + + - \ No newline at end of file + 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 36440652..940f2c07 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 @@ -552,6 +552,66 @@ + + union all + SELECT + tcp.id, + tmp.project_name AS projectName, + su.realname as principalName, + tcp.company_name AS chargeCompanyTemporaryName, + tcp.amount_receivable as allMoney, + tcp.paid_amount as comeAllMoney, + tcp.charge_use as chargeUse, + sd.depart_name as depart, + tcp.pack as pack, + 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) + + + tmp.director_id in + + #{item} + + + + AND tmp.project_name LIKE + concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) + + + AND tcp.in_account LIKE + concat('%',concat(#{allProjectStatisticsSearch.payStatue},'%')) + + + AND tmp.director_id=#{allProjectStatisticsSearch.principalNameId} + + + AND su.org_code =#{allProjectStatisticsSearch.departCode} + + + AND tcp.charge_use=#{allProjectStatisticsSearch.chargeUse} + + + AND tcp.company_name LIKE + concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) + + + AND tcp.pack=#{allProjectStatisticsSearch.pack} + + + + AND tcp.amount_receivable >= #{allProjectStatisticsSearch.allMoney} and tcp.amount_receivable = + #{allProjectStatisticsSearch.allMoneyTwo} + + + + AND tcp.amount_receivable >= #{allProjectStatisticsSearch.allMoney} + + + AND tcp.amount_receivable = #{allProjectStatisticsSearch.allMoneyTwo} + + + ) pp inner join ( select pwgs.id as id,max(ppr.payment_date) as payment_date @@ -596,8 +656,15 @@ concat('%',#{allProjectStatisticsSearch.year},'%') group by tmps.id + union all + SELECT + tcp.id,max(ppr.payment_date) as payment_date from tb_certificate_payment tcp inner join pay_payment_record ppr on(tcp.id=ppr.project_id) + + WHERE ppr.payment_date like + concat('%',#{allProjectStatisticsSearch.year},'%') + + group by tcp.id ) pprr on(pp.id=pprr.id) group by pp.id order by pprr.payment_date desc - @@ -1243,8 +1379,42 @@ AND tmp.director_id=#{principalPeopleSearch.principalId} group by tmp.director_id - ) pp + union all + SELECT + tmp.director_id as principalId, + 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 + 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 + 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) + 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 + + #{item} + + + + AND su.org_code =#{principalPeopleSearch.departCode} + + + + AND tmp.director_id=#{principalPeopleSearch.principalId} + + group by tmp.director_id + ) pp group by pp.principalId order by pp.createTime) ppp @@ -1561,6 +1731,45 @@ + union ALL + SELECT + tmps.create_time as createTime, + tmps.id, + tmps.company_name as chargeCompanyTemporaryName, + tmp.project_name as projectName, + tmp.director_id as principalId, + tmps.amount_receivable AS allMoney, + tmps.paid_amount AS comeAllMoney, + tmps.pack as pack, + tmps.charge_use as chargeUse + FROM tb_member_project tmp inner join tb_certificate_payment tmps on(tmp.id=tmps.project_id) + + tmp.director_id = #{principalPeopleDetailSearch.principalNameId} + + AND tmp.project_name LIKE + concat('%',concat(#{principalPeopleDetailSearch.projectName},'%')) + + + AND tmps.charge_use=#{principalPeopleDetailSearch.chargeUse} + + + AND tmps.in_account=#{principalPeopleDetailSearch.inAccountStatue} + + + + AND tmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and tmps.amount_receivable = + #{principalPeopleDetailSearch.allMoneyTwo} + + + + AND tmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney} + + + AND tmps.amount_receivable = #{principalPeopleDetailSearch.allMoneyTwo} + + + + ) pp inner join @@ -1605,6 +1814,14 @@ WHERE ppr.payment_date like concat('%',#{principalPeopleDetailSearch.year},'%') + group by tmps.id + union all + SELECT + tmps.id as id ,max(ppr.payment_date) as payment_date from tb_certificate_payment tmps inner join pay_payment_record ppr on (tmps.id=ppr.project_id) + + WHERE ppr.payment_date like + concat('%',#{principalPeopleDetailSearch.year},'%') + group by tmps.id ) pprr on(pp.id=pprr.id) order by pprr.payment_date desc @@ -1958,6 +2175,39 @@ AND ppp.company_id=#{companyComeMoneySearch.chargeCompanyId} + union all + SELECT + company_id as chargeCompanyTemporaryId, + company_name as chargeCompanyTemporaryName, + allMoney, + comeAllMoney, + createTime, + payment_date + 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 + 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 + left join tb_member_project tmp on(tmp.id=tpms.project_id) + + + tmp.director_id in + + #{item} + + + + + group by tpms.company_id) ppp + + + AND ppp.company_id=#{companyComeMoneySearch.chargeCompanyId} + + ) pp group by pp.chargeCompanyTemporaryId order by pp.payment_date desc) ppp @@ -2294,6 +2544,52 @@ + union all + SELECT + tmps.create_time as createTime, + tmps.id AS projectId, + tmp.project_name AS projectName, + tmps.amount_receivable as allMoney, + tmps.paid_amount as comeAllMoney, + tmps.charge_use as chargeUse, + tmps.pack + FROM tb_member_project tmp left join tb_certificate_payment tmps on(tmp.id=tmps.project_id) + + tmps.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId} + + and tmp.director_id in + + #{item} + + + + AND tmp.project_name LIKE + concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) + + + + AND tmps.in_account =#{CompanyComeMoneyDetailSearch.inAccountStatue} + + + + AND tmps.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse} + + + + + AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and tmps.amount_receivable = + #{CompanyComeMoneyDetailSearch.allMoneyTwo} + + + + AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} + + + AND tmps.amount_receivable = #{CompanyComeMoneyDetailSearch.allMoneyTwo} + + + + ) pp inner join (select pwgs.id as id,max(ppr.payment_date) as payment_date @@ -2333,6 +2629,13 @@ WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%') group by tmps.id + union all + SELECT + tmps.id,max(ppr.payment_date) as payment_date from tb_certificate_payment tmps inner join pay_payment_record ppr on(tmps.id=ppr.project_id) + + WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%') + + group by tmps.id ) pprr on(pp.projectId=pprr.id) order by pprr.payment_date desc diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java index 9a4982f7..7e616547 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.DictPoint; import com.jero.common.exception.JeroBootException; import com.jero.common.service.ProjectDetailService; import com.jero.common.system.api.ISysBaseAPI; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java index 2da9df76..0d4474af 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java @@ -1,5 +1,6 @@ package com.jero.statistics.entity; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel;