bug修复

This commit is contained in:
马三炮 2025-10-21 09:20:41 +08:00
parent 062e185e77
commit 07c9fd2e75
2 changed files with 9 additions and 6 deletions

View File

@ -59,11 +59,12 @@
</select>
<select id="getProRepairNum" resultType="java.lang.Integer">
SELECT
count(bap.worker_id) AS proRepairNum
count(pp.id) AS proRepairNum
FROM
bm_att_person bap
bm_repair_card_apply pp
left join bm_sub_contract bsc on pp.pro_id = bsc.pro_id
WHERE
bap.sub_id = #{subId}
bsc.sub_id = #{subId} and pp.check_status = 1
</select>
<select id="getWorkerWage" resultType="com.bonus.bmw.domain.vo.ProStatisticsPo">
SELECT

View File

@ -39,6 +39,7 @@
<if test="workerName != null">
AND locate(#{workerName},pw.name)
</if>
GROUP BY pw.id
</select>
<select id="getWorkerDetail" resultType="com.bonus.bmw.domain.vo.PmWorkerVo">
select id,name,id_number,sex,birthday,issuing_authority,nation,start_time,end_time,address,phone
@ -79,9 +80,9 @@
bap.dev_name,
bap.device_code,
case when bap.att_time is null then 0 else 1 end as attStatus
from bm_worker_ein_day_record bwedr
left join bm_att_person bap on bwedr.ein_day = bap.att_day and bwedr.worker_id = bap.worker_id
where bwedr.worker_id = #{workerId}
from bm_worker_ein_day_record bwedr
left join bm_att_person bap on bwedr.ein_day = bap.att_day and bwedr.worker_id = bap.worker_id and bwedr.pro_id = bap.pro_id
where bwedr.worker_id = #{workerId}
<if test="startTime!=null and endTime!=null">
and bwedr.ein_day between #{startTime} and #{endTime}
</if>
@ -91,6 +92,7 @@
<if test="subId != null">
AND bwedr.sub_id = #{subId}
</if>
</select>
<select id="getMonthTableDetail" resultType="com.bonus.bmw.domain.vo.ProMonthTable">
select tpmt.table_month,