From cb8863b06120bad212291e1426b4365042464c0d Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 15 Nov 2023 11:57:12 +0800 Subject: [PATCH] =?UTF-8?q?mes=E6=8A=A5=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/device/domain/EquOrderDetail.java | 12 ++++++------ .../service/impl/DeviceTaskServiceImpl.java | 10 +++++----- .../service/impl/EquUpkeepOrderServiceImpl.java | 2 +- .../mapper/device/EquOrderDetailMapper.xml | 16 ++++++++-------- .../mapper/device/EquOrderPersonMapper.xml | 2 +- .../mapper/device/EquOrderStandardMapper.xml | 6 +++--- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderDetail.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderDetail.java index 25b1ebec..4fb38077 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderDetail.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderDetail.java @@ -53,7 +53,7 @@ public class EquOrderDetail extends BaseEntity { /** 工厂 */ @Excel(name = "工厂") - private String factroyCode; + private String factoryCode; /** 备用字段1 */ @Excel(name = "备用字段1") @@ -143,12 +143,12 @@ public class EquOrderDetail extends BaseEntity { public String getItemTypeName() { return itemTypeName; } - public void setFactroyCode(String factroyCode) { - this.factroyCode = factroyCode; + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; } - public String getFactroyCode() { - return factroyCode; + public String getFactoryCode() { + return factoryCode; } public void setAttr1(String attr1) { this.attr1 = attr1; @@ -191,7 +191,7 @@ public class EquOrderDetail extends BaseEntity { .append("itemMethod", getItemMethod()) .append("itemType", getItemType()) .append("itemTypeName", getItemTypeName()) - .append("factroyCode", getFactroyCode()) + .append("factoryCode", getFactoryCode()) .append("attr1", getAttr1()) .append("attr2", getAttr2()) .append("attr3", getAttr3()) diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java index 187dd8cd..4995ad55 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java @@ -141,7 +141,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { order.setOrderCode(orderCode); /**equ_order**/ sce = equOrderMapper.insertEquOrder(order); - System.out.println("========equ_order:"+sce); + System.out.println(plan.getPlanCode()+"========equ_order:"+sce); /**equ_plan_equ->equ_order_equ*************************************************************/ EquPlanEqu equPlanEqu = new EquPlanEqu(); @@ -160,7 +160,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { equ.setCode(orderCode); } sce = equOrderEquMapper.insertEquOrderEqus(equs); - System.out.println("========equ_order_equ:"+sce); + System.out.println(plan.getPlanCode()+"========equ_order_equ:"+sce); /**equ_plan_detail->equ_order_detail*******************************************************/ EquPlanDetail itqo = new EquPlanDetail(); itqo.setParentCode(plan.getPlanEquId()); @@ -195,13 +195,13 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { itme.setParentCode(orderEquId); } sce = equOrderDetailMapper.insertEquOrderDetails(details); - System.out.println("========equ_order_detail:"+sce); + System.out.println(plan.getPlanCode()+"========equ_order_detail:"+sce); /**equ_plan_standard->equ_order_standard*******************************************************/ if(CollectionUtils.isEmpty(standards)){ return 0; } sce = equOrderStandardMapper.insertEquOrderStandards(standards); - System.out.println("========equ_order_detail:"+sce); + System.out.println(plan.getPlanCode()+"========equ_order_detail:"+sce); /**equ_plan_person->equ_order_standard*********************************************************/ EquPlanPerson equPlanPerson = new EquPlanPerson(); equPlanPerson.setPlanCode(plan.getPlanCode()); @@ -218,7 +218,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { person.setPlanCode(orderCode); } sce = equOrderPersonMapper.insertEquOrderPlans(persons); - System.out.println("========equ_order_standard:"+sce); + System.out.println(plan.getPlanCode()+"========equ_order_standard:"+sce); return sce; } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java index 06405fa3..82eeecfd 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java @@ -149,7 +149,7 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService { equOrderDetail.setId(IdUtils.fastSimpleUUID()); equOrderDetail.setOrderCode(equOrder.getOrderCode()); equOrderDetail.setParentCode(equ.getId()); - equOrderDetail.setFactroyCode(factory); + equOrderDetail.setFactoryCode(factory); equOrderDetail.setStandardList(orderStandardList); equOrderDetail.setCreateBy(SecurityContextHolder.getUserName()); equOrderDetail.setCreateTime(DateUtils.getNowDate()); diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml index c8aa7735..0371c3b6 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml @@ -14,7 +14,7 @@ - + @@ -27,7 +27,7 @@ select id, code, order_code, parent_code, item_code, item_name, item_method, - item_type, item_type_name, factroy_code, attr1, attr2, attr3, del_flag, + item_type, item_type_name, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_order_detail @@ -43,7 +43,7 @@ and item_method = #{itemMethod} and item_type = #{itemType} and item_type_name like concat('%', #{itemTypeName}, '%') - and factroy_code = #{factroyCode} + and factory_code = #{factoryCode} and attr1 = #{attr1} and attr2 = #{attr2} and attr3 = #{attr3} @@ -78,7 +78,7 @@ item_method, item_type, item_type_name, - factroy_code, + factory_code, attr1, attr2, attr3, @@ -98,7 +98,7 @@ #{itemMethod}, #{itemType}, #{itemTypeName}, - #{factroyCode}, + #{factoryCode}, #{attr1}, #{attr2}, #{attr3}, @@ -114,7 +114,7 @@ ( id, parent_code, item_code, item_name, item_method, - item_type, item_type_name, factroy_code, del_flag, + item_type, item_type_name, factory_code, del_flag, create_by, create_time ) VALUES @@ -122,7 +122,7 @@ ( #{item.id},#{item.parentCode}, #{item.itemCode},#{item.itemName},#{item.itemMethod}, - #{item.itemType},#{item.itemTypeName},#{item.factroyCode},#{item.delFlag}, + #{item.itemType},#{item.itemTypeName},#{item.factoryCode},#{item.delFlag}, #{item.createBy},#{item.createTime} ) @@ -140,7 +140,7 @@ item_method = #{itemMethod}, item_type = #{itemType}, item_type_name = #{itemTypeName}, - factroy_code = #{factroyCode}, + factory_code = #{factoryCode}, attr1 = #{attr1}, attr2 = #{attr2}, attr3 = #{attr3}, diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderPersonMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderPersonMapper.xml index 5228e24e..5c90ada4 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderPersonMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderPersonMapper.xml @@ -92,7 +92,7 @@ ( #{item.id},#{item.planCode}, - #{item.userId},#{item.userName},#{item.factroyCode}, + #{item.userId},#{item.userName},#{item.factoryCode}, #{item.delFlag},#{item.createBy},#{item.createTime} ) diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml index f42fe5c7..0d563af3 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml @@ -160,14 +160,14 @@ insert into equ_order_standard( id, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit,detail_unit, - factory_code,del_flag, create_by, create_time,fault_type + factory_code,del_flag, create_by, create_time ) VALUES ( #{item.id},#{item.parentCode},#{item.planCode},#{item.standardType},#{item.standardName}, #{item.detailUpLimit},#{item.detailDownLimit},#{item.detailUnit}, - #{item.factroyCode},#{item.delFlag},#{item.createBy},#{item.createTime} + #{item.factoryCode},#{item.delFlag},#{item.createBy},#{item.createTime} ) @@ -236,4 +236,4 @@ and eos.error_flag = '1' - \ No newline at end of file +