|
@@ -194,10 +194,12 @@
|
|
|
<select id="getPersonWorkHoursWagesDetailForTemp" resultType="java.util.Map">
|
|
|
select r.cost,(r.working_time*60) as working_time,r.finish_num, r.creator_id,DATE_FORMAT(r.create_date,'%Y%m%d') as createDate,
|
|
|
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 taskChangeNoticeNum,plan.plan_type as planType,u.name as checkerName,u2.name as creatorName,plan.task_name as taskName,plan.task_type_name
|
|
|
+ plan.task_change_notice_num as taskChangeNoticeNum,plan.plan_type as planType,u.name as checkerName,u2.name as creatorName,plan.task_name as taskName,plan.task_type_name,
|
|
|
+ pei.id planExtraInfoId,pei.operation_name operationName,pei.part_name partName,plan.product_scheduling_num,plan.num finishNum
|
|
|
from report r
|
|
|
left join product p on p.id=r.product_id
|
|
|
left join plan on plan.id=r.plan_id
|
|
|
+ left join plan_extra_info pei on pei.report_id=r.id
|
|
|
left join user u on r.checker_id=u.id
|
|
|
left join user u2 on r.creator_id=u2.id
|
|
|
where r.company_id=#{companyId} and r.user_procedure_team_id is null
|