From 32c08aaec546f742ce24e10fa418c849338919b9 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Tue, 14 Nov 2023 15:15:40 +0800 Subject: [PATCH 1/2] 1 --- .../op/device/mapper/EquOrderStandardMapper.java | 6 ------ .../service/impl/DevicePDAServiceImpl.java | 5 ++++- .../device/service/impl/EquOrderServiceImpl.java | 6 +++++- .../resources/mapper/device/EquOrderMapper.xml | 7 ++++++- .../mapper/device/EquOrderStandardMapper.xml | 16 ---------------- 5 files changed, 15 insertions(+), 25 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java index b1ef62a5..6cdc4f1f 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java @@ -68,12 +68,6 @@ public interface EquOrderStandardMapper { */ List selectEquOrderStandardByParentCode(String code); - /** - * 图片数据绑定 - * @param files - */ - void insertBaseFileBatch(List files); - /** * 手持维修工单关联检查项信息 * @param equOrder diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index 37d7f0a8..3a29211e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -62,6 +62,8 @@ public class DevicePDAServiceImpl implements IDevicePDAService { private EquEquipmentMapper equEquipmentMapper; @Autowired private EquSpareApplyMapper equSpareApplyMapper; + @Autowired + private EquFileMapper equFileMapper; /** @@ -186,9 +188,10 @@ public class DevicePDAServiceImpl implements IDevicePDAService { file.setSourceId(standard.getId()); file.setCreateBy(SecurityUtils.getUsername()); file.setCreateTime(new Date()); + file.setImageType("3"); files.add(file); } - equOrderStandardMapper.insertBaseFileBatch(files); + equFileMapper.insertEquFileBatch(files); } // 校验标准信息-是否申请报修 diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java index 8ee805c8..d3d86bc4 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.context.SecurityContextHolder; import com.op.common.core.domain.BaseFileData; @@ -50,6 +51,8 @@ public class EquOrderServiceImpl implements IEquOrderService { private EquOrderEquSpareMapper equOrderEquSpareMapper; @Autowired private EquRepairOrderMapper equRepairOrderMapper; + @Autowired + private EquFileMapper equFileMapper; /** * 查询计划工单 @@ -178,9 +181,10 @@ public class EquOrderServiceImpl implements IEquOrderService { file.setSourceId(standard.getId()); file.setCreateBy(SecurityUtils.getUsername()); file.setCreateTime(new Date()); + file.setImageType("3"); files.add(file); } - equOrderStandardMapper.insertBaseFileBatch(files); + equFileMapper.insertEquFileBatch(files); } // 校验标准信息-是否申请报修 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 9ac2d48b..0d6c7009 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 @@ -39,10 +39,11 @@ + - 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, 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 from equ_order + 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, 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,plan_restrict from equ_order