drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.java
@@ -17,6 +17,7 @@ package org.sxkj.gd.workorder.mapper; import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity; import org.sxkj.gd.workorder.entity.GdWorkOrderEntity; import org.sxkj.gd.workorder.param.GdPatrolTaskPageParam; import org.sxkj.gd.workorder.vo.GdPatrolTaskVO; import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel; @@ -39,6 +40,7 @@ * * @param page * @param gdPatrolTask * @param deptIdList * @return */ List<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage page, GdPatrolTaskPageParam gdPatrolTask, List<Long> deptIdList); @@ -52,4 +54,11 @@ */ List<GdPatrolTaskExcel> exportGdPatrolTask(@Param("ew") Wrapper<GdPatrolTaskEntity> queryWrapper); /** * 更新工单状态 * * @param workOrderParam 工单实体 * @return 更新影响行数 */ Integer updateWorkOrderById(@Param("workOrderParam") GdWorkOrderEntity workOrderParam); } drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
@@ -72,4 +72,21 @@ SELECT * FROM ja_gd_patrol_task ${ew.customSqlSegment} </select> <!-- 自定义更新工单状态语句 --> <update id="updateWorkOrderById" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity"> UPDATE ja_gd_work_order <set> <if test="workOrderParam.workOrderStatus != null"> work_order_status = #{workOrderParam.workOrderStatus}, </if> <if test="workOrderParam.updateUser != null"> update_user = #{workOrderParam.updateUser}, </if> <if test="workOrderParam.updateTime != null"> update_time = #{workOrderParam.updateTime}, </if> </set> WHERE id = #{workOrderParam.id} </update> </mapper> drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
@@ -58,8 +58,8 @@ @Autowired private IGdWorkOrderFlowService gdWorkOrderFlowService; @Autowired private IGdWorkOrderService gdWorkOrderService; // @Autowired // private IGdWorkOrderService gdWorkOrderService; @Override public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask, List<Long> deptIdList) { @@ -198,8 +198,8 @@ GdWorkOrderEntity gdWorkOrderEntity = new GdWorkOrderEntity(); gdWorkOrderEntity.setId(task.getWorkOrderId()); gdWorkOrderEntity.setWorkOrderStatus(WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED.getCode()); boolean b1 = gdWorkOrderService.updateById(gdWorkOrderEntity); if (b1) { Integer b1 = baseMapper.updateWorkOrderById(gdWorkOrderEntity); if (b1 > 0) { // 6. 保存流转记录：使用枚举设置flowName GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity(); flowEntity.setCreateUser(AuthUtil.getUserId()); @@ -218,8 +218,8 @@ GdWorkOrderEntity gdWorkOrderEntity = new GdWorkOrderEntity(); gdWorkOrderEntity.setId(task.getWorkOrderId()); gdWorkOrderEntity.setWorkOrderStatus(WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED.getCode()); boolean b1 = gdWorkOrderService.updateById(gdWorkOrderEntity); if (b1) { Integer b1 = baseMapper.updateWorkOrderById(gdWorkOrderEntity); if (b1 > 0) { // 6. 保存流转记录：使用枚举设置flowName GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity(); flowEntity.setCreateUser(AuthUtil.getUserId());
