Merge remote-tracking branch 'origin/master'
| | |
| | | |
| | | <!-- 通用查询结果列 --> |
| | | <sql id="Base_Column_List"> |
| | | id, notification_type, notification_content, operations_user_id, data_id, is_deleted, create_time, update_time, create_by, update_by |
| | | id, notification_type, notification_content, operations_user_id, data_id, read_status, is_deleted, create_time, update_time, create_by, update_by |
| | | </sql> |
| | | |
| | | <!-- 分页查询用户通知列表 --> |
| | |
| | | xpTaskHandleDetailRoutine.setTaskImage(dto.getTaskImage()); |
| | | xpTaskHandleDetailRoutine.setOperationsUserId(id); |
| | | xpTaskHandleDetailRoutineMapper.insert(xpTaskHandleDetailRoutine); |
| | | task.setStatus(2); |
| | | this.updateById(task); |
| | | return null; |
| | | //更新任务状态为已完成 |
| | | lambdaUpdate().set(XpTask::getStatus, 2).eq(XpTask::getId, dto.getId()).update(); |
| | | return R.ok(); |
| | | } |
| | | |
| | | @Override |
| | |
| | | if (Objects.nonNull(taskId)) { |
| | | XpTask task = this.getById(taskId); |
| | | if (Objects.nonNull(task)) { |
| | | task.setStatus(status); |
| | | this.updateById(task); |
| | | this.lambdaUpdate().set(XpTask::getStatus, status).eq(XpTask::getId, taskId).update(); |
| | | } |
| | | } |
| | | } |