@ -75,24 +82,24 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
"then (select standard_labour_price from base_procedure where id=b.procedure_id and salary_type='HourWage' limit 1)*b.workTime "+
"when exists(select id from base_procedure where id=b.procedure_id and salary_type='PieceRateWage') "+
"then (select standard_labour_price from base_procedure where id=b.procedure_id and salary_type='PieceRateWage' limit 1)*b.amount "+
"else 0 end" +
"),0) salary")
"else 0 end" +
"),0) salary")
.leftJoin("(select * from system_users as a,(SELECT DATE_FORMAT(DATE_SUB(CURRENT_DATE(),INTERVAL "+span+" MONTH) , '%Y%m') year_mont) as b "+
") as a on t.id=a.id")
.leftJoin("("+
"select ptr.owner,DATE_FORMAT(ptr.report_time, '%Y%m') as year_mont,pso.code as projectCode,pso.business_dept_id,ptr.procedure_id,pso.external_code,sum(ptr.amount) amount,sum(ptr.work_time) workTime from pro_task_report as ptr" +
"left join pro_task_dispatch as ptd on ptd.id=ptr.dispatch_id" +
"left join project_sale_order as pso on pso.id= ptd.project_id" +
"group by ptr.owner,DATE_FORMAT(ptr.report_time, '%Y%m'),pso.code,pso.business_dept_id,ptr.procedure_id,pso.external_code" +
") b on t.id=b.owner and a.id=b.owner and a.year_mont=b.year_mont")
.leftJoin("system_dept as sd on b.business_dept_id= sd.id")
.leftJoin("base_workshop as c on c.id=b.workshop_id")
"select ptr.owner,DATE_FORMAT(ptr.report_time, '%Y%m') as year_mont,pso.code as projectCode,pso.business_dept_id,ptr.procedure_id,pso.external_code,sum(ptr.amount) amount,sum(ptr.work_time) workTime from pro_task_report as ptr" +
"left join pro_task_dispatch as ptd on ptd.id=ptr.dispatch_id" +
"left join project_sale_order as pso on pso.id= ptd.project_id" +
"group by ptr.owner,DATE_FORMAT(ptr.report_time, '%Y%m'),pso.code,pso.business_dept_id,ptr.procedure_id,pso.external_code" +
") b on t.id=b.owner and a.id=b.owner and a.year_mont=b.year_mont")
.leftJoin("system_dept as sd on b.business_dept_id= sd.id")
.leftJoin("base_workshop as c on c.id=b.workshop_id")