|
@@ -78,7 +78,7 @@
|
|
|
tbm.id id,tbm.model_no model_no, tbm.model_name model_name,tbm.initial_modulus initial_modulus,tbm.rfid rfid,tbm.creator_id creator_id,tbm.equipment_id equipment_id,
|
|
|
tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,tbco.company_name produceCompany,
|
|
|
tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.hill_number hillNumber,tbm.oc_cycle oc_cycle,tbp.manager_id managerId,
|
|
|
- tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbcom.company_name ownerCompanyName,tbm.run_times run_times
|
|
|
+ tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName,tbm.run_times run_times
|
|
|
from
|
|
|
tb_mould tbm
|
|
|
left join
|
|
@@ -96,10 +96,6 @@
|
|
|
tb_company tbco
|
|
|
on
|
|
|
tbco.id = tbm.produce_company_id
|
|
|
- left join
|
|
|
- tb_company tbcom
|
|
|
- on
|
|
|
- tbcom.id = tbm.company_id
|
|
|
<where>
|
|
|
<if test="userVO.parentId != 0">
|
|
|
tbm.company_id = #{userVO.companyId}
|
|
@@ -120,7 +116,7 @@
|
|
|
tbm.id id,tbm.model_no model_no, tbm.model_name model_name,tbm.initial_modulus initial_modulus,tbm.rfid rfid,tbp.manager_id managerId,tbm.equipment_id equipment_id,
|
|
|
tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,tbco.company_name produceCompany,
|
|
|
tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.hill_number hillNumber,tbm.oc_cycle oc_cycle,tbm.creator_id creator_id,
|
|
|
- tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbcom.company_name ownerCompanyName,tbm.run_times run_times
|
|
|
+ tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName,tbm.run_times run_times
|
|
|
from
|
|
|
tb_mould tbm
|
|
|
left join
|