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

fix:统计变更

Browse Source
This commit is contained in:
syxy
2022-06-01 11:58:30 +08:00
parent bc2dd3aca3
commit 3d75aee533
2 changed files with 100 additions and 100 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
+94 -94
View File
@@ -160,7 +160,7 @@
and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%'))
</if>
<if test="payWorkingGroupSearch.year != null and payWorkingGroupSearch.year != ''">
AND pwgs.createTime LIKE
AND pwg.year LIKE
concat(#{payWorkingGroupSearch.year},'%')
</if>
<choose>
@@ -177,7 +177,7 @@
</if>
</otherwise>
</choose>
</where>) ppp
</where>) ppp where ppp.allMoney is not null and ppp.allMoney !=0
</select>
<!-- 工作组统计总金额-->
<select id="queryPageListForStatistics33" resultType="com.jero.statistics.entity.AllMoney">
@@ -216,7 +216,7 @@
and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%'))
</if>
<if test="payWorkingGroupSearch.year != null and payWorkingGroupSearch.year != ''">
AND pwgs.createTime LIKE
AND pwg.year LIKE
concat(#{payWorkingGroupSearch.year},'%')
</if>
<choose>
@@ -233,7 +233,7 @@
</if>
</otherwise>
</choose>
</where>) ppp
</where>) ppp where ppp.allMoney is not null and ppp.allMoney !=0
</select>
<!-- 工作组统计ids-->
@@ -273,7 +273,7 @@
and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%'))
</if>
<if test="payWorkingGroupSearch.year != null and payWorkingGroupSearch.year != ''">
AND pwgs.createTime LIKE
AND pwg.year LIKE
concat(#{payWorkingGroupSearch.year},'%')
</if>
<choose>
@@ -291,7 +291,7 @@
</otherwise>
</choose>
</where>) ppp
</where>) ppp where ppp.allMoney is not null and ppp.allMoney !=0
</select>
<!--工作组前十-->
<select id="queryPageListForStatisticsFirstPage" resultType="com.jero.project.entity.PayWorkingGroupStatistics">
@@ -351,7 +351,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pwgs.create_time LIKE
AND pwg.year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -415,7 +415,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pcp.create_time LIKE
AND pcp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -480,7 +480,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pmps.create_time LIKE
AND pmp.particular_year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -544,7 +544,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pms.create_time LIKE
AND pm.particular_year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -608,7 +608,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -672,7 +672,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND tcp.create_time LIKE
AND tmp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -709,7 +709,7 @@
</if>
</otherwise>
</choose>
</where>) pp
</where>) pp where pp.allMoney is not null and pp.allMoney !=0
<!-- pp left join-->
<!-- (-->
<!-- select pwgs.id as id,max(ppr.payment_date) as payment_date-->
@@ -787,7 +787,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pwgs.create_time LIKE
AND pwg.year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -846,7 +846,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pcp.create_time LIKE
AND pcp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -906,7 +906,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pmps.create_time LIKE
AND pmp.particular_year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -965,7 +965,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pms.create_time LIKE
AND pm.particular_year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1024,7 +1024,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1083,7 +1083,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND tcp.create_time LIKE
AND tmp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1120,7 +1120,7 @@
</if>
</otherwise>
</choose>
</where>) pp
</where>) pp where pp.allMoney is not null and pp.allMoney !=0
<!-- pp left join-->
<!-- (-->
<!-- select pwgs.id as id,max(ppr.payment_date) as payment_date-->
@@ -1204,7 +1204,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pwgs.create_time LIKE
AND pwg.year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1269,7 +1269,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pcp.create_time LIKE
AND pcp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1335,7 +1335,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pmps.create_time LIKE
AND pmp.particular_year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1400,7 +1400,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pms.create_time LIKE
AND pm.particular_year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1464,7 +1464,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1529,7 +1529,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND tcp.create_time LIKE
AND tmp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%')
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1566,7 +1566,7 @@
</if>
</otherwise>
</choose>
</where>) pp
</where>) pp where pp.allMoney is not null and pp.allMoney !=0
<!-- left join-->
<!-- (-->
<!-- select pwgs.id as id,max(ppr.payment_date) as payment_date-->
@@ -1789,7 +1789,7 @@
AND pwg.principal_id_a=#{principalPeopleSearch.principalId}
</if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND pwgs.create_time LIKE
AND pwg.year LIKE
concat(#{principalPeopleSearch.year},'%')
</if>
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
@@ -1805,7 +1805,7 @@
sum(pcp1.paid_amount) as comeAllMoney,
pcp1.create_time as createTime
FROM
(select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time from
(select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time,pcp.year from
pay_common_project pcp
<!-- left join pay_payment_record ppr on(pcp.id=ppr.project_id)-->
<!-- <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
@@ -1826,7 +1826,7 @@
AND su.org_code =#{principalPeopleSearch.departCode}
</if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND pcp1.create_time LIKE
AND pcp1.year LIKE
concat(#{principalPeopleSearch.year},'%')
</if>
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
@@ -1860,7 +1860,7 @@
</foreach>
</if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND pmps.create_time LIKE
AND pmp.particular_year LIKE
concat(#{principalPeopleSearch.year},'%')
</if>
@@ -1902,7 +1902,7 @@
AND su.org_code =#{principalPeopleSearch.departCode}
</if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND pms.create_time LIKE
AND pm.particular_year LIKE
concat(#{principalPeopleSearch.year},'%')
</if>
@@ -1937,7 +1937,7 @@
</foreach>
</if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{principalPeopleSearch.year},'%')
</if>
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
@@ -1979,14 +1979,14 @@
AND su.org_code =#{principalPeopleSearch.departCode}
</if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{principalPeopleSearch.year},'%')
</if>
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
AND tmp.director_id=#{principalPeopleSearch.principalId}
</if>
</where> group by tmp.director_id
) pp
) pp where pp.allMoney is not null and pp.allMoney !=0
group by pp.principalId order by pp.createTime) ppp
<where>
<choose>
@@ -2046,7 +2046,7 @@
AND pwg.principal_id_a=#{principalPeopleSearch.principalId}
</if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND pwgs.create_time LIKE
AND pwg.year LIKE
concat(#{principalPeopleSearch.year},'%')
</if>
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
@@ -2062,7 +2062,7 @@
sum(pcp1.paid_amount) as comeAllMoney,
pcp1.create_time as createTime
FROM
(select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time from
(select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time,pcp.year from
pay_common_project pcp
<!-- left join pay_payment_record ppr on(pcp.id=ppr.project_id)-->
<!-- <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
@@ -2083,7 +2083,7 @@
AND su.org_code =#{principalPeopleSearch.departCode}
</if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND pcp1.create_time LIKE
AND pcp1.year LIKE
concat(#{principalPeopleSearch.year},'%')
</if>
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
@@ -2117,7 +2117,7 @@
</foreach>
</if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND pmps.create_time LIKE
AND pmp.particular_year LIKE
concat(#{principalPeopleSearch.year},'%')
</if>
@@ -2159,7 +2159,7 @@
AND su.org_code =#{principalPeopleSearch.departCode}
</if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND pms.create_time LIKE
AND pm.particular_year LIKE
concat(#{principalPeopleSearch.year},'%')
</if>
@@ -2194,7 +2194,7 @@
</foreach>
</if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{principalPeopleSearch.year},'%')
</if>
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
@@ -2236,14 +2236,14 @@
AND su.org_code =#{principalPeopleSearch.departCode}
</if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{principalPeopleSearch.year},'%')
</if>
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
AND tmp.director_id=#{principalPeopleSearch.principalId}
</if>
</where> group by tmp.director_id
) pp
) pp where pp.allMoney is not null and pp.allMoney !=0
group by pp.principalId order by pp.createTime) ppp
<where>
<choose>
@@ -2403,7 +2403,7 @@
AND pwgs.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pwgs.create_time LIKE
AND pwg.year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2446,7 +2446,7 @@
AND pcp.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pcp.create_time LIKE
AND pcp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2489,7 +2489,7 @@
AND pms.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pms.create_time LIKE
AND pm.particular_year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2532,7 +2532,7 @@
AND pmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pmps.create_time LIKE
AND pmp.particular_year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2575,7 +2575,7 @@
AND tmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2615,7 +2615,7 @@
concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
@@ -2639,7 +2639,7 @@
</otherwise>
</choose>
</where>
) pp
) pp where pp.allMoney is not null and pp.allMoney !=0
<!-- left join-->
<!-- &lt;!&ndash; 判断来款项目的来款年份&ndash;&gt;-->
<!-- (select pwgs.id as id,max(ppr.payment_date) as payment_date-->
@@ -2719,7 +2719,7 @@
AND pwgs.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pwgs.create_time LIKE
AND pwg.year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2762,7 +2762,7 @@
AND pcp.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pcp.create_time LIKE
AND pcp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2805,7 +2805,7 @@
AND pms.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pms.create_time LIKE
AND pm.particular_year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2848,7 +2848,7 @@
AND pmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pmps.create_time LIKE
AND pmp.particular_year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2891,7 +2891,7 @@
AND tmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2931,7 +2931,7 @@
concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
@@ -2955,7 +2955,7 @@
</otherwise>
</choose>
</where>
) pp
) pp where pp.allMoney is not null and pp.allMoney !=0
<!-- left join-->
<!-- &lt;!&ndash; 判断来款项目的来款年份&ndash;&gt;-->
<!-- (select pwgs.id as id,max(ppr.payment_date) as payment_date-->
@@ -3030,7 +3030,7 @@
concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pwgs.create_time LIKE
AND pwg.year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
@@ -3074,7 +3074,7 @@
AND pcp.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pcp.create_time LIKE
AND pcp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -3115,7 +3115,7 @@
AND pms.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pms.create_time LIKE
AND pm.particular_year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -3156,7 +3156,7 @@
AND pmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pmps.create_time LIKE
AND pmp.particular_year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -3199,7 +3199,7 @@
AND tmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -3239,7 +3239,7 @@
concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
</if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%')
</if>
<if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
@@ -3323,7 +3323,7 @@
ON (pwg.id=pwgs2.working_group_id)
<where>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND pwgs2.create_time LIKE
AND pwg.year LIKE
concat(#{companyComeMoneySearch.year},'%')
</if>
<if test="idList != null and idList != ''">
@@ -3350,7 +3350,7 @@
sum(pcp1.paid_amount) as comeAllMoney,
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 from
(select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time,pcp.charge_company_id,pcp.year from
pay_common_project pcp
<!-- left join pay_payment_record ppr on(pcp.id=ppr.project_id)-->
<!-- <if test="companyComeMoneySearch.year !='' and companyComeMoneySearch.year !=null">-->
@@ -3367,7 +3367,7 @@
</foreach>
</if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND pcp1.create_time LIKE
AND pcp1.year LIKE
concat(#{companyComeMoneySearch.year},'%')
</if>
<if test="companyComeMoneySearch.chargeCompanyId != null and companyComeMoneySearch.chargeCompanyId != ''">
@@ -3399,7 +3399,7 @@
</foreach>
</if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND pmp1s.create_time LIKE
AND pmp.particular_year LIKE
concat(#{companyComeMoneySearch.year},'%')
</if>
</where>
@@ -3436,7 +3436,7 @@
</foreach>
</if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND pms.create_time LIKE
AND pm.particular_year LIKE
concat(#{companyComeMoneySearch.year},'%')
</if>
</where> group by pms.company_id) pmss
@@ -3473,7 +3473,7 @@
</if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND tpms.create_time LIKE
AND tmp.year LIKE
concat(#{companyComeMoneySearch.year},'%')
</if>
</where>
@@ -3511,7 +3511,7 @@
</if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND tpms.create_time LIKE
AND tmp.year LIKE
concat(#{companyComeMoneySearch.year},'%')
</if>
</where>
@@ -3522,7 +3522,7 @@
AND ppp.company_id=#{companyComeMoneySearch.chargeCompanyId}
</if>
</where>
) pp
) pp where pp.allMoney is not null and pp.allMoney !=0
group by pp.chargeCompanyTemporaryId ) ppp
<where>
<choose>
@@ -3568,7 +3568,7 @@
ON (pwg.id=pwgs2.working_group_id)
<where>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND pwgs2.create_time LIKE
AND pwg.year LIKE
concat(#{companyComeMoneySearch.year},'%')
</if>
<if test="idList != null and idList != ''">
@@ -3595,7 +3595,7 @@
sum(pcp1.paid_amount) as comeAllMoney,
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 from
(select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time,pcp.charge_company_id,pcp.year from
pay_common_project pcp
<!-- left join pay_payment_record ppr on(pcp.id=ppr.project_id)-->
<!-- <if test="companyComeMoneySearch.year !='' and companyComeMoneySearch.year !=null">-->
@@ -3612,7 +3612,7 @@
</foreach>
</if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND pcp1.create_time LIKE
AND pcp1.year LIKE
concat(#{companyComeMoneySearch.year},'%')
</if>
<if test="companyComeMoneySearch.chargeCompanyId != null and companyComeMoneySearch.chargeCompanyId != ''">
@@ -3644,7 +3644,7 @@
</foreach>
</if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND pmp1s.create_time LIKE
AND pmp.particular_year LIKE
concat(#{companyComeMoneySearch.year},'%')
</if>
</where>
@@ -3681,7 +3681,7 @@
</foreach>
</if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND pms.create_time LIKE
AND pm.particular_year LIKE
concat(#{companyComeMoneySearch.year},'%')
</if>
</where> group by pms.company_id) pmss
@@ -3718,7 +3718,7 @@
</if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND tpms.create_time LIKE
AND tmp.year LIKE
concat(#{companyComeMoneySearch.year},'%')
</if>
</where>
@@ -3756,7 +3756,7 @@
</if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND tpms.create_time LIKE
AND tmp.year LIKE
concat(#{companyComeMoneySearch.year},'%')
</if>
</where>
@@ -3767,7 +3767,7 @@
AND ppp.company_id=#{companyComeMoneySearch.chargeCompanyId}
</if>
</where>
) pp
) pp where pp.allMoney is not null and pp.allMoney !=0
group by pp.chargeCompanyTemporaryId ) ppp
<where>
<choose>
@@ -3920,7 +3920,7 @@
</foreach>
</if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND pwgs.create_time LIKE
AND pwg.year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
@@ -3967,7 +3967,7 @@
</foreach>
</if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND pcp.create_time LIKE
AND pcp.year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
@@ -4014,7 +4014,7 @@
</foreach>
</if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND pms.create_time LIKE
AND pm.particular_year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
@@ -4061,7 +4061,7 @@
</foreach>
</if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND pmps.create_time LIKE
AND pmp.particular_year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
@@ -4112,7 +4112,7 @@
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
</if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if>
<if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
@@ -4165,7 +4165,7 @@
AND tmps.in_account =#{CompanyComeMoneyDetailSearch.inAccountStatue}
</if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if>
@@ -4188,7 +4188,7 @@
</otherwise>
</choose>
</where>
) pp
) pp where pp.allMoney is not null and pp.allMoney !=0
<!-- left join-->
<!-- (select pwgs.id as id,max(ppr.payment_date) as payment_date-->
<!-- from pay_working_group_subitem pwgs-->
@@ -4258,7 +4258,7 @@
</foreach>
</if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND pwgs.create_time LIKE
AND pwg.year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
@@ -4299,13 +4299,13 @@
<where>
pcp.charge_company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
<if test="idList != null and idList != ''">
and PCP.principal_id in
and pcp.principal_id in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
</if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND pcp.create_time LIKE
AND pcp.year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
@@ -4352,7 +4352,7 @@
</foreach>
</if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND pms.create_time LIKE
AND pm.particular_year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
@@ -4399,7 +4399,7 @@
</foreach>
</if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND pmps.create_time LIKE
AND pmp.particular_year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
@@ -4450,7 +4450,7 @@
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
</if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if>
<if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
@@ -4503,7 +4503,7 @@
AND tmps.in_account =#{CompanyComeMoneyDetailSearch.inAccountStatue}
</if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND tmps.create_time LIKE
AND tmp.year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if>
@@ -4526,7 +4526,7 @@
</otherwise>
</choose>
</where>
) pp
) pp where pp.allMoney is not null and pp.allMoney !=0
<!-- left join-->
<!-- (select pwgs.id as id,max(ppr.payment_date) as payment_date-->
<!-- from pay_working_group_subitem pwgs-->
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+6 -6
View File
@@ -86,7 +86,7 @@
concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%'))
</if>
<if test="payWorkingGroupSubletSearch.year != null and payWorkingGroupSubletSearch.year != ''">
AND pwgs.create_time LIKE
AND pwg.year LIKE
concat(#{payWorkingGroupSubletSearch.year},'%')
</if>
<if test="payWorkingGroupSubletSearch.chargeUse != null and payWorkingGroupSubletSearch.chargeUse != ''">
@@ -116,7 +116,7 @@
</otherwise>
</choose>
</where>
group by pwgs.id) pwg1 order by pwg1.create_time desc
group by pwgs.id) pwg1 where pwg1.allMoney is not null and pwg1.allMoney !=0 order by pwg1.create_time desc
<!-- inner join-->
<!-- (select pwgs.id as id,working_group_id,max(ppr.payment_date) as payment_date-->
<!-- from pay_working_group_subitem pwgs-->
@@ -149,7 +149,7 @@
concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%'))
</if>
<if test="payWorkingGroupSubletSearch.year != null and payWorkingGroupSubletSearch.year != ''">
AND pwgs.create_time LIKE
AND pwg.year LIKE
concat(#{payWorkingGroupSubletSearch.year},'%')
</if>
<if test="payWorkingGroupSubletSearch.chargeUse != null and payWorkingGroupSubletSearch.chargeUse != ''">
@@ -179,7 +179,7 @@
</otherwise>
</choose>
</where>
group by pwgs.id) pwg1 order by pwg1.create_time desc
group by pwgs.id) pwg1 where pwg1.allMoney is not null and pwg1.allMoney !=0 order by pwg1.create_time desc
<!-- inner join-->
<!-- (select pwgs.id as id,working_group_id,max(ppr.payment_date) as payment_date-->
<!-- from pay_working_group_subitem pwgs-->
@@ -215,7 +215,7 @@
concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%'))
</if>
<if test="payWorkingGroupSubletSearch.year != null and payWorkingGroupSubletSearch.year != ''">
AND pwgs.create_time LIKE
AND pwg.year LIKE
concat(#{payWorkingGroupSubletSearch.year},'%')
</if>
<if test="payWorkingGroupSubletSearch.chargeUse != null and payWorkingGroupSubletSearch.chargeUse != ''">
@@ -245,7 +245,7 @@
</otherwise>
</choose>
</where>
group by pwgs.id) pwg1 order by pwg1.create_time desc
group by pwgs.id) pwg1 where pwg1.allMoney is not null and pwg1.allMoney !=0 order by pwg1.create_time desc
<!-- inner join-->
<!-- (select pwgs.id as id,working_group_id,max(ppr.payment_date) as payment_date-->
<!-- from pay_working_group_subitem pwgs-->