bonus
/
sh_real_name_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

This commit is contained in:
方亮 2025-10-24 15:12:34 +08:00
parent 3224dcca2c
commit 038a344b6e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerAttMapper.xml
View File

@ -118,15 +118,13 @@
LEFT JOIN bm_att_person bap ON bap.pro_id = pp.id AND pst.id = bap.team_id AND bap.att_day = #{startDate} LEFT JOIN bm_att_person bap ON bap.pro_id = pp.id AND pst.id = bap.team_id AND bap.att_day = #{startDate}
WHERE WHERE
pp.id = #{proId} pp.id = #{proId}
AND pp.is_active = 1 AND pp.is_active = 1 and pst.id is not null
<if test="subName != null and subName != ''"> <if test="subName != null and subName != ''">
AND ps.sub_name = #{subName} AND ps.sub_name = #{subName}
</if> </if>
<if test="teamName != null and teamName != ''"> <if test="teamName != null and teamName != ''">
AND pst.team_name = #{teamName} AND pst.team_name = #{teamName}
</if> </if>
GROUP BY GROUP BY
pst.id pst.id
</select> </select>

2
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml
View File

@ -107,7 +107,7 @@
<select id="getWorkerWage" resultType="com.bonus.bmw.domain.vo.ProStatisticsPo"> <select id="getWorkerWage" resultType="com.bonus.bmw.domain.vo.ProStatisticsPo">
SELECT SELECT
sum(pp.net_salary) AS salaryMoneyNum, sum(pp.net_salary) AS salaryMoneyNum,
sum(pp.id) AS payrollNum, count(pp.id) AS payrollNum,
sum(pp.pay_num) AS payrollWorkerTime sum(pp.pay_num) AS payrollWorkerTime
FROM FROM
tb_pro_month_table pp tb_pro_month_table pp

4
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml
View File

@ -285,11 +285,13 @@
pp.pro_name proName, pp.pro_name proName,
count( distinct brca.id ) num, count( distinct brca.id ) num,
count( distinct brcr.worker_id ) personNum, count( distinct brcr.worker_id ) personNum,
sum( brcr.repair_day ) days, count(DISTINCT bap.att_day) days,
brca.create_time createTime brca.create_time createTime
FROM FROM
bm_repair_card_apply brca bm_repair_card_apply brca
LEFT JOIN bm_repair_card_record brcr ON brca.id = brcr.apply_id LEFT JOIN bm_repair_card_record brcr ON brca.id = brcr.apply_id
LEFT JOIN bm_att_person bap ON brca.pro_id = bap.pro_id
AND bap.is_repair = 1
LEFT JOIN pm_project pp ON pp.id = brca.pro_id LEFT JOIN pm_project pp ON pp.id = brca.pro_id
WHERE WHERE
brca.is_active = 1 brca.is_active = 1