bug修复
This commit is contained in:
parent
062e185e77
commit
07c9fd2e75
|
|
@ -59,11 +59,12 @@
|
||||||
</select>
|
</select>
|
||||||
<select id="getProRepairNum" resultType="java.lang.Integer">
|
<select id="getProRepairNum" resultType="java.lang.Integer">
|
||||||
SELECT
|
SELECT
|
||||||
count(bap.worker_id) AS proRepairNum
|
count(pp.id) AS proRepairNum
|
||||||
FROM
|
FROM
|
||||||
bm_att_person bap
|
bm_repair_card_apply pp
|
||||||
|
left join bm_sub_contract bsc on pp.pro_id = bsc.pro_id
|
||||||
WHERE
|
WHERE
|
||||||
bap.sub_id = #{subId}
|
bsc.sub_id = #{subId} and pp.check_status = 1
|
||||||
</select>
|
</select>
|
||||||
<select id="getWorkerWage" resultType="com.bonus.bmw.domain.vo.ProStatisticsPo">
|
<select id="getWorkerWage" resultType="com.bonus.bmw.domain.vo.ProStatisticsPo">
|
||||||
SELECT
|
SELECT
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@
|
||||||
<if test="workerName != null">
|
<if test="workerName != null">
|
||||||
AND locate(#{workerName},pw.name)
|
AND locate(#{workerName},pw.name)
|
||||||
</if>
|
</if>
|
||||||
|
GROUP BY pw.id
|
||||||
</select>
|
</select>
|
||||||
<select id="getWorkerDetail" resultType="com.bonus.bmw.domain.vo.PmWorkerVo">
|
<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
|
select id,name,id_number,sex,birthday,issuing_authority,nation,start_time,end_time,address,phone
|
||||||
|
|
@ -79,9 +80,9 @@
|
||||||
bap.dev_name,
|
bap.dev_name,
|
||||||
bap.device_code,
|
bap.device_code,
|
||||||
case when bap.att_time is null then 0 else 1 end as attStatus
|
case when bap.att_time is null then 0 else 1 end as attStatus
|
||||||
from bm_worker_ein_day_record bwedr
|
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
|
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}
|
where bwedr.worker_id = #{workerId}
|
||||||
<if test="startTime!=null and endTime!=null">
|
<if test="startTime!=null and endTime!=null">
|
||||||
and bwedr.ein_day between #{startTime} and #{endTime}
|
and bwedr.ein_day between #{startTime} and #{endTime}
|
||||||
</if>
|
</if>
|
||||||
|
|
@ -91,6 +92,7 @@
|
||||||
<if test="subId != null">
|
<if test="subId != null">
|
||||||
AND bwedr.sub_id = #{subId}
|
AND bwedr.sub_id = #{subId}
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
<select id="getMonthTableDetail" resultType="com.bonus.bmw.domain.vo.ProMonthTable">
|
<select id="getMonthTableDetail" resultType="com.bonus.bmw.domain.vo.ProMonthTable">
|
||||||
select tpmt.table_month,
|
select tpmt.table_month,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue