bug修复
This commit is contained in:
parent
733c6b378b
commit
241c070c3c
|
|
@ -286,7 +286,8 @@
|
||||||
bap.team_name,
|
bap.team_name,
|
||||||
bwepr.post_name,
|
bwepr.post_name,
|
||||||
count(DISTINCT bap.id) AS attNumHis,
|
count(DISTINCT bap.id) AS attNumHis,
|
||||||
count(DISTINCT IF(bap.is_repair = 1, bap.id, null)) AS repairNumHis
|
count(DISTINCT IF(bap.is_repair = 1, bap.id, null)) AS repairNumHis,
|
||||||
|
bap.worker_id as workerId
|
||||||
FROM
|
FROM
|
||||||
bm_att_person bap
|
bm_att_person bap
|
||||||
INNER JOIN pm_worker pw ON pw.id = bap.worker_id
|
INNER JOIN pm_worker pw ON pw.id = bap.worker_id
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@
|
||||||
SELECT
|
SELECT
|
||||||
sum(tpmtr.actual_money) AS salaryMoneyNum,
|
sum(tpmtr.actual_money) AS salaryMoneyNum,
|
||||||
count(DISTINCT tpmtr.month_id) as payrollNum,
|
count(DISTINCT tpmtr.month_id) as payrollNum,
|
||||||
sum(tpmtr.id) AS payrollWorkerTime
|
count(tpmtr.id) AS payrollWorkerTime
|
||||||
FROM
|
FROM
|
||||||
tb_pro_month_table_roster tpmtr
|
tb_pro_month_table_roster tpmtr
|
||||||
WHERE
|
WHERE
|
||||||
|
|
@ -244,7 +244,8 @@
|
||||||
bap.team_name,
|
bap.team_name,
|
||||||
bwepr.post_name,
|
bwepr.post_name,
|
||||||
count( DISTINCT bap.worker_id) AS attNumHis,
|
count( DISTINCT bap.worker_id) AS attNumHis,
|
||||||
sum(DISTINCT IF(bap.is_repair = 1, 1, 0)) AS repairNumHis
|
sum(DISTINCT IF(bap.is_repair = 1, 1, 0)) AS repairNumHis,
|
||||||
|
bap.worker_id as workerId
|
||||||
FROM
|
FROM
|
||||||
bm_att_person bap
|
bm_att_person bap
|
||||||
INNER JOIN pm_worker pw ON pw.id = bap.worker_id
|
INNER JOIN pm_worker pw ON pw.id = bap.worker_id
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue