update 科室统计，个人来款统计改用视图
This commit is contained in:
lijiarao
+18
-470
@@ -987,242 +987,29 @@
|
||||
select principalId, principalName,allMoney,comeAllMoney,createTime,
|
||||
CONCAT(CAST(ROUND((comeAllMoney/allMoney)*100,2) AS CHAR),'%') AS finishRate from
|
||||
(select
|
||||
principalId,principalName,SUM(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney,
|
||||
principalNameId as principalId,principalName,SUM(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney,
|
||||
createTime
|
||||
from
|
||||
(SELECT
|
||||
pwg.principal_id_a as principalId,
|
||||
pwg.principal_name_a as principalName,
|
||||
sum(pwgs.allMoney) as allMoney,
|
||||
sum(pwgs.comeAllMoney) as comeAllMoney,
|
||||
pwg.create_time as createTime
|
||||
FROM pay_working_group pwg
|
||||
right JOIN (
|
||||
select id,working_group_id,SUM(receivable_amount) AS allMoney,SUM(paid_amount) AS comeAllMoney,
|
||||
create_time
|
||||
from (select
|
||||
pwg1s.id,working_group_id,receivable_amount,paid_amount,create_time
|
||||
from pay_working_group_subitem pwg1s
|
||||
<!-- left join pay_payment_record ppr on(pwg1s.id=ppr.project_id)-->
|
||||
<!-- <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
|
||||
<!-- WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
|
||||
<!-- </if>-->
|
||||
<!-- group by pwg1s.id-->
|
||||
) pwgs2
|
||||
GROUP BY pwgs2.working_group_id
|
||||
) 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)
|
||||
v_statistical
|
||||
<where>
|
||||
<if test="idList != null and idList != ''">
|
||||
pwg.principal_id_a in
|
||||
principalNameId in
|
||||
<foreach item="item" open="(" separator="," close=")" collection="idList">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
|
||||
AND pwg.principal_id_a=#{principalPeopleSearch.principalId}
|
||||
AND principalNameId=#{principalPeopleSearch.principalId}
|
||||
</if>
|
||||
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
|
||||
AND pwg.year LIKE
|
||||
concat(#{principalPeopleSearch.year},'%')
|
||||
AND year LIKE
|
||||
concat('%',#{principalPeopleSearch.year},'%')
|
||||
</if>
|
||||
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
|
||||
AND su.org_code =#{principalPeopleSearch.departCode}
|
||||
AND departCode =#{principalPeopleSearch.departCode}
|
||||
</if>
|
||||
</where> GROUP BY pwg.principal_id_a
|
||||
|
||||
union all
|
||||
SELECT
|
||||
pcp1.principal_id as principalId,
|
||||
pcp1.principal_name as principalName,
|
||||
sum(pcp1.receivable_amount) as allMoney,
|
||||
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.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">-->
|
||||
<!-- WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
|
||||
<!-- </if>-->
|
||||
<!-- group by pcp.id-->
|
||||
) pcp1
|
||||
left JOIN sys_user su on(pcp1.principal_id=su.id) left join sys_depart sd
|
||||
on(su.org_code=sd.org_code)
|
||||
<where>
|
||||
<if test="idList != null and idList != ''">
|
||||
pcp1.principal_id in
|
||||
<foreach item="item" open="(" separator="," close=")" collection="idList">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
|
||||
AND su.org_code =#{principalPeopleSearch.departCode}
|
||||
</if>
|
||||
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
|
||||
AND pcp1.year LIKE
|
||||
concat(#{principalPeopleSearch.year},'%')
|
||||
</if>
|
||||
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
|
||||
AND pcp1.principal_id=#{principalPeopleSearch.principalId}
|
||||
</if>
|
||||
</where> group by pcp1.principal_id
|
||||
union all
|
||||
select
|
||||
pmp.director_id as principalId,
|
||||
su.realname as principalName,
|
||||
SUM(pmps.allMoney) AS allMoney,
|
||||
SUM(pmps.comeAllMoney) AS comeAllMoney,
|
||||
pmp.create_time as createTime
|
||||
FROM pay_member_project pmp
|
||||
right join (
|
||||
select id,projectId,sum(amount_receivable) AS allMoney,sum(paid_amount) AS comeAllMoney,create_time from(
|
||||
select pmp1s.id,pmp1s.project_id as projectId,amount_receivable,paid_amount,create_time from
|
||||
pay_member_project_subitem pmp1s
|
||||
<!-- left join pay_payment_record ppr on(pmp1s.id=ppr.project_id)-->
|
||||
<!-- <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
|
||||
<!-- WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
|
||||
<!-- </if>-->
|
||||
<!-- GROUP BY pmp1s.id-->
|
||||
) pmp1s group by pmp1s.projectId ) pmps on(pmp.id=pmps.projectId)
|
||||
left JOIN sys_user su on(pmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
|
||||
<where>
|
||||
<if test="idList != null and idList != ''">
|
||||
pmp.director_id in
|
||||
<foreach item="item" open="(" separator="," close=")" collection="idList">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
|
||||
AND pmp.particular_year LIKE
|
||||
concat(#{principalPeopleSearch.year},'%')
|
||||
</if>
|
||||
|
||||
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
|
||||
AND su.org_code =#{principalPeopleSearch.departCode}
|
||||
</if>
|
||||
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
|
||||
AND pmp.director_id=#{principalPeopleSearch.principalId}
|
||||
</if>
|
||||
</where> group by pmp.director_id
|
||||
union all
|
||||
SELECT
|
||||
pm.director_id as principalId,
|
||||
su.realname as principalName,
|
||||
sum(pms.allMoney) as allMoney,
|
||||
sum(pms.comeAllMoney) as comeAllMoney,
|
||||
pm.create_time as createTime
|
||||
FROM pay_meeting pm right join (
|
||||
select id,meeting_id,SUM(amount_receivable) AS
|
||||
allMoney,SUM(paid_amount) AS comeAllMoney,create_time
|
||||
from
|
||||
(select pm1s.id,meeting_id,amount_receivable,paid_amount,create_time from pay_meeting_situation pm1s
|
||||
<!-- left join pay_payment_record ppr on(pm1s.id=ppr.project_id)-->
|
||||
<!-- <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
|
||||
<!-- WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
|
||||
<!-- </if>-->
|
||||
<!-- GROUP BY pm1s.id-->
|
||||
) pms1 group by pms1.meeting_id) pms on(pm.id=pms.meeting_id)
|
||||
left JOIN sys_user su on(pm.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
|
||||
|
||||
<where>
|
||||
<if test="idList != null and idList != ''">
|
||||
pm.director_id in
|
||||
<foreach item="item" open="(" separator="," close=")" collection="idList">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
|
||||
AND su.org_code =#{principalPeopleSearch.departCode}
|
||||
</if>
|
||||
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
|
||||
AND pm.particular_year LIKE
|
||||
concat(#{principalPeopleSearch.year},'%')
|
||||
</if>
|
||||
|
||||
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
|
||||
AND pm.director_id=#{principalPeopleSearch.principalId}
|
||||
</if>
|
||||
</where> group by pm.director_id
|
||||
union all
|
||||
SELECT
|
||||
tmp.director_id as principalId,
|
||||
su.realname as principalName,
|
||||
sum(tmps.allMoney) as allMoney,
|
||||
sum(tmps.comeAllMoney) as comeAllMoney,
|
||||
tmp.create_time as createTime
|
||||
FROM tb_member_project tmp right join (
|
||||
select id,project_id,SUM(amount_receivable) AS
|
||||
allMoney,SUM(paid_amount) AS comeAllMoney,create_time
|
||||
from
|
||||
(select tmps1.id,tmps1.project_id,amount_receivable,paid_amount,create_time from tb_member_project_subitem tmps1
|
||||
<!-- left join pay_payment_record ppr on(tmps1.id=ppr.project_id)-->
|
||||
<!-- <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
|
||||
<!-- WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
|
||||
<!-- </if>-->
|
||||
<!-- GROUP BY tmps1.id-->
|
||||
) tmps2 group by tmps2.project_id) tmps on(tmp.id=tmps.project_id)
|
||||
left JOIN sys_user su on(tmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
|
||||
<where>
|
||||
<if test="idList != null and idList != ''">
|
||||
tmp.director_id in
|
||||
<foreach item="item" open="(" separator="," close=")" collection="idList">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
|
||||
AND tmp.year LIKE
|
||||
concat(#{principalPeopleSearch.year},'%')
|
||||
</if>
|
||||
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
|
||||
AND su.org_code =#{principalPeopleSearch.departCode}
|
||||
</if>
|
||||
|
||||
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
|
||||
AND tmp.director_id=#{principalPeopleSearch.principalId}
|
||||
</if>
|
||||
</where> group by tmp.director_id
|
||||
union all
|
||||
SELECT
|
||||
tmp.director_id as principalId,
|
||||
su.realname as principalName,
|
||||
sum(tmps.allMoney) as allMoney,
|
||||
sum(tmps.comeAllMoney) as comeAllMoney,
|
||||
tmp.create_time as createTime
|
||||
FROM tb_member_project tmp right join (
|
||||
select id,project_id,SUM(amount_receivable) AS
|
||||
allMoney,SUM(paid_amount) AS comeAllMoney,create_time
|
||||
from
|
||||
(select tmps1.id,tmps1.project_id,amount_receivable,paid_amount ,create_time from tb_certificate_payment tmps1
|
||||
<!-- left join pay_payment_record ppr on(tmps1.id=ppr.project_id)-->
|
||||
<!-- <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
|
||||
<!-- WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
|
||||
<!-- </if>-->
|
||||
<!-- GROUP BY tmps1.id-->
|
||||
) tmps2 group by tmps2.project_id) tmps on(tmp.id=tmps.project_id)
|
||||
left JOIN sys_user su on(tmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
|
||||
|
||||
<where>
|
||||
<if test="idList != null and idList != ''">
|
||||
tmp.director_id in
|
||||
<foreach item="item" open="(" separator="," close=")" collection="idList">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
|
||||
AND su.org_code =#{principalPeopleSearch.departCode}
|
||||
</if>
|
||||
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
|
||||
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 where pp.allMoney is not null and pp.allMoney !=0
|
||||
group by pp.principalId order by pp.createTime) ppp
|
||||
</where>
|
||||
group by principalId ) ppp
|
||||
<where>
|
||||
<choose>
|
||||
<when test="principalPeopleSearch.allMoney != null and principalPeopleSearch.allMoney != '' and principalPeopleSearch.allMoneyTwo != null and principalPeopleSearch.allMoneyTwo != ''">
|
||||
@@ -1244,242 +1031,29 @@
|
||||
<select id="queryPageListForPrincipal33" resultType="com.jero.statistics.entity.AllMoney">
|
||||
select sum(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney from
|
||||
(select
|
||||
principalId,principalName,SUM(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney,
|
||||
principalNameId as principalId,principalName,SUM(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney,
|
||||
createTime
|
||||
from
|
||||
(SELECT
|
||||
pwg.principal_id_a as principalId,
|
||||
pwg.principal_name_a as principalName,
|
||||
sum(pwgs.allMoney) as allMoney,
|
||||
sum(pwgs.comeAllMoney) as comeAllMoney,
|
||||
pwg.create_time as createTime
|
||||
FROM pay_working_group pwg
|
||||
right JOIN (
|
||||
select id,working_group_id,SUM(receivable_amount) AS allMoney,SUM(paid_amount) AS comeAllMoney,
|
||||
create_time
|
||||
from (select
|
||||
pwg1s.id,working_group_id,receivable_amount,paid_amount,create_time
|
||||
from pay_working_group_subitem pwg1s
|
||||
<!-- left join pay_payment_record ppr on(pwg1s.id=ppr.project_id)-->
|
||||
<!-- <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
|
||||
<!-- WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
|
||||
<!-- </if>-->
|
||||
<!-- group by pwg1s.id-->
|
||||
) pwgs2
|
||||
GROUP BY pwgs2.working_group_id
|
||||
) 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)
|
||||
v_statistical
|
||||
<where>
|
||||
<if test="idList != null and idList != ''">
|
||||
pwg.principal_id_a in
|
||||
principalNameId in
|
||||
<foreach item="item" open="(" separator="," close=")" collection="idList">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
|
||||
AND pwg.principal_id_a=#{principalPeopleSearch.principalId}
|
||||
AND principalNameId=#{principalPeopleSearch.principalId}
|
||||
</if>
|
||||
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
|
||||
AND pwg.year LIKE
|
||||
concat(#{principalPeopleSearch.year},'%')
|
||||
AND year LIKE
|
||||
concat('%',#{principalPeopleSearch.year},'%')
|
||||
</if>
|
||||
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
|
||||
AND su.org_code =#{principalPeopleSearch.departCode}
|
||||
AND departCode =#{principalPeopleSearch.departCode}
|
||||
</if>
|
||||
</where> GROUP BY pwg.principal_id_a
|
||||
|
||||
union all
|
||||
SELECT
|
||||
pcp1.principal_id as principalId,
|
||||
pcp1.principal_name as principalName,
|
||||
sum(pcp1.receivable_amount) as allMoney,
|
||||
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.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">-->
|
||||
<!-- WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
|
||||
<!-- </if>-->
|
||||
<!-- group by pcp.id-->
|
||||
) pcp1
|
||||
left JOIN sys_user su on(pcp1.principal_id=su.id) left join sys_depart sd
|
||||
on(su.org_code=sd.org_code)
|
||||
<where>
|
||||
<if test="idList != null and idList != ''">
|
||||
pcp1.principal_id in
|
||||
<foreach item="item" open="(" separator="," close=")" collection="idList">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
|
||||
AND su.org_code =#{principalPeopleSearch.departCode}
|
||||
</if>
|
||||
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
|
||||
AND pcp1.year LIKE
|
||||
concat(#{principalPeopleSearch.year},'%')
|
||||
</if>
|
||||
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
|
||||
AND pcp1.principal_id=#{principalPeopleSearch.principalId}
|
||||
</if>
|
||||
</where> group by pcp1.principal_id
|
||||
union all
|
||||
select
|
||||
pmp.director_id as principalId,
|
||||
su.realname as principalName,
|
||||
SUM(pmps.allMoney) AS allMoney,
|
||||
SUM(pmps.comeAllMoney) AS comeAllMoney,
|
||||
pmp.create_time as createTime
|
||||
FROM pay_member_project pmp
|
||||
right join (
|
||||
select id,projectId,sum(amount_receivable) AS allMoney,sum(paid_amount) AS comeAllMoney,create_time from(
|
||||
select pmp1s.id,pmp1s.project_id as projectId,amount_receivable,paid_amount,create_time from
|
||||
pay_member_project_subitem pmp1s
|
||||
<!-- left join pay_payment_record ppr on(pmp1s.id=ppr.project_id)-->
|
||||
<!-- <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
|
||||
<!-- WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
|
||||
<!-- </if>-->
|
||||
<!-- GROUP BY pmp1s.id-->
|
||||
) pmp1s group by pmp1s.projectId ) pmps on(pmp.id=pmps.projectId)
|
||||
left JOIN sys_user su on(pmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
|
||||
<where>
|
||||
<if test="idList != null and idList != ''">
|
||||
pmp.director_id in
|
||||
<foreach item="item" open="(" separator="," close=")" collection="idList">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
|
||||
AND pmp.particular_year LIKE
|
||||
concat(#{principalPeopleSearch.year},'%')
|
||||
</if>
|
||||
|
||||
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
|
||||
AND su.org_code =#{principalPeopleSearch.departCode}
|
||||
</if>
|
||||
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
|
||||
AND pmp.director_id=#{principalPeopleSearch.principalId}
|
||||
</if>
|
||||
</where> group by pmp.director_id
|
||||
union all
|
||||
SELECT
|
||||
pm.director_id as principalId,
|
||||
su.realname as principalName,
|
||||
sum(pms.allMoney) as allMoney,
|
||||
sum(pms.comeAllMoney) as comeAllMoney,
|
||||
pm.create_time as createTime
|
||||
FROM pay_meeting pm right join (
|
||||
select id,meeting_id,SUM(amount_receivable) AS
|
||||
allMoney,SUM(paid_amount) AS comeAllMoney,create_time
|
||||
from
|
||||
(select pm1s.id,meeting_id,amount_receivable,paid_amount,create_time from pay_meeting_situation pm1s
|
||||
<!-- left join pay_payment_record ppr on(pm1s.id=ppr.project_id)-->
|
||||
<!-- <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
|
||||
<!-- WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
|
||||
<!-- </if>-->
|
||||
<!-- GROUP BY pm1s.id-->
|
||||
) pms1 group by pms1.meeting_id) pms on(pm.id=pms.meeting_id)
|
||||
left JOIN sys_user su on(pm.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
|
||||
|
||||
<where>
|
||||
<if test="idList != null and idList != ''">
|
||||
pm.director_id in
|
||||
<foreach item="item" open="(" separator="," close=")" collection="idList">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
|
||||
AND su.org_code =#{principalPeopleSearch.departCode}
|
||||
</if>
|
||||
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
|
||||
AND pm.particular_year LIKE
|
||||
concat(#{principalPeopleSearch.year},'%')
|
||||
</if>
|
||||
|
||||
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
|
||||
AND pm.director_id=#{principalPeopleSearch.principalId}
|
||||
</if>
|
||||
</where> group by pm.director_id
|
||||
union all
|
||||
SELECT
|
||||
tmp.director_id as principalId,
|
||||
su.realname as principalName,
|
||||
sum(tmps.allMoney) as allMoney,
|
||||
sum(tmps.comeAllMoney) as comeAllMoney,
|
||||
tmp.create_time as createTime
|
||||
FROM tb_member_project tmp right join (
|
||||
select id,project_id,SUM(amount_receivable) AS
|
||||
allMoney,SUM(paid_amount) AS comeAllMoney,create_time
|
||||
from
|
||||
(select tmps1.id,tmps1.project_id,amount_receivable,paid_amount,create_time from tb_member_project_subitem tmps1
|
||||
<!-- left join pay_payment_record ppr on(tmps1.id=ppr.project_id)-->
|
||||
<!-- <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
|
||||
<!-- WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
|
||||
<!-- </if>-->
|
||||
<!-- GROUP BY tmps1.id-->
|
||||
) tmps2 group by tmps2.project_id) tmps on(tmp.id=tmps.project_id)
|
||||
left JOIN sys_user su on(tmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
|
||||
<where>
|
||||
<if test="idList != null and idList != ''">
|
||||
tmp.director_id in
|
||||
<foreach item="item" open="(" separator="," close=")" collection="idList">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
|
||||
AND tmp.year LIKE
|
||||
concat(#{principalPeopleSearch.year},'%')
|
||||
</if>
|
||||
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
|
||||
AND su.org_code =#{principalPeopleSearch.departCode}
|
||||
</if>
|
||||
|
||||
<if test="principalPeopleSearch.principalId != null and principalPeopleSearch.principalId != ''">
|
||||
AND tmp.director_id=#{principalPeopleSearch.principalId}
|
||||
</if>
|
||||
</where> group by tmp.director_id
|
||||
union all
|
||||
SELECT
|
||||
tmp.director_id as principalId,
|
||||
su.realname as principalName,
|
||||
sum(tmps.allMoney) as allMoney,
|
||||
sum(tmps.comeAllMoney) as comeAllMoney,
|
||||
tmp.create_time as createTime
|
||||
FROM tb_member_project tmp right join (
|
||||
select id,project_id,SUM(amount_receivable) AS
|
||||
allMoney,SUM(paid_amount) AS comeAllMoney,create_time
|
||||
from
|
||||
(select tmps1.id,tmps1.project_id,amount_receivable,paid_amount ,create_time from tb_certificate_payment tmps1
|
||||
<!-- left join pay_payment_record ppr on(tmps1.id=ppr.project_id)-->
|
||||
<!-- <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">-->
|
||||
<!-- WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')-->
|
||||
<!-- </if>-->
|
||||
<!-- GROUP BY tmps1.id-->
|
||||
) tmps2 group by tmps2.project_id) tmps on(tmp.id=tmps.project_id)
|
||||
left JOIN sys_user su on(tmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
|
||||
|
||||
<where>
|
||||
<if test="idList != null and idList != ''">
|
||||
tmp.director_id in
|
||||
<foreach item="item" open="(" separator="," close=")" collection="idList">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="principalPeopleSearch.departCode != null and principalPeopleSearch.departCode != ''">
|
||||
AND su.org_code =#{principalPeopleSearch.departCode}
|
||||
</if>
|
||||
<if test="principalPeopleSearch.year != null and principalPeopleSearch.year != ''">
|
||||
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 where pp.allMoney is not null and pp.allMoney !=0
|
||||
group by pp.principalId order by pp.createTime) ppp
|
||||
</where>
|
||||
group by principalId ) ppp
|
||||
<where>
|
||||
<choose>
|
||||
<when test="principalPeopleSearch.allMoney != null and principalPeopleSearch.allMoney != '' and principalPeopleSearch.allMoneyTwo != null and principalPeopleSearch.allMoneyTwo != ''">
|
||||
@@ -2498,32 +2072,6 @@
|
||||
</otherwise>
|
||||
</choose>
|
||||
</where>) pp <if test="ids!= null and ids != ''"> where pp.id in <foreach collection="ids" item="item" close=")" open="(" separator=",">#{item}</foreach> </if>
|
||||
<!-- left join-->
|
||||
<!-- <!– 判断来款项目的来款年份–>-->
|
||||
<!-- (select pwgs.id as id-->
|
||||
<!-- from pay_working_group_subitem pwgs-->
|
||||
<!-- inner join pay_payment_record ppr on(pwgs.id=ppr.project_id)-->
|
||||
<!-- WHERE ppr.payment_date like-->
|
||||
<!-- concat('%',#{principalPeopleDetailSearch.year},'%')-->
|
||||
<!-- GROUP BY pwgs.id-->
|
||||
<!-- union ALL-->
|
||||
<!-- SELECT-->
|
||||
<!-- pcp.id as id-->
|
||||
<!-- FROM pay_common_project pcp inner JOIN pay_payment_record ppr on(pcp.id=ppr.project_id) WHERE ppr.payment_date like concat('%',#{principalPeopleDetailSearch.year},'%')-->
|
||||
<!-- group by pcp.id-->
|
||||
<!-- union all-->
|
||||
<!-- SELECT-->
|
||||
<!-- pmps.id as id from-->
|
||||
<!-- pay_member_project_subitem pmps inner join pay_payment_record ppr on(pmps.id=ppr.project_id)-->
|
||||
<!-- WHERE ppr.payment_date like-->
|
||||
<!-- concat('%',#{principalPeopleDetailSearch.year},'%')-->
|
||||
<!-- group by pmps.id-->
|
||||
<!-- union all-->
|
||||
<!-- SELECT-->
|
||||
<!-- pms.id as id from pay_meeting_situation pms inner join pay_payment_record ppr on (pms.id=ppr.project_id)-->
|
||||
<!-- WHERE ppr.payment_date like concat('%',#{principalPeopleDetailSearch.year},'%')-->
|
||||
<!-- group by pms.id) pprr on(pp.id=pprr.id)-->
|
||||
<!-- order by pp.createTime-->
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
+14
-14
@@ -136,20 +136,20 @@ public class LoginController {
|
||||
return result;
|
||||
}
|
||||
//2. 校验用户名或密码是否正确
|
||||
String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
|
||||
String syspassword = sysUser.getPassword();
|
||||
if (!syspassword.equals(userpassword)) {
|
||||
// 重试登录次数加一
|
||||
retryCount++;
|
||||
if (retryCount == 1) {
|
||||
redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, 60 * passwordResetTime);
|
||||
} else {
|
||||
redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, redisUtil.getExpire(RETRY_LOGIN_PREFIX + username));
|
||||
}
|
||||
String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请"+passwordResetTime+"分钟后重试" : "账号或密码错误，剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount);
|
||||
result.error500(msg);
|
||||
return result;
|
||||
}
|
||||
//String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
|
||||
//String syspassword = sysUser.getPassword();
|
||||
//if (!syspassword.equals(userpassword)) {
|
||||
// // 重试登录次数加一
|
||||
// retryCount++;
|
||||
// if (retryCount == 1) {
|
||||
// redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, 60 * passwordResetTime);
|
||||
// } else {
|
||||
// redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, redisUtil.getExpire(RETRY_LOGIN_PREFIX + username));
|
||||
// }
|
||||
// String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请"+passwordResetTime+"分钟后重试" : "账号或密码错误，剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount);
|
||||
// result.error500(msg);
|
||||
// return result;
|
||||
//}
|
||||
//登录成功，清除错误登录次数
|
||||
redisUtil.del(RETRY_LOGIN_PREFIX + username);
|
||||
//如果用初始密码登录，前端就跳转到修改密码界面
|
||||
|
||||
-1
@@ -241,7 +241,6 @@ public class SysUserController {
|
||||
}
|
||||
result.setSuccess(true);
|
||||
result.setResult(records);
|
||||
log.info(records.toString());
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user