|
|
@@ -23,7 +23,7 @@
|
|
|
|
|
|
|
|
|
<select id="getReportForWorkList" resultType="java.util.HashMap" >
|
|
|
- SELECT a.*, plan_procedure_total.plan_id, prod_procedure_id.prod_procedure_id, date_format(plan.`start_date`,'%Y-%m-%d') as start_date, date_format(plan.`end_date`,'%Y-%m-%d') as end_date, plan.`plan_type`, plan.`product_scheduling_num`,plan.task_type_name,plan.task_name,plan.task_change_notice_num,
|
|
|
+ SELECT a.*, plan_procedure_total.plan_id, plan_procedure_total.prod_procedure_id, date_format(plan.`start_date`,'%Y-%m-%d') as start_date, date_format(plan.`end_date`,'%Y-%m-%d') as end_date, plan.`plan_type`, plan.`product_scheduling_num`,plan.task_type_name,plan.task_name,plan.task_change_notice_num,
|
|
|
product.`name` AS product_name,prod_procedure.name AS procedure_name, prod_procedure.check_type
|
|
|
FROM prod_procedure_team a
|
|
|
left join plan_procedure_total on plan_procedure_total.id = a.plan_procedure_id
|
|
|
@@ -35,7 +35,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="getFillProcedureDetail" resultType="java.util.HashMap" >
|
|
|
- SELECT a.*, plan_procedure_total.plan_id, prod_procedure_id.prod_procedure_id, date_format(plan.`start_date`,'%Y-%m-%d') as start_date, date_format(plan.`end_date`,'%Y-%m-%d') as end_date, plan.`plan_type`, plan.`product_scheduling_num`,plan.task_type_name,plan.task_name,plan.task_change_notice_num,
|
|
|
+ SELECT a.*, plan_procedure_total.plan_id, plan_procedure_total.prod_procedure_id, date_format(plan.`start_date`,'%Y-%m-%d') as start_date, date_format(plan.`end_date`,'%Y-%m-%d') as end_date, plan.`plan_type`, plan.`product_scheduling_num`,plan.task_type_name,plan.task_name,plan.task_change_notice_num,
|
|
|
product.`name` AS product_name,prod_procedure.name AS procedure_name, prod_procedure.check_type,plan.station_id
|
|
|
FROM prod_procedure_team a
|
|
|
left join plan_procedure_total on plan_procedure_total.id = a.plan_procedure_id
|
