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

Merge remote-tracking branch 'origin/work_group_update'

Browse Source
This commit is contained in:
lijiarao
2022-06-01 16:19:01 +08:00
parent d6756e5a27 aabcbfdc68
commit 42457fa476
6 changed files with 145 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
+1 -1
View File
@@ -189,7 +189,7 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
List<PrincipalPeopleDetail> queryPageListForPrincipalDetailTwo(@Param("principalPeopleDetailSearch") PrincipalPeopleDetailSearch principalPeopleDetailSearch,@Param("ids") ArrayList<String> ids); List<PrincipalPeopleDetail> queryPageListForPrincipalDetailTwo(@Param("principalPeopleDetailSearch") PrincipalPeopleDetailSearch principalPeopleDetailSearch,@Param("ids") ArrayList<String> ids);
AllMoney queryPageList33(@Param("allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch); AllMoney queryPageList33(@Param("allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List<String> idList);
AllMoney queryPageListForCompany33(@Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch, @Param("idList") List<String> idList); AllMoney queryPageListForCompany33(@Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch, @Param("idList") List<String> idList);
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+130 -100
View File
@@ -160,7 +160,7 @@
and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%')) and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%'))
</if> </if>
<if test="payWorkingGroupSearch.year != null and payWorkingGroupSearch.year != ''"> <if test="payWorkingGroupSearch.year != null and payWorkingGroupSearch.year != ''">
AND pwgs.createTime LIKE AND pwg.year LIKE
concat(#{payWorkingGroupSearch.year},'%') concat(#{payWorkingGroupSearch.year},'%')
</if> </if>
<choose> <choose>
@@ -177,7 +177,7 @@
</if> </if>
</otherwise> </otherwise>
</choose> </choose>
</where>) ppp </where>) ppp where ppp.allMoney is not null and ppp.allMoney !=0
</select> </select>
<!-- 工作组统计总金额--> <!-- 工作组统计总金额-->
<select id="queryPageListForStatistics33" resultType="com.jero.statistics.entity.AllMoney"> <select id="queryPageListForStatistics33" resultType="com.jero.statistics.entity.AllMoney">
@@ -216,7 +216,7 @@
and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%')) and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%'))
</if> </if>
<if test="payWorkingGroupSearch.year != null and payWorkingGroupSearch.year != ''"> <if test="payWorkingGroupSearch.year != null and payWorkingGroupSearch.year != ''">
AND pwgs.createTime LIKE AND pwg.year LIKE
concat(#{payWorkingGroupSearch.year},'%') concat(#{payWorkingGroupSearch.year},'%')
</if> </if>
<choose> <choose>
@@ -233,7 +233,7 @@
</if> </if>
</otherwise> </otherwise>
</choose> </choose>
</where>) ppp </where>) ppp where ppp.allMoney is not null and ppp.allMoney !=0
</select> </select>
<!-- 工作组统计ids--> <!-- 工作组统计ids-->
@@ -273,7 +273,7 @@
and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%')) and pwg.working_group_project LIKE concat('%',concat(#{payWorkingGroupSearch.workGroup},'%'))
</if> </if>
<if test="payWorkingGroupSearch.year != null and payWorkingGroupSearch.year != ''"> <if test="payWorkingGroupSearch.year != null and payWorkingGroupSearch.year != ''">
AND pwgs.createTime LIKE AND pwg.year LIKE
concat(#{payWorkingGroupSearch.year},'%') concat(#{payWorkingGroupSearch.year},'%')
</if> </if>
<choose> <choose>
@@ -291,7 +291,7 @@
</otherwise> </otherwise>
</choose> </choose>
</where>) ppp </where>) ppp where ppp.allMoney is not null and ppp.allMoney !=0
</select> </select>
<!--工作组前十--> <!--工作组前十-->
<select id="queryPageListForStatisticsFirstPage" resultType="com.jero.project.entity.PayWorkingGroupStatistics"> <select id="queryPageListForStatisticsFirstPage" resultType="com.jero.project.entity.PayWorkingGroupStatistics">
@@ -351,7 +351,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pwgs.create_time LIKE AND pwg.year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -415,7 +415,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pcp.create_time LIKE AND pcp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -480,7 +480,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pmps.create_time LIKE AND pmp.particular_year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -544,7 +544,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pms.create_time LIKE AND pm.particular_year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -608,7 +608,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND tmps.create_time LIKE AND tmp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -672,7 +672,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND tcp.create_time LIKE AND tmp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -709,7 +709,7 @@
</if> </if>
</otherwise> </otherwise>
</choose> </choose>
</where>) pp </where>) pp where pp.allMoney is not null and pp.allMoney !=0
<!-- pp left join--> <!-- pp left join-->
<!-- (--> <!-- (-->
<!-- select pwgs.id as id,max(ppr.payment_date) as payment_date--> <!-- select pwgs.id as id,max(ppr.payment_date) as payment_date-->
@@ -781,13 +781,18 @@
FROM pay_working_group pwg right join pay_working_group_subitem pwgs on(pwg.id=pwgs.working_group_id) FROM pay_working_group pwg right join pay_working_group_subitem pwgs on(pwg.id=pwgs.working_group_id)
left JOIN sys_user su on(pwg.principal_id_a=su.id) left join sys_depart sd on(su.org_code=sd.org_code) left JOIN sys_user su on(pwg.principal_id_a=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
<where> <where>
<if test="idList != null and idList != ''">
pwg.principal_id_a in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''"> <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pwg.working_group_project LIKE AND pwg.working_group_project LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pwgs.create_time LIKE AND pwg.year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -840,13 +845,18 @@
FROM pay_common_project pcp left JOIN sys_user su on(pcp.principal_id=su.id) left join sys_depart sd FROM pay_common_project pcp left JOIN sys_user su on(pcp.principal_id=su.id) left join sys_depart sd
on(su.org_code=sd.org_code) on(su.org_code=sd.org_code)
<where> <where>
<if test="idList != null and idList != ''">
pcp.principal_id in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''"> <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pcp.charge_project LIKE AND pcp.charge_project LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pcp.create_time LIKE AND pcp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -900,13 +910,18 @@
FROM pay_member_project pmp right join pay_member_project_subitem pmps on(pmp.id=pmps.project_id) FROM pay_member_project pmp right join pay_member_project_subitem pmps on(pmp.id=pmps.project_id)
left JOIN sys_user su on(pmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) left JOIN sys_user su on(pmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
<where> <where>
<if test="idList != null and idList != ''">
pmp.director_id in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''"> <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pmp.project_name LIKE AND pmp.project_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pmps.create_time LIKE AND pmp.particular_year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -959,13 +974,18 @@
FROM pay_meeting pm right join pay_meeting_situation pms on(pm.id=pms.meeting_id) FROM pay_meeting pm right join pay_meeting_situation 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) left JOIN sys_user su on(pm.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
<where> <where>
<if test="idList != null and idList != ''">
pm.director_id in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''"> <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pm.meeting_name LIKE AND pm.meeting_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pms.create_time LIKE AND pm.particular_year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1018,13 +1038,18 @@
FROM tb_member_project tmp left join tb_member_project_subitem tmps on(tmp.id=tmps.project_id) FROM tb_member_project tmp left join tb_member_project_subitem 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) left JOIN sys_user su on(tmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
<where> <where>
<if test="idList != null and idList != ''">
tmp.director_id in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''"> <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND tmp.project_name LIKE AND tmp.project_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND tmps.create_time LIKE AND tmp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1077,13 +1102,18 @@
FROM tb_member_project tmp left join tb_certificate_payment tcp on(tmp.id=tcp.project_id) 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) left JOIN sys_user su on(tmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
<where> <where>
<if test="idList != null and idList != ''">
tmp.director_id in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''"> <if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND tmp.project_name LIKE AND tmp.project_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND tcp.create_time LIKE AND tmp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1120,7 +1150,7 @@
</if> </if>
</otherwise> </otherwise>
</choose> </choose>
</where>) pp </where>) pp where pp.allMoney is not null and pp.allMoney !=0
<!-- pp left join--> <!-- pp left join-->
<!-- (--> <!-- (-->
<!-- select pwgs.id as id,max(ppr.payment_date) as payment_date--> <!-- select pwgs.id as id,max(ppr.payment_date) as payment_date-->
@@ -1204,7 +1234,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pwgs.create_time LIKE AND pwg.year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1269,7 +1299,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pcp.create_time LIKE AND pcp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1335,7 +1365,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pmps.create_time LIKE AND pmp.particular_year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1400,7 +1430,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND pms.create_time LIKE AND pm.particular_year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1464,7 +1494,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND tmps.create_time LIKE AND tmp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1529,7 +1559,7 @@
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if> </if>
<if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''"> <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
AND tcp.create_time LIKE AND tmp.year LIKE
concat(#{allProjectStatisticsSearch.year},'%') concat(#{allProjectStatisticsSearch.year},'%')
</if> </if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''"> <if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
@@ -1566,7 +1596,7 @@
</if> </if>
</otherwise> </otherwise>
</choose> </choose>
</where>) pp </where>) pp where pp.allMoney is not null and pp.allMoney !=0
<!-- left join--> <!-- left join-->
<!-- (--> <!-- (-->
<!-- select pwgs.id as id,max(ppr.payment_date) as payment_date--> <!-- select pwgs.id as id,max(ppr.payment_date) as payment_date-->
@@ -1789,7 +1819,7 @@
AND pwg.principal_id_a=#{principalPeopleSearch.principalId} AND pwg.principal_id_a=#{principalPeopleSearch.principalId}
</if> </if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''"> <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND pwgs.create_time LIKE AND pwg.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 != ''">
@@ -1805,7 +1835,7 @@
sum(pcp1.paid_amount) as comeAllMoney, sum(pcp1.paid_amount) as comeAllMoney,
pcp1.create_time as createTime pcp1.create_time as createTime
FROM 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 pay_common_project pcp
<!-- left join pay_payment_record ppr on(pcp.id=ppr.project_id)--> <!-- left join pay_payment_record ppr on(pcp.id=ppr.project_id)-->
<!-- <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">--> <!-- <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
@@ -1826,7 +1856,7 @@
AND su.org_code =#{principalPeopleSearch.departCode} AND su.org_code =#{principalPeopleSearch.departCode}
</if> </if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''"> <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND pcp1.create_time LIKE AND pcp1.year LIKE
concat(#{principalPeopleSearch.year},'%') concat(#{principalPeopleSearch.year},'%')
</if> </if>
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''"> <if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
@@ -1860,7 +1890,7 @@
</foreach> </foreach>
</if> </if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''"> <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND pmps.create_time LIKE AND pmp.particular_year LIKE
concat(#{principalPeopleSearch.year},'%') concat(#{principalPeopleSearch.year},'%')
</if> </if>
@@ -1902,7 +1932,7 @@
AND su.org_code =#{principalPeopleSearch.departCode} AND su.org_code =#{principalPeopleSearch.departCode}
</if> </if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''"> <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND pms.create_time LIKE AND pm.particular_year LIKE
concat(#{principalPeopleSearch.year},'%') concat(#{principalPeopleSearch.year},'%')
</if> </if>
@@ -1937,7 +1967,7 @@
</foreach> </foreach>
</if> </if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''"> <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND tmps.create_time LIKE AND tmp.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 != ''">
@@ -1979,14 +2009,14 @@
AND su.org_code =#{principalPeopleSearch.departCode} AND su.org_code =#{principalPeopleSearch.departCode}
</if> </if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''"> <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND tmps.create_time LIKE AND tmp.year LIKE
concat(#{principalPeopleSearch.year},'%') concat(#{principalPeopleSearch.year},'%')
</if> </if>
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''"> <if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
AND tmp.director_id=#{principalPeopleSearch.principalId} AND tmp.director_id=#{principalPeopleSearch.principalId}
</if> </if>
</where> group by tmp.director_id </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 group by pp.principalId order by pp.createTime) ppp
<where> <where>
<choose> <choose>
@@ -2046,7 +2076,7 @@
AND pwg.principal_id_a=#{principalPeopleSearch.principalId} AND pwg.principal_id_a=#{principalPeopleSearch.principalId}
</if> </if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''"> <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND pwgs.create_time LIKE AND pwg.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 != ''">
@@ -2062,7 +2092,7 @@
sum(pcp1.paid_amount) as comeAllMoney, sum(pcp1.paid_amount) as comeAllMoney,
pcp1.create_time as createTime pcp1.create_time as createTime
FROM 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 pay_common_project pcp
<!-- left join pay_payment_record ppr on(pcp.id=ppr.project_id)--> <!-- left join pay_payment_record ppr on(pcp.id=ppr.project_id)-->
<!-- <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">--> <!-- <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
@@ -2083,7 +2113,7 @@
AND su.org_code =#{principalPeopleSearch.departCode} AND su.org_code =#{principalPeopleSearch.departCode}
</if> </if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''"> <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND pcp1.create_time LIKE AND pcp1.year LIKE
concat(#{principalPeopleSearch.year},'%') concat(#{principalPeopleSearch.year},'%')
</if> </if>
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''"> <if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
@@ -2117,7 +2147,7 @@
</foreach> </foreach>
</if> </if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''"> <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND pmps.create_time LIKE AND pmp.particular_year LIKE
concat(#{principalPeopleSearch.year},'%') concat(#{principalPeopleSearch.year},'%')
</if> </if>
@@ -2159,7 +2189,7 @@
AND su.org_code =#{principalPeopleSearch.departCode} AND su.org_code =#{principalPeopleSearch.departCode}
</if> </if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''"> <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND pms.create_time LIKE AND pm.particular_year LIKE
concat(#{principalPeopleSearch.year},'%') concat(#{principalPeopleSearch.year},'%')
</if> </if>
@@ -2194,7 +2224,7 @@
</foreach> </foreach>
</if> </if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''"> <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND tmps.create_time LIKE AND tmp.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 != ''">
@@ -2236,14 +2266,14 @@
AND su.org_code =#{principalPeopleSearch.departCode} AND su.org_code =#{principalPeopleSearch.departCode}
</if> </if>
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''"> <if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
AND tmps.create_time LIKE AND tmp.year LIKE
concat(#{principalPeopleSearch.year},'%') concat(#{principalPeopleSearch.year},'%')
</if> </if>
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''"> <if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
AND tmp.director_id=#{principalPeopleSearch.principalId} AND tmp.director_id=#{principalPeopleSearch.principalId}
</if> </if>
</where> group by tmp.director_id </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 group by pp.principalId order by pp.createTime) ppp
<where> <where>
<choose> <choose>
@@ -2403,7 +2433,7 @@
AND pwgs.charge_use=#{principalPeopleDetailSearch.chargeUse} AND pwgs.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pwgs.create_time LIKE AND pwg.year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''"> <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2446,7 +2476,7 @@
AND pcp.charge_use=#{principalPeopleDetailSearch.chargeUse} AND pcp.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pcp.create_time LIKE AND pcp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''"> <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2489,7 +2519,7 @@
AND pms.charge_use=#{principalPeopleDetailSearch.chargeUse} AND pms.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pms.create_time LIKE AND pm.particular_year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''"> <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2532,7 +2562,7 @@
AND pmps.charge_use=#{principalPeopleDetailSearch.chargeUse} AND pmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pmps.create_time LIKE AND pmp.particular_year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''"> <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2575,7 +2605,7 @@
AND tmps.charge_use=#{principalPeopleDetailSearch.chargeUse} AND tmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND tmps.create_time LIKE AND tmp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''"> <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2615,7 +2645,7 @@
concat('%',concat(#{principalPeopleDetailSearch.projectName},'%')) concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND tmps.create_time LIKE AND tmp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''"> <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
@@ -2639,7 +2669,7 @@
</otherwise> </otherwise>
</choose> </choose>
</where> </where>
) pp ) pp where pp.allMoney is not null and pp.allMoney !=0
<!-- left join--> <!-- left join-->
<!-- &lt;!&ndash; 判断来款项目的来款年份&ndash;&gt;--> <!-- &lt;!&ndash; 判断来款项目的来款年份&ndash;&gt;-->
<!-- (select pwgs.id as id,max(ppr.payment_date) as payment_date--> <!-- (select pwgs.id as id,max(ppr.payment_date) as payment_date-->
@@ -2719,7 +2749,7 @@
AND pwgs.charge_use=#{principalPeopleDetailSearch.chargeUse} AND pwgs.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pwgs.create_time LIKE AND pwg.year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''"> <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2762,7 +2792,7 @@
AND pcp.charge_use=#{principalPeopleDetailSearch.chargeUse} AND pcp.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pcp.create_time LIKE AND pcp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''"> <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2805,7 +2835,7 @@
AND pms.charge_use=#{principalPeopleDetailSearch.chargeUse} AND pms.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pms.create_time LIKE AND pm.particular_year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''"> <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2848,7 +2878,7 @@
AND pmps.charge_use=#{principalPeopleDetailSearch.chargeUse} AND pmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pmps.create_time LIKE AND pmp.particular_year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''"> <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2891,7 +2921,7 @@
AND tmps.charge_use=#{principalPeopleDetailSearch.chargeUse} AND tmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND tmps.create_time LIKE AND tmp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''"> <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -2931,7 +2961,7 @@
concat('%',concat(#{principalPeopleDetailSearch.projectName},'%')) concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND tmps.create_time LIKE AND tmp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''"> <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
@@ -2955,7 +2985,7 @@
</otherwise> </otherwise>
</choose> </choose>
</where> </where>
) pp ) pp where pp.allMoney is not null and pp.allMoney !=0
<!-- left join--> <!-- left join-->
<!-- &lt;!&ndash; 判断来款项目的来款年份&ndash;&gt;--> <!-- &lt;!&ndash; 判断来款项目的来款年份&ndash;&gt;-->
<!-- (select pwgs.id as id,max(ppr.payment_date) as payment_date--> <!-- (select pwgs.id as id,max(ppr.payment_date) as payment_date-->
@@ -3030,7 +3060,7 @@
concat('%',concat(#{principalPeopleDetailSearch.projectName},'%')) concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pwgs.create_time LIKE AND pwg.year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''"> <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
@@ -3074,7 +3104,7 @@
AND pcp.charge_use=#{principalPeopleDetailSearch.chargeUse} AND pcp.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pcp.create_time LIKE AND pcp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''"> <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -3115,7 +3145,7 @@
AND pms.charge_use=#{principalPeopleDetailSearch.chargeUse} AND pms.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pms.create_time LIKE AND pm.particular_year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''"> <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -3156,7 +3186,7 @@
AND pmps.charge_use=#{principalPeopleDetailSearch.chargeUse} AND pmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND pmps.create_time LIKE AND pmp.particular_year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''"> <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -3199,7 +3229,7 @@
AND tmps.charge_use=#{principalPeopleDetailSearch.chargeUse} AND tmps.charge_use=#{principalPeopleDetailSearch.chargeUse}
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND tmps.create_time LIKE AND tmp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''"> <if test="principalPeopleDetailSearch.inAccountStatue != null and principalPeopleDetailSearch.inAccountStatue != ''">
@@ -3239,7 +3269,7 @@
concat('%',concat(#{principalPeopleDetailSearch.projectName},'%')) concat('%',concat(#{principalPeopleDetailSearch.projectName},'%'))
</if> </if>
<if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''"> <if test="principalPeopleDetailSearch.year != null and principalPeopleDetailSearch.year != ''">
AND tmps.create_time LIKE AND tmp.year LIKE
concat(#{principalPeopleDetailSearch.year},'%') concat(#{principalPeopleDetailSearch.year},'%')
</if> </if>
<if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''"> <if test="principalPeopleDetailSearch.chargeUse != null and principalPeopleDetailSearch.chargeUse != ''">
@@ -3323,7 +3353,7 @@
ON (pwg.id=pwgs2.working_group_id) ON (pwg.id=pwgs2.working_group_id)
<where> <where>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''"> <if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND pwgs2.create_time LIKE AND pwg.year LIKE
concat(#{companyComeMoneySearch.year},'%') concat(#{companyComeMoneySearch.year},'%')
</if> </if>
<if test="idList != null and idList != ''"> <if test="idList != null and idList != ''">
@@ -3350,7 +3380,7 @@
sum(pcp1.paid_amount) as comeAllMoney, sum(pcp1.paid_amount) as comeAllMoney,
pcp1.create_time as createTime pcp1.create_time as createTime
FROM 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 pay_common_project pcp
<!-- left join pay_payment_record ppr on(pcp.id=ppr.project_id)--> <!-- left join pay_payment_record ppr on(pcp.id=ppr.project_id)-->
<!-- <if test="companyComeMoneySearch.year !='' and companyComeMoneySearch.year !=null">--> <!-- <if test="companyComeMoneySearch.year !='' and companyComeMoneySearch.year !=null">-->
@@ -3367,7 +3397,7 @@
</foreach> </foreach>
</if> </if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''"> <if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND pcp1.create_time LIKE AND pcp1.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 != ''">
@@ -3399,7 +3429,7 @@
</foreach> </foreach>
</if> </if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''"> <if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND pmp1s.create_time LIKE AND pmp.particular_year LIKE
concat(#{companyComeMoneySearch.year},'%') concat(#{companyComeMoneySearch.year},'%')
</if> </if>
</where> </where>
@@ -3436,7 +3466,7 @@
</foreach> </foreach>
</if> </if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''"> <if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND pms.create_time LIKE AND pm.particular_year LIKE
concat(#{companyComeMoneySearch.year},'%') concat(#{companyComeMoneySearch.year},'%')
</if> </if>
</where> group by pms.company_id) pmss </where> group by pms.company_id) pmss
@@ -3473,7 +3503,7 @@
</if> </if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''"> <if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND tpms.create_time LIKE AND tmp.year LIKE
concat(#{companyComeMoneySearch.year},'%') concat(#{companyComeMoneySearch.year},'%')
</if> </if>
</where> </where>
@@ -3511,7 +3541,7 @@
</if> </if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''"> <if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND tpms.create_time LIKE AND tmp.year LIKE
concat(#{companyComeMoneySearch.year},'%') concat(#{companyComeMoneySearch.year},'%')
</if> </if>
</where> </where>
@@ -3522,7 +3552,7 @@
AND ppp.company_id=#{companyComeMoneySearch.chargeCompanyId} AND ppp.company_id=#{companyComeMoneySearch.chargeCompanyId}
</if> </if>
</where> </where>
) pp ) pp where pp.allMoney is not null and pp.allMoney !=0
group by pp.chargeCompanyTemporaryId ) ppp group by pp.chargeCompanyTemporaryId ) ppp
<where> <where>
<choose> <choose>
@@ -3568,7 +3598,7 @@
ON (pwg.id=pwgs2.working_group_id) ON (pwg.id=pwgs2.working_group_id)
<where> <where>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''"> <if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND pwgs2.create_time LIKE AND pwg.year LIKE
concat(#{companyComeMoneySearch.year},'%') concat(#{companyComeMoneySearch.year},'%')
</if> </if>
<if test="idList != null and idList != ''"> <if test="idList != null and idList != ''">
@@ -3595,7 +3625,7 @@
sum(pcp1.paid_amount) as comeAllMoney, sum(pcp1.paid_amount) as comeAllMoney,
pcp1.create_time as createTime pcp1.create_time as createTime
FROM 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 pay_common_project pcp
<!-- left join pay_payment_record ppr on(pcp.id=ppr.project_id)--> <!-- left join pay_payment_record ppr on(pcp.id=ppr.project_id)-->
<!-- <if test="companyComeMoneySearch.year !='' and companyComeMoneySearch.year !=null">--> <!-- <if test="companyComeMoneySearch.year !='' and companyComeMoneySearch.year !=null">-->
@@ -3612,7 +3642,7 @@
</foreach> </foreach>
</if> </if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''"> <if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND pcp1.create_time LIKE AND pcp1.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 != ''">
@@ -3644,7 +3674,7 @@
</foreach> </foreach>
</if> </if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''"> <if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND pmp1s.create_time LIKE AND pmp.particular_year LIKE
concat(#{companyComeMoneySearch.year},'%') concat(#{companyComeMoneySearch.year},'%')
</if> </if>
</where> </where>
@@ -3681,7 +3711,7 @@
</foreach> </foreach>
</if> </if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''"> <if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND pms.create_time LIKE AND pm.particular_year LIKE
concat(#{companyComeMoneySearch.year},'%') concat(#{companyComeMoneySearch.year},'%')
</if> </if>
</where> group by pms.company_id) pmss </where> group by pms.company_id) pmss
@@ -3718,7 +3748,7 @@
</if> </if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''"> <if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND tpms.create_time LIKE AND tmp.year LIKE
concat(#{companyComeMoneySearch.year},'%') concat(#{companyComeMoneySearch.year},'%')
</if> </if>
</where> </where>
@@ -3756,7 +3786,7 @@
</if> </if>
<if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''"> <if test="companyComeMoneySearch.year != null and companyComeMoneySearch.year != ''">
AND tpms.create_time LIKE AND tmp.year LIKE
concat(#{companyComeMoneySearch.year},'%') concat(#{companyComeMoneySearch.year},'%')
</if> </if>
</where> </where>
@@ -3767,7 +3797,7 @@
AND ppp.company_id=#{companyComeMoneySearch.chargeCompanyId} AND ppp.company_id=#{companyComeMoneySearch.chargeCompanyId}
</if> </if>
</where> </where>
) pp ) pp where pp.allMoney is not null and pp.allMoney !=0
group by pp.chargeCompanyTemporaryId ) ppp group by pp.chargeCompanyTemporaryId ) ppp
<where> <where>
<choose> <choose>
@@ -3920,7 +3950,7 @@
</foreach> </foreach>
</if> </if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''"> <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND pwgs.create_time LIKE AND pwg.year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%') concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if> </if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''"> <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
@@ -3967,7 +3997,7 @@
</foreach> </foreach>
</if> </if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''"> <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND pcp.create_time LIKE AND pcp.year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%') concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if> </if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''"> <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
@@ -4014,7 +4044,7 @@
</foreach> </foreach>
</if> </if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''"> <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND pms.create_time LIKE AND pm.particular_year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%') concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if> </if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''"> <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
@@ -4061,7 +4091,7 @@
</foreach> </foreach>
</if> </if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''"> <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND pmps.create_time LIKE AND pmp.particular_year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%') concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if> </if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''"> <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
@@ -4112,7 +4142,7 @@
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
</if> </if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''"> <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND tmps.create_time LIKE AND tmp.year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%') concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if> </if>
<if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''"> <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
@@ -4165,7 +4195,7 @@
AND tmps.in_account =#{CompanyComeMoneyDetailSearch.inAccountStatue} AND tmps.in_account =#{CompanyComeMoneyDetailSearch.inAccountStatue}
</if> </if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''"> <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND tmps.create_time LIKE AND tmp.year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%') concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if> </if>
@@ -4188,7 +4218,7 @@
</otherwise> </otherwise>
</choose> </choose>
</where> </where>
) pp ) pp where pp.allMoney is not null and pp.allMoney !=0
<!-- left join--> <!-- left join-->
<!-- (select pwgs.id as id,max(ppr.payment_date) as payment_date--> <!-- (select pwgs.id as id,max(ppr.payment_date) as payment_date-->
<!-- from pay_working_group_subitem pwgs--> <!-- from pay_working_group_subitem pwgs-->
@@ -4258,7 +4288,7 @@
</foreach> </foreach>
</if> </if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''"> <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND pwgs.create_time LIKE AND pwg.year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%') concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if> </if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''"> <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
@@ -4299,13 +4329,13 @@
<where> <where>
pcp.charge_company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId} pcp.charge_company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
<if test="idList != null and idList != ''"> <if test="idList != null and idList != ''">
and PCP.principal_id in and pcp.principal_id in
<foreach item="item" open="(" separator="," close=")" collection="idList"> <foreach item="item" open="(" separator="," close=")" collection="idList">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''"> <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND pcp.create_time LIKE AND pcp.year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%') concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if> </if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''"> <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
@@ -4352,7 +4382,7 @@
</foreach> </foreach>
</if> </if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''"> <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND pms.create_time LIKE AND pm.particular_year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%') concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if> </if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''"> <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
@@ -4399,7 +4429,7 @@
</foreach> </foreach>
</if> </if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''"> <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND pmps.create_time LIKE AND pmp.particular_year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%') concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if> </if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''"> <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
@@ -4450,7 +4480,7 @@
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
</if> </if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''"> <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND tmps.create_time LIKE AND tmp.year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%') concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if> </if>
<if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''"> <if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
@@ -4503,7 +4533,7 @@
AND tmps.in_account =#{CompanyComeMoneyDetailSearch.inAccountStatue} AND tmps.in_account =#{CompanyComeMoneyDetailSearch.inAccountStatue}
</if> </if>
<if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''"> <if test="CompanyComeMoneyDetailSearch.year != null and CompanyComeMoneyDetailSearch.year != ''">
AND tmps.create_time LIKE AND tmp.year LIKE
concat(#{CompanyComeMoneyDetailSearch.year},'%') concat(#{CompanyComeMoneyDetailSearch.year},'%')
</if> </if>
@@ -4526,7 +4556,7 @@
</otherwise> </otherwise>
</choose> </choose>
</where> </where>
) pp ) pp where pp.allMoney is not null and pp.allMoney !=0
<!-- left join--> <!-- left join-->
<!-- (select pwgs.id as id,max(ppr.payment_date) as payment_date--> <!-- (select pwgs.id as id,max(ppr.payment_date) as payment_date-->
<!-- from pay_working_group_subitem pwgs--> <!-- 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},'%')) concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%'))
</if> </if>
<if test="payWorkingGroupSubletSearch.year != null and payWorkingGroupSubletSearch.year != ''"> <if test="payWorkingGroupSubletSearch.year != null and payWorkingGroupSubletSearch.year != ''">
AND pwgs.create_time LIKE AND pwg.year LIKE
concat(#{payWorkingGroupSubletSearch.year},'%') concat(#{payWorkingGroupSubletSearch.year},'%')
</if> </if>
<if test="payWorkingGroupSubletSearch.chargeUse != null and payWorkingGroupSubletSearch.chargeUse != ''"> <if test="payWorkingGroupSubletSearch.chargeUse != null and payWorkingGroupSubletSearch.chargeUse != ''">
@@ -116,7 +116,7 @@
</otherwise> </otherwise>
</choose> </choose>
</where> </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--> <!-- inner join-->
<!-- (select pwgs.id as id,working_group_id,max(ppr.payment_date) as payment_date--> <!-- (select pwgs.id as id,working_group_id,max(ppr.payment_date) as payment_date-->
<!-- from pay_working_group_subitem pwgs--> <!-- from pay_working_group_subitem pwgs-->
@@ -149,7 +149,7 @@
concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%')) concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%'))
</if> </if>
<if test="payWorkingGroupSubletSearch.year != null and payWorkingGroupSubletSearch.year != ''"> <if test="payWorkingGroupSubletSearch.year != null and payWorkingGroupSubletSearch.year != ''">
AND pwgs.create_time LIKE AND pwg.year LIKE
concat(#{payWorkingGroupSubletSearch.year},'%') concat(#{payWorkingGroupSubletSearch.year},'%')
</if> </if>
<if test="payWorkingGroupSubletSearch.chargeUse != null and payWorkingGroupSubletSearch.chargeUse != ''"> <if test="payWorkingGroupSubletSearch.chargeUse != null and payWorkingGroupSubletSearch.chargeUse != ''">
@@ -179,7 +179,7 @@
</otherwise> </otherwise>
</choose> </choose>
</where> </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--> <!-- inner join-->
<!-- (select pwgs.id as id,working_group_id,max(ppr.payment_date) as payment_date--> <!-- (select pwgs.id as id,working_group_id,max(ppr.payment_date) as payment_date-->
<!-- from pay_working_group_subitem pwgs--> <!-- from pay_working_group_subitem pwgs-->
@@ -215,7 +215,7 @@
concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%')) concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%'))
</if> </if>
<if test="payWorkingGroupSubletSearch.year != null and payWorkingGroupSubletSearch.year != ''"> <if test="payWorkingGroupSubletSearch.year != null and payWorkingGroupSubletSearch.year != ''">
AND pwgs.create_time LIKE AND pwg.year LIKE
concat(#{payWorkingGroupSubletSearch.year},'%') concat(#{payWorkingGroupSubletSearch.year},'%')
</if> </if>
<if test="payWorkingGroupSubletSearch.chargeUse != null and payWorkingGroupSubletSearch.chargeUse != ''"> <if test="payWorkingGroupSubletSearch.chargeUse != null and payWorkingGroupSubletSearch.chargeUse != ''">
@@ -245,7 +245,7 @@
</otherwise> </otherwise>
</choose> </choose>
</where> </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--> <!-- inner join-->
<!-- (select pwgs.id as id,working_group_id,max(ppr.payment_date) as payment_date--> <!-- (select pwgs.id as id,working_group_id,max(ppr.payment_date) as payment_date-->
<!-- from pay_working_group_subitem pwgs--> <!-- from pay_working_group_subitem pwgs-->
jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java
+1 -1
View File
@@ -220,7 +220,7 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
*/ */
IPage<AllProjectStatistics> queryPageListForProject(Page<AllProjectStatistics> page, AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList); IPage<AllProjectStatistics> queryPageListForProject(Page<AllProjectStatistics> page, AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList);
AllMoney queryPageList33(AllProjectStatisticsSearch allProjectStatisticsSearch); AllMoney queryPageList33(AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList);
AllMoney queryPageListForCompany33(CompanyComeMoneySearch companyComeMoneySearch, List<String> idList); AllMoney queryPageListForCompany33(CompanyComeMoneySearch companyComeMoneySearch, List<String> idList);
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+2 -2
View File
@@ -565,8 +565,8 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
} }
@Override @Override
public AllMoney queryPageList33(AllProjectStatisticsSearch allProjectStatisticsSearch) { public AllMoney queryPageList33(AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList) {
return payWorkingGroupMapper.queryPageList33(allProjectStatisticsSearch); return payWorkingGroupMapper.queryPageList33(allProjectStatisticsSearch, idList);
} }
@Override @Override
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+5 -11
View File
@@ -121,7 +121,7 @@ public class AllProjectStatisticsController {
} }
} }
AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch); AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch,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());
@@ -148,7 +148,7 @@ public class AllProjectStatisticsController {
allProjectStatisticsSearch.setChargeCompanyTemporaryName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName())); allProjectStatisticsSearch.setChargeCompanyTemporaryName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
//根据不同角色加载不同列表的参数 //根据不同角色加载不同列表的参数
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码 //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode(); String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
@@ -164,13 +164,10 @@ public class AllProjectStatisticsController {
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
idList.addAll(allDepartIds);//项目负责人 idList.addAll(allDepartIds);//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else { } else {
return Result.OK(); return Result.OK();
} }
Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize); Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,idList); IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,idList);
HashMap<String, Object> hashMap = new HashMap<>(); HashMap<String, Object> hashMap = new HashMap<>();
// double sum=0; // double sum=0;
@@ -197,7 +194,7 @@ public class AllProjectStatisticsController {
} }
} }
AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch); AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch,idList);
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());
@@ -351,15 +348,12 @@ public class AllProjectStatisticsController {
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
idList.addAll(allDepartIds); idList.addAll(allDepartIds);
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else { } else {
ArrayList<AllProjectStatistics> objects = new ArrayList<>(); ArrayList<AllProjectStatistics> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "项目来款统计"); return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "项目来款统计");
} }
List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, null); List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList);
if (pageList != null) { if (pageList != null) {
for (AllProjectStatistics s : pageList) { for (AllProjectStatistics s : pageList) {
String key = String.valueOf(s.getChargeUse()); String key = String.valueOf(s.getChargeUse());