手持接口-巡检工单

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);
+    }
+}

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

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<EquOrderEqu> equList;
-
 	private String planName;
 
 	private String workCenterName;
 
 	private List<Date> timeArray;
 
+	private List<SysUser> 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<SysUser> getPersonList() {
+		return personList;
+	}
+
+	public void setPersonList(List<SysUser> personList) {
+		this.personList = personList;
+	}
+
 	public List<Date> getTimeArray() {
 		return timeArray;
 	}
@@ -150,14 +179,6 @@ public class EquOrder extends BaseEntity {
 		this.planName = planName;
 	}
 
-	public List<EquOrderEqu> getEquList() {
-		return equList;
-	}
-
-	public void setEquList(List<EquOrderEqu> equList) {
-		this.equList = equList;
-	}
-
 	public void setOrderId(String orderId) {
 		this.orderId = orderId;
 	}

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;
     }

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<EquOrderEqu> selectEquOrderEquListByParentCode(String orderCode);
+    EquOrderEqu selectEquOrderEquListByParentCode(String orderCode);
 }

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<EquOrder> selectTodayTask(int userId);
+
+	/**
+	 * 获取巡检记录
+	 * @param userId
+	 * @return
+	 */
+	List<EquOrder> selectTaskRecord(int userId);
 }

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<String> selectEquOrderPersonByOrderCode(String orderCode);
 }

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<SysUser> 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);
 }

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);
+}

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<EquOrder> orderList = equOrderMapper.selectTodayTask(userId);
+        return success(orderList);
+    }
+
+    /**
+     * 获取巡检记录
+     *
+     * @param userId
+     * @return
+     */
+    @Override
+    @DS("#header.poolName")
+    public AjaxResult getTaskRecord(int userId) {
+        List<EquOrder> orderList = equOrderMapper.selectTaskRecord(userId);
+        return success(orderList);
+    }
+
+    /**
+     * 获取任务详情
+     *
+     * @param equOrder
+     * @return
+     */
+    @Override
+    @DS("#header.poolName")
+    public AjaxResult getInspectionOrderInfo(EquOrder equOrder) {
+        List<EquOrder> orderList = equOrderMapper.selectEquOrderList(equOrder);
+        if (orderList.size() > 1) {
+            return error(500, "查询到多个任务详情！");
+        }
+        if (orderList.size() == 0) {
+            return error(500, "未查询到任务信息！");
+        }
+        EquOrder order = orderList.get(0);
+
+        List<Date> 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<EquOrderDetail> detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getCode());
+        for (EquOrderDetail detail : detailList) {
+            List<EquOrderStandard> standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getCode());
+            detail.setStandardList(standardList);
+        }
+        equ.setDetailList(detailList);
+
+        // 人员信息
+        List<String> users = equOrderPersonMapper.selectEquOrderPersonByOrderCode(order.getOrderCode());
+
+        List<SysUser> 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);
+    }
+}

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;
@@ -27,134 +28,141 @@ import static com.op.common.core.web.domain.AjaxResult.success;
  */
 @Service
 public class EquOrderServiceImpl implements IEquOrderService {
-	@Autowired
+    @Autowired
-	private EquOrderMapper equOrderMapper;
+    private EquOrderMapper equOrderMapper;
-	@Autowired
+    @Autowired
-	private EquOrderEquMapper equOrderEquMapper;
+    private EquOrderEquMapper equOrderEquMapper;
-	@Autowired
+    @Autowired
-	private EquOrderPersonMapper equOrderPersonMapper;
+    private EquOrderPersonMapper equOrderPersonMapper;
-	@Autowired
+    @Autowired
-	private EquOrderDetailMapper equOrderDetailMapper;
+    private EquOrderDetailMapper equOrderDetailMapper;
-	@Autowired
+    @Autowired
-	private EquOrderStandardMapper equOrderStandardMapper;
+    private EquOrderStandardMapper equOrderStandardMapper;
-
+    @Autowired
-	/**
+    private PersonMapper personMapper;
-	 * 查询计划工单
+
-	 * 
+    /**
-	 * @param orderCode 计划工单主键
+     * 查询计划工单
-	 * @return 计划工单
+     *
-	 */
+     * @param orderCode 计划工单主键
-	@Override
+     * @return 计划工单
-	@DS("#header.poolName")
+     */
-	public EquOrder selectEquOrderByOrderCode(String orderCode) {
+    @Override
-		// 查询工单信息
+    @DS("#header.poolName")
-		EquOrder order = equOrderMapper.selectEquOrderByOrderCode(orderCode);
+    public EquOrder selectEquOrderByOrderCode(String orderCode) {
-
+        // 查询工单信息
-		List<Date> timeArray = new ArrayList<>();
+        EquOrder order = equOrderMapper.selectEquOrderByOrderCode(orderCode);
-		timeArray.add(order.getOrderStart());
+
-		timeArray.add(order.getOrderEnd());
+        List<Date> timeArray = new ArrayList<>();
-		order.setTimeArray(timeArray);
+        timeArray.add(order.getOrderStart());
-
+        timeArray.add(order.getOrderEnd());
-		order.setPlanName(equOrderMapper.selectPlanNameByPlanCode(orderCode));
+        order.setTimeArray(timeArray);
-
+
-		order.setWorkCenterName(equOrderMapper.selectCenterNameByCenterCode(order.getPlanWorkshop()));
+        order.setPlanName(equOrderMapper.selectPlanNameByPlanCode(orderCode));
-
+
-		List<EquOrderEqu> equList = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderCode());
+        order.setWorkCenterName(equOrderMapper.selectCenterNameByCenterCode(order.getPlanWorkshop()));
-
+
-		for (EquOrderEqu equ : equList) {
+        EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderCode());
-			List<EquOrderDetail> detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getCode());
+
-			for (EquOrderDetail detail : detailList) {
+        List<EquOrderDetail> detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getCode());
-				List<EquOrderStandard> standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getCode());
+        for (EquOrderDetail detail : detailList) {
-				detail.setStandardList(standardList);
+            List<EquOrderStandard> standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getCode());
-			}
+            detail.setStandardList(standardList);
-			equ.setDetailList(detailList);
+        }
-		}
+        equ.setDetailList(detailList);
-
+
-		// TODO 人员信息
+        // 人员信息
-
+        List<String> users = equOrderPersonMapper.selectEquOrderPersonByOrderCode(orderCode);
-		order.setEquList(equList);
+
-
+        List<SysUser> personList = new ArrayList<>();
-		return order;
+
-	}
+        for (String id : users) {
-
+            personList.add(personMapper.selectSysUserByUserId(Long.valueOf(id)));
-	/**
+        }
-	 * 查询计划工单列表
+
-	 * 
+        order.setPersonList(personList);
-	 * @param equOrder 计划工单
+
-	 * @return 计划工单
+        order.setEqu(equ);
-	 */
+
-	@Override
+        return order;
-	@DS("#header.poolName")
+    }
-	public List<EquOrder> selectEquOrderList(EquOrder equOrder) {
+
-		return equOrderMapper.selectEquOrderList(equOrder);
+    /**
-	}
+     * 查询计划工单列表
-
+     *
-	/**
+     * @param equOrder 计划工单
-	 * 新增计划工单
+     * @return 计划工单
-	 * 
+     */
-	 * @param equOrder 计划工单
+    @Override
-	 * @return 结果
+    @DS("#header.poolName")
-	 */
+    public List<EquOrder> selectEquOrderList(EquOrder equOrder) {
-	@Override
+        return equOrderMapper.selectEquOrderList(equOrder);
-	@DS("#header.poolName")
+    }
-	public AjaxResult insertEquOrder(EquOrder equOrder) {
+
-		equOrder.setCreateTime(DateUtils.getNowDate());
+    /**
-		return success();
+     * 新增计划工单
-	}
+     *
-
+     * @param equOrder 计划工单
-	/**
+     * @return 结果
-	 * 修改计划工单
+     */
-	 * 
+    @Override
-	 * @param equOrder 计划工单
+    @DS("#header.poolName")
-	 * @return 结果
+    public AjaxResult insertEquOrder(EquOrder equOrder) {
-	 */
+        equOrder.setCreateTime(DateUtils.getNowDate());
-	@Override
+        return success();
-	@DS("#header.poolName")
+    }
-	public AjaxResult updateEquOrder(EquOrder equOrder) {
+
-		// 更新工单信息
+    /**
-		equOrder.setOrderStart(equOrder.getTimeArray().get(0));
+     * 修改计划工单
-		equOrder.setOrderEnd(equOrder.getTimeArray().get(1));
+     *
-		equOrder.setUpdateTime(DateUtils.getNowDate());
+     * @param equOrder 计划工单
-		equOrder.setUpdateBy(SecurityContextHolder.getUserName());
+     * @return 结果
-		equOrderMapper.updateEquOrder(equOrder);
+     */
-
+    @Override
-		// 更新标准信息
+    @DS("#header.poolName")
-		List<EquOrderEqu> equList = equOrder.getEquList();
+    public AjaxResult updateEquOrder(EquOrder equOrder) {
-		for (EquOrderEqu equ : equList) {
+        // 更新工单信息
-			List<EquOrderDetail> detailList = equ.getDetailList();
+        equOrder.setOrderStart(equOrder.getTimeArray().get(0));
-			for (EquOrderDetail detail : detailList) {
+        equOrder.setOrderEnd(equOrder.getTimeArray().get(1));
-				List<EquOrderStandard> standardList = detail.getStandardList();
+        equOrder.setUpdateTime(DateUtils.getNowDate());
-				for (EquOrderStandard standard : standardList) {
+        equOrder.setUpdateBy(SecurityContextHolder.getUserName());
-					standard.setUpdateBy(SecurityContextHolder.getUserName());
+        equOrderMapper.updateEquOrder(equOrder);
-					standard.setUpdateTime(DateUtils.getNowDate());
+
-					equOrderStandardMapper.updateEquOrderStandard(standard);
+        // 更新标准信息
-				}
+        EquOrderEqu equ = equOrder.getEqu();
-			}
+        List<EquOrderDetail> detailList = equ.getDetailList();
-		}
+        for (EquOrderDetail detail : detailList) {
-		return success();
+            List<EquOrderStandard> standardList = detail.getStandardList();
-	}
+            for (EquOrderStandard standard : standardList) {
-
+                standard.setUpdateBy(SecurityContextHolder.getUserName());
-	/**
+                standard.setUpdateTime(DateUtils.getNowDate());
-	 * 批量删除计划工单
+                equOrderStandardMapper.updateEquOrderStandard(standard);
-	 * 
+            }
-	 * @param orderIds 需要删除的计划工单主键
+        }
-	 * @return 结果
+        return success();
-	 */
+    }
-	@Override
+
-	@DS("#header.poolName")
+    /**
-	public int deleteEquOrderByOrderIds(String[] orderIds) {
+     * 批量删除计划工单
-		return equOrderMapper.deleteEquOrderByOrderIds(orderIds);
+     *
-	}
+     * @param orderIds 需要删除的计划工单主键
-
+     * @return 结果
-	/**
+     */
-	 * 删除计划工单信息
+    @Override
-	 * 
+    @DS("#header.poolName")
-	 * @param orderId 计划工单主键
+    public int deleteEquOrderByOrderIds(String[] orderIds) {
-	 * @return 结果
+        return equOrderMapper.deleteEquOrderByOrderIds(orderIds);
-	 */
+    }
-	@Override
+
-	@DS("#header.poolName")
+    /**
-	public int deleteEquOrderByOrderId(String orderId) {
+     * 删除计划工单信息
-		return equOrderMapper.deleteEquOrderByOrderId(orderId);
+     *
-	}
+     * @param orderId 计划工单主键
+     * @return 结果
+     */
+    @Override
+    @DS("#header.poolName")
+    public int deleteEquOrderByOrderId(String orderId) {
+        return equOrderMapper.deleteEquOrderByOrderId(orderId);
+    }
 }

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<SysUser> personList = sysUserMapper.selectSysUserList(sysUser);

op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml

@@ -70,6 +70,7 @@
 			<if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
 			<if test="updateTime != null "> and update_time = #{updateTime}</if>
 		</where>
+		and del_flag = '0'
 	</select>
 
 	<select id="selectEquOrderByOrderCode" parameterType="String" resultMap="EquOrderResult">
@@ -85,6 +86,20 @@
 		select workshop_name from base_equipment where del_flag = '0' and workshop_code = #{planWorkshop}
 	</select>
 
+	<select id="selectTodayTask" resultType="java.lang.Integer" resultMap="EquOrderResult">
+		<include refid="selectEquOrderVo"/>
+		where CONVERT(date,GETDATE()) > order_start and plan_type = 'inspection' and del_flag = '0' and order_status != '1' and order_code in (
+		select order_code from equ_order_person where del_flag = '0' and user_id = #{userId} GROUP BY order_code
+		)
+	</select>
+
+	<select id="selectTaskRecord" resultType="java.lang.Integer" resultMap="EquOrderResult">
+		<include refid="selectEquOrderVo"/>
+		where del_flag = '0' and order_status = '1' and order_code in (
+		select order_code from equ_order_person where del_flag = '0' and user_id = '12' GROUP BY order_code
+		)
+	</select>
+
 	<insert id="insertEquOrder" parameterType="EquOrder">
 		insert into equ_order
 		<trim prefix="(" suffix=")" suffixOverrides=",">

op-modules/op-device/src/main/resources/mapper/device/EquOrderPersonMapper.xml

@@ -42,6 +42,10 @@
         where id = #{id}
     </select>
 
+    <select id="selectEquOrderPersonByOrderCode" resultType="java.lang.String">
+        SELECT user_id FROM equ_order_person where order_code = #{orderCode}
+    </select>
+
     <insert id="insertEquOrderPerson" parameterType="EquOrderPerson">
         insert into equ_order_person
         <trim prefix="(" suffix=")" suffixOverrides=",">

op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml

@@ -26,10 +26,11 @@
         <result property="createTime"	column="create_time"	/>
         <result property="updateBy"	column="update_by"	/>
         <result property="updateTime"	column="update_time"	/>
+        <result property="picturePath"	column="picture_path"	/>
     </resultMap>
 
     <sql id="selectEquOrderStandardVo">
-        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
     </sql>
 
     <select id="selectEquOrderStandardList" parameterType="EquOrderStandard" resultMap="EquOrderStandardResult">
@@ -50,6 +51,7 @@
             <if test="attr1 != null  and attr1 != ''"> and attr1 = #{attr1}</if>
             <if test="attr2 != null  and attr2 != ''"> and attr2 = #{attr2}</if>
             <if test="attr3 != null  and attr3 != ''"> and attr3 = #{attr3}</if>
+            <if test="picturePath != null  and picturePath != ''"> and picture_path = #{picturePath}</if>
         </where>
     </select>
 
@@ -87,6 +89,7 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="picturePath != null">picture_path,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -110,6 +113,7 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="picturePath != null">#{picturePath},</if>
         </trim>
     </insert>
 
@@ -136,6 +140,7 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="picturePath != null">picture_path = #{picturePath},</if>
         </trim>
         where id = #{id}
     </update>