diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java new file mode 100644 index 000000000..a1c14d221 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java @@ -0,0 +1,61 @@ +package com.op.device.controller; + +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquOrder; +import com.op.device.service.IDevicePDAService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * PDAController + * + * @author wws + * @date 2023-10-23 + */ +@RestController +@RequestMapping("/devicePDA") +public class DevicePDAController { + + @Autowired + private IDevicePDAService devicePDAService; + + /** + * 获取今日巡检任务工单list + * @param userId + * @return + */ + @GetMapping("/getTodayTask") + public AjaxResult getTodayTask(int userId) { + return devicePDAService.getTodayTask(userId); + } + + /** + * 获取巡检记录 + * @param userId + * @return + */ + @GetMapping("/getTaskRecord") + public AjaxResult getTaskRecord(int userId) { + return devicePDAService.getTaskRecord(userId); + } + + /** + * 获取任务详情 + * @param equOrder + * @return + */ + @PostMapping("/getInspectionOrderInfo") + public AjaxResult getInspectionOrderInfo(@RequestBody EquOrder equOrder) { + return devicePDAService.getInspectionOrderInfo(equOrder); + } + + /** + * 填写巡检记录工单 + * @param equOrder + * @return + */ + @PostMapping("/updateInspectionRecord") + public AjaxResult updateInspectionRecord(@RequestBody EquOrder equOrder) { + return devicePDAService.updateInspectionRecord(equOrder); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquOrderController.java index df48dfd1c..424ec8573 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquOrderController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquOrderController.java @@ -23,7 +23,7 @@ import com.op.common.core.utils.poi.ExcelUtil; import com.op.common.core.web.page.TableDataInfo; /** - * 计划工单Controller + * 巡检计划工单Controller * * @author wws * @date 2023-10-23 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 2ea8e17c4..3c894303b 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 @@ -5,6 +5,7 @@ import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.system.api.domain.SysUser; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.op.common.core.annotation.Excel; @@ -118,14 +119,42 @@ public class EquOrder extends BaseEntity { @Excel(name = "删除标志") private String delFlag; - private List equList; - private String planName; private String workCenterName; private List timeArray; + private List personList; + + private boolean overdue; + + private EquOrderEqu equ; + + public EquOrderEqu getEqu() { + return equ; + } + + public void setEqu(EquOrderEqu equ) { + this.equ = equ; + } + + public boolean isOverdue() { + return overdue; + } + + public void setOverdue(boolean overdue) { + this.overdue = overdue; + } + + public List getPersonList() { + return personList; + } + + public void setPersonList(List personList) { + this.personList = personList; + } + public List getTimeArray() { return timeArray; } @@ -150,14 +179,6 @@ public class EquOrder extends BaseEntity { this.planName = planName; } - public List getEquList() { - return equList; - } - - public void setEquList(List equList) { - this.equList = equList; - } - public void setOrderId(String orderId) { this.orderId = orderId; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java index 441fc9cae..7ef078b52 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrderStandard.java @@ -81,6 +81,17 @@ public class EquOrderStandard extends BaseEntity { /** 删除标识 */ private String delFlag; + // 图片路径 + private String picturePath; + + public String getPicturePath() { + return picturePath; + } + + public void setPicturePath(String picturePath) { + this.picturePath = picturePath; + } + public void setId(String id) { this.id = id; } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquMapper.java index 6ab3abcac..19802e6f3 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquMapper.java @@ -60,9 +60,9 @@ public interface EquOrderEquMapper { public int deleteEquOrderEquByIds(String[] ids); /** - * 通过parentCode查询list + * 通过parentCode查询设备信息 * @param orderCode * @return */ - List selectEquOrderEquListByParentCode(String orderCode); + EquOrderEqu selectEquOrderEquListByParentCode(String orderCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java index 11fe5c8df..ed69a3392 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java @@ -72,4 +72,17 @@ public interface EquOrderMapper { * @return */ String selectCenterNameByCenterCode(String planWorkshop); + + /** + * 获取今日巡检工单list + * @return + */ + List selectTodayTask(int userId); + + /** + * 获取巡检记录 + * @param userId + * @return + */ + List selectTaskRecord(int userId); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderPersonMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderPersonMapper.java index e581a8a39..214e90019 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderPersonMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderPersonMapper.java @@ -58,4 +58,11 @@ public interface EquOrderPersonMapper { * @return 结果 */ public int deleteEquOrderPersonByIds(String[] ids); + + /** + * 通过工单code查询用户ids + * @param orderCode + * @return + */ + List selectEquOrderPersonByOrderCode(String orderCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/PersonMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/PersonMapper.java index 9b3488f59..52d21b237 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/PersonMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/PersonMapper.java @@ -1,5 +1,6 @@ package com.op.device.mapper; +import com.baomidou.dynamic.datasource.annotation.DS; import com.op.system.api.domain.SysUser; import java.util.List; @@ -17,6 +18,7 @@ public interface PersonMapper { * @param userId 用户信息主键 * @return 用户信息 */ + @DS("#master") public SysUser selectSysUserByUserId(Long userId); /** @@ -25,6 +27,7 @@ public interface PersonMapper { * @param sysUser 用户信息 * @return 用户信息集合 */ + @DS("#master") public List selectSysUserList(SysUser sysUser); /** @@ -33,6 +36,7 @@ public interface PersonMapper { * @param sysUser 用户信息 * @return 结果 */ + @DS("#master") public int insertSysUser(SysUser sysUser); /** @@ -41,6 +45,7 @@ public interface PersonMapper { * @param sysUser 用户信息 * @return 结果 */ + @DS("#master") public int updateSysUser(SysUser sysUser); /** @@ -49,6 +54,7 @@ public interface PersonMapper { * @param userId 用户信息主键 * @return 结果 */ + @DS("#master") public int deleteSysUserByUserId(Long userId); /** @@ -57,5 +63,6 @@ public interface PersonMapper { * @param userIds 需要删除的数据主键集合 * @return 结果 */ + @DS("#master") public int deleteSysUserByUserIds(Long[] userIds); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java new file mode 100644 index 000000000..f4782cc4b --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java @@ -0,0 +1,40 @@ +package com.op.device.service; + +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquOrder; + +/** + * PDAService + * + * @author wws + * @date 2023-10-23 + */ +public interface IDevicePDAService { + + /** + * 获取今日巡检任务工单list + * @return + */ + AjaxResult getTodayTask(int userId); + + /** + * 获取巡检记录 + * @param userId + * @return + */ + AjaxResult getTaskRecord(int userId); + + /** + * 获取任务详情 + * @param equOrder + * @return + */ + AjaxResult getInspectionOrderInfo(EquOrder equOrder); + + /** + * 填写巡检记录工单 + * @param equOrder + * @return + */ + AjaxResult updateInspectionRecord(EquOrder 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 new file mode 100644 index 000000000..7469adbb8 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -0,0 +1,132 @@ +package com.op.device.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquOrder; +import com.op.device.domain.EquOrderDetail; +import com.op.device.domain.EquOrderEqu; +import com.op.device.domain.EquOrderStandard; +import com.op.device.mapper.*; +import com.op.device.service.IDevicePDAService; +import com.op.system.api.domain.SysUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import static com.op.common.core.web.domain.AjaxResult.error; +import static com.op.common.core.web.domain.AjaxResult.success; + +/** + * PDAService实现类 + * + * @author wws + * @date 2023-10-23 + */ +@Service +public class DevicePDAServiceImpl implements IDevicePDAService { + + @Autowired + private EquOrderMapper equOrderMapper; + @Autowired + private EquOrderEquMapper equOrderEquMapper; + @Autowired + private EquOrderDetailMapper equOrderDetailMapper; + @Autowired + private EquOrderStandardMapper equOrderStandardMapper; + @Autowired + private EquOrderPersonMapper equOrderPersonMapper; + @Autowired + private PersonMapper personMapper; + + + /** + * 获取今日巡检任务工单list + * + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult getTodayTask(int userId) { + List orderList = equOrderMapper.selectTodayTask(userId); + return success(orderList); + } + + /** + * 获取巡检记录 + * + * @param userId + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult getTaskRecord(int userId) { + List orderList = equOrderMapper.selectTaskRecord(userId); + return success(orderList); + } + + /** + * 获取任务详情 + * + * @param equOrder + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult getInspectionOrderInfo(EquOrder equOrder) { + List orderList = equOrderMapper.selectEquOrderList(equOrder); + if (orderList.size() > 1) { + return error(500, "查询到多个任务详情！"); + } + if (orderList.size() == 0) { + return error(500, "未查询到任务信息！"); + } + EquOrder order = orderList.get(0); + + List timeArray = new ArrayList<>(); + timeArray.add(order.getOrderStart()); + timeArray.add(order.getOrderEnd()); + order.setTimeArray(timeArray); + + order.setPlanName(equOrderMapper.selectPlanNameByPlanCode(order.getOrderCode())); + + order.setWorkCenterName(equOrderMapper.selectCenterNameByCenterCode(order.getPlanWorkshop())); + + EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderCode()); + + List detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getCode()); + for (EquOrderDetail detail : detailList) { + List standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getCode()); + detail.setStandardList(standardList); + } + equ.setDetailList(detailList); + + // 人员信息 + List users = equOrderPersonMapper.selectEquOrderPersonByOrderCode(order.getOrderCode()); + + List personList = new ArrayList<>(); + + for (String id : users) { + personList.add(personMapper.selectSysUserByUserId(Long.valueOf(id))); + } + + order.setPersonList(personList); + + order.setEqu(equ); + + return success(order); + } + + /** + * TODO 填写巡检记录工单 + * @param equOrder + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult updateInspectionRecord(EquOrder equOrder) { + return success(equOrder); + } +} 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 12e6ca4fd..830b1209c 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 @@ -12,6 +12,7 @@ import com.op.device.domain.EquOrderDetail; import com.op.device.domain.EquOrderEqu; import com.op.device.domain.EquOrderStandard; import com.op.device.mapper.*; +import com.op.system.api.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.device.domain.EquOrder; @@ -21,140 +22,147 @@ import static com.op.common.core.web.domain.AjaxResult.success; /** * 计划工单Service业务层处理 - * + * * @author wws * @date 2023-10-23 */ @Service public class EquOrderServiceImpl implements IEquOrderService { - @Autowired - private EquOrderMapper equOrderMapper; - @Autowired - private EquOrderEquMapper equOrderEquMapper; - @Autowired - private EquOrderPersonMapper equOrderPersonMapper; - @Autowired - private EquOrderDetailMapper equOrderDetailMapper; - @Autowired - private EquOrderStandardMapper equOrderStandardMapper; + @Autowired + private EquOrderMapper equOrderMapper; + @Autowired + private EquOrderEquMapper equOrderEquMapper; + @Autowired + private EquOrderPersonMapper equOrderPersonMapper; + @Autowired + private EquOrderDetailMapper equOrderDetailMapper; + @Autowired + private EquOrderStandardMapper equOrderStandardMapper; + @Autowired + private PersonMapper personMapper; - /** - * 查询计划工单 - * - * @param orderCode 计划工单主键 - * @return 计划工单 - */ - @Override - @DS("#header.poolName") - public EquOrder selectEquOrderByOrderCode(String orderCode) { - // 查询工单信息 - EquOrder order = equOrderMapper.selectEquOrderByOrderCode(orderCode); + /** + * 查询计划工单 + * + * @param orderCode 计划工单主键 + * @return 计划工单 + */ + @Override + @DS("#header.poolName") + public EquOrder selectEquOrderByOrderCode(String orderCode) { + // 查询工单信息 + EquOrder order = equOrderMapper.selectEquOrderByOrderCode(orderCode); - List timeArray = new ArrayList<>(); - timeArray.add(order.getOrderStart()); - timeArray.add(order.getOrderEnd()); - order.setTimeArray(timeArray); + List timeArray = new ArrayList<>(); + timeArray.add(order.getOrderStart()); + timeArray.add(order.getOrderEnd()); + order.setTimeArray(timeArray); - order.setPlanName(equOrderMapper.selectPlanNameByPlanCode(orderCode)); + order.setPlanName(equOrderMapper.selectPlanNameByPlanCode(orderCode)); - order.setWorkCenterName(equOrderMapper.selectCenterNameByCenterCode(order.getPlanWorkshop())); + order.setWorkCenterName(equOrderMapper.selectCenterNameByCenterCode(order.getPlanWorkshop())); - List equList = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderCode()); + EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderCode()); - for (EquOrderEqu equ : equList) { - List detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getCode()); - for (EquOrderDetail detail : detailList) { - List standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getCode()); - detail.setStandardList(standardList); - } - equ.setDetailList(detailList); - } + List detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getCode()); + for (EquOrderDetail detail : detailList) { + List standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getCode()); + detail.setStandardList(standardList); + } + equ.setDetailList(detailList); - // TODO 人员信息 + // 人员信息 + List users = equOrderPersonMapper.selectEquOrderPersonByOrderCode(orderCode); - order.setEquList(equList); + List personList = new ArrayList<>(); - return order; - } + for (String id : users) { + personList.add(personMapper.selectSysUserByUserId(Long.valueOf(id))); + } - /** - * 查询计划工单列表 - * - * @param equOrder 计划工单 - * @return 计划工单 - */ - @Override - @DS("#header.poolName") - public List selectEquOrderList(EquOrder equOrder) { - return equOrderMapper.selectEquOrderList(equOrder); - } + order.setPersonList(personList); - /** - * 新增计划工单 - * - * @param equOrder 计划工单 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public AjaxResult insertEquOrder(EquOrder equOrder) { - equOrder.setCreateTime(DateUtils.getNowDate()); - return success(); - } + order.setEqu(equ); - /** - * 修改计划工单 - * - * @param equOrder 计划工单 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public AjaxResult updateEquOrder(EquOrder equOrder) { - // 更新工单信息 - equOrder.setOrderStart(equOrder.getTimeArray().get(0)); - equOrder.setOrderEnd(equOrder.getTimeArray().get(1)); - equOrder.setUpdateTime(DateUtils.getNowDate()); - equOrder.setUpdateBy(SecurityContextHolder.getUserName()); - equOrderMapper.updateEquOrder(equOrder); + return order; + } - // 更新标准信息 - List equList = equOrder.getEquList(); - for (EquOrderEqu equ : equList) { - List detailList = equ.getDetailList(); - for (EquOrderDetail detail : detailList) { - List standardList = detail.getStandardList(); - for (EquOrderStandard standard : standardList) { - standard.setUpdateBy(SecurityContextHolder.getUserName()); - standard.setUpdateTime(DateUtils.getNowDate()); - equOrderStandardMapper.updateEquOrderStandard(standard); - } - } - } - return success(); - } + /** + * 查询计划工单列表 + * + * @param equOrder 计划工单 + * @return 计划工单 + */ + @Override + @DS("#header.poolName") + public List selectEquOrderList(EquOrder equOrder) { + return equOrderMapper.selectEquOrderList(equOrder); + } - /** - * 批量删除计划工单 - * - * @param orderIds 需要删除的计划工单主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteEquOrderByOrderIds(String[] orderIds) { - return equOrderMapper.deleteEquOrderByOrderIds(orderIds); - } + /** + * 新增计划工单 + * + * @param equOrder 计划工单 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult insertEquOrder(EquOrder equOrder) { + equOrder.setCreateTime(DateUtils.getNowDate()); + return success(); + } - /** - * 删除计划工单信息 - * - * @param orderId 计划工单主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteEquOrderByOrderId(String orderId) { - return equOrderMapper.deleteEquOrderByOrderId(orderId); - } + /** + * 修改计划工单 + * + * @param equOrder 计划工单 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult updateEquOrder(EquOrder equOrder) { + // 更新工单信息 + equOrder.setOrderStart(equOrder.getTimeArray().get(0)); + equOrder.setOrderEnd(equOrder.getTimeArray().get(1)); + equOrder.setUpdateTime(DateUtils.getNowDate()); + equOrder.setUpdateBy(SecurityContextHolder.getUserName()); + equOrderMapper.updateEquOrder(equOrder); + + // 更新标准信息 + EquOrderEqu equ = equOrder.getEqu(); + List detailList = equ.getDetailList(); + for (EquOrderDetail detail : detailList) { + List standardList = detail.getStandardList(); + for (EquOrderStandard standard : standardList) { + standard.setUpdateBy(SecurityContextHolder.getUserName()); + standard.setUpdateTime(DateUtils.getNowDate()); + equOrderStandardMapper.updateEquOrderStandard(standard); + } + } + return success(); + } + + /** + * 批量删除计划工单 + * + * @param orderIds 需要删除的计划工单主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquOrderByOrderIds(String[] orderIds) { + return equOrderMapper.deleteEquOrderByOrderIds(orderIds); + } + + /** + * 删除计划工单信息 + * + * @param orderId 计划工单主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquOrderByOrderId(String orderId) { + return equOrderMapper.deleteEquOrderByOrderId(orderId); + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java index 105743ce9..898437ca1 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java @@ -269,7 +269,6 @@ public class EquPlanServiceImpl implements IEquPlanService { * @return */ @Override - @DS("#master") public AjaxResult getPersonList() { SysUser sysUser = new SysUser(); List personList = sysUserMapper.selectSysUserList(sysUser); 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 cfb3f5673..331e1b559 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 @@ -70,6 +70,7 @@ and update_by like concat('%', #{updateBy}, '%') and update_time = #{updateTime} + and del_flag = '0' + + + + insert into equ_order 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 de9ebcc19..cfea1d7ef 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 @@ -42,6 +42,10 @@ where id = #{id} + + insert into equ_order_person 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 c7217926c..bbe4b54f0 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 @@ -26,10 +26,11 @@ + - select id, code, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, detail_reach, actual_value, detail_error, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_order_standard + select id, code, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, detail_reach, actual_value, detail_error, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,picture_path from equ_order_standard @@ -87,6 +89,7 @@ create_time, update_by, update_time, + picture_path, #{id}, @@ -110,6 +113,7 @@ #{createTime}, #{updateBy}, #{updateTime}, + #{picturePath}, @@ -136,6 +140,7 @@ create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + picture_path = #{picturePath}, where id = #{id}