|
@@ -153,7 +153,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="getPersonWorkHoursWagesDetail" resultType="java.util.Map">
|
|
|
- select r.cost,r.working_time,ppt.total_progress as progress,DATE_FORMAT(r.create_date,'%Y%m%d') as createDate,pp.name as procedureName,(case when pp.check_type=0 then '自检' when pp.check_type=1 then '互检' else '专检' end) as checkType,
|
|
|
+ select r.cost,r.working_time,r.creator_id,ppt.total_progress as progress,DATE_FORMAT(r.create_date,'%Y%m%d') as createDate,pp.name as procedureName,(case when pp.check_type=0 then '自检' when pp.check_type=1 then '互检' else '专检' end) as checkType,
|
|
|
p.name as productName,DATE_FORMAT(plan.start_date,'%Y%m%d') as planStartDate,DATE_FORMAT(plan.end_date,'%Y%m%d') as planEndDate ,
|
|
|
plan.task_change_notice_num as taskName,plan.plan_type as planType,u.name as checkerName,u2.name as creatorName
|
|
|
from report r
|