From fe306c43a7223edc60eb941ffd76d136716821e1 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Thu, 4 Jul 2024 18:05:32 +0800 Subject: [PATCH] =?UTF-8?q?2024-07-04=20=E8=AE=BE=E5=A4=87-=E7=82=B9?= =?UTF-8?q?=E6=A3=80=E3=80=81=E5=B7=A1=E6=A3=80=E3=80=81=E4=BF=9D=E5=85=BB?= =?UTF-8?q?=E3=80=81=E7=BB=B4=E4=BF=AE-=E6=A3=80=E6=9F=A5=E4=BA=BA?= =?UTF-8?q?=E5=A7=93=E5=90=8D+=E6=A3=80=E6=9F=A5=E4=BA=BA=E5=B7=A5?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/device/domain/EquOrder.java | 15 ++++++++ .../op/device/domain/EquRepairWorkOrder.java | 12 ++++++- .../mapper/device/EquOrderMapper.xml | 36 +++++++++++++------ .../device/EquRepairWorkOrderMapper.xml | 14 +++++--- 4 files changed, 62 insertions(+), 15 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java index f25eba5a..eaa4faa1 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java @@ -126,6 +126,12 @@ public class EquOrder extends BaseEntity { @Excel(name = "责任人") private String planPerson; + /** + * 责任人姓名 + */ + @Excel(name = "责任人姓名") + private String planPersonName; + /** * 工单用时 */ @@ -678,6 +684,14 @@ public class EquOrder extends BaseEntity { return planPerson; } + public void setPlanPersonName(String planPersonName) { + this.planPersonName = planPersonName; + } + + public String getPlanPersonName() { + return planPersonName; + } + public void setOrderCostTime(String orderCostTime) { this.orderCostTime = orderCostTime; } @@ -796,6 +810,7 @@ public class EquOrder extends BaseEntity { .append("orderStatus", getOrderStatus()) .append("orderCost", getOrderCost()) .append("planPerson", getPlanPerson()) + .append("planPersonName", getPlanPersonName()) .append("orderCostTime", getOrderCostTime()) .append("orderSignPerson", getOrderSignPerson()) .append("factoryCode", getFactoryCode()) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java index 79add390..0bddf977 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java @@ -46,9 +46,12 @@ public class EquRepairWorkOrder extends BaseEntity { @Excel(name = "关联计划") private String orderRelevance; - @Excel(name = "维修人员") + @Excel(name = "维修人员工号") private String workPerson; + @Excel(name = "维修人员姓名") + private String workPersonName; + @Excel(name = "维修组") private String workTeam; @@ -392,6 +395,13 @@ public class EquRepairWorkOrder extends BaseEntity { return workPerson; } + public void setWorkPersonName(String workPersonName) { + this.workPersonName = workPersonName; + } + public String getWorkPersonName() { + return workPersonName; + } + public void setWorkTeam(String workTeam) { this.workTeam = workTeam; } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index eeb2c007..c0b2de83 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -22,6 +22,7 @@ + @@ -54,7 +55,7 @@ select order_id, plan_id, plan_code, plan_type, order_code, plan_workshop, plan_prod_line, plan_loop, plan_loop_type, plan_loop_start, plan_loop_end, order_start, order_end, equipment_code, order_status, - order_cost, plan_person, order_cost_time, order_sign_person, + order_cost, plan_person, plan_person_name, order_cost_time, order_sign_person, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,upkeep,calculation_rule,shut_down,order_inspect,repair_code,work_code,outsource_code from equ_order @@ -79,6 +80,7 @@ eo.order_status, eo.order_cost, eo.plan_person, + eo.plan_person_name, eo.order_cost_time, eo.order_sign_person, eo.factory_code, @@ -120,6 +122,7 @@ and eo.order_status = #{orderStatus} and eo.order_cost = #{orderCost} and eo.plan_person like concat('%', #{planPerson}, '%') + and eo.plan_person_name like concat('%', #{planPersonName}, '%') and eo.order_cost_time = #{orderCostTime} and eo.order_sign_person = #{orderSignPerson} and eo.factory_code = #{factoryCode} @@ -198,6 +201,7 @@ eo.order_status, eo.order_cost, eo.plan_person, + eo.plan_person_name, eo.order_cost_time, eo.order_sign_person, eo.factory_code, @@ -219,14 +223,18 @@ be.equipment_name from equ_order eo left join base_equipment be on eo.equipment_code = be.equipment_code - where eo.plan_type = #{planType} - and eo.del_flag = '0' - and eo.order_status != '1' - and eo.order_code in (select order_code + + CONVERT(date,eo.create_time) = CONVERT(date,GETDATE()) + CONVERT(date,eo.create_time) = #{createTime} + and eo.plan_type = #{planType} + and eo.del_flag = '0' + and eo.order_status != '1' + and eo.order_code in (select order_code from equ_order_person where del_flag = '0' and user_name = #{userId} GROUP BY order_code) + order by eo.plan_loop_type, eo.plan_loop, eo.create_time desc, eo.equipment_code @@ -248,6 +256,7 @@ eo.order_status, eo.order_cost, eo.plan_person, + eo.plan_person_name, eo.order_cost_time, eo.order_sign_person, eo.factory_code, @@ -269,14 +278,18 @@ be.equipment_name from equ_order eo left join base_equipment be on eo.equipment_code = be.equipment_code - where eo.del_flag = '0' - and eo.order_status = '1' - and eo.plan_type = #{planType} - and eo.plan_person = #{userId} - and eo.order_code in (select order_code + + CONVERT(date,eo.create_time) = CONVERT(date,GETDATE()) + and CONVERT(date,eo.create_time) = #{createTime} + and eo.del_flag = '0' + and eo.order_status = '1' + and eo.plan_type = #{planType} + and eo.plan_person = #{userId} + and eo.order_code in (select order_code from equ_order_person where del_flag = '0' and user_name = #{userId} GROUP BY order_code) + order by eo.update_time desc @@ -304,6 +317,7 @@ order_status, order_cost, plan_person, + plan_person_name, order_cost_time, order_sign_person, factory_code, @@ -343,6 +357,7 @@ #{orderStatus}, #{orderCost}, #{planPerson}, + #{planPersonName}, #{orderCostTime}, #{orderSignPerson}, #{factoryCode}, @@ -384,6 +399,7 @@ order_status = #{orderStatus}, order_cost = #{orderCost}, plan_person = #{planPerson}, + plan_person_name = #{planPersonName}, order_cost_time = #{orderCostTime}, order_sign_person = #{orderSignPerson}, factory_code = #{factoryCode}, diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml index c36427d8..961bc09e 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml @@ -16,6 +16,7 @@ + @@ -91,7 +92,7 @@ - select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code , fault_type , equipment_status_description , repair_measures , fault_down_time , fault_start_time ,result_inspect from equ_repair_work_order + select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code , fault_type , equipment_status_description , repair_measures , fault_down_time , fault_start_time ,result_inspect,work_person_name from equ_repair_work_order