fix: 审核任务加version

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmTask.java

@@ -291,4 +291,9 @@ public class WmTask extends Model<WmTask> {
      * ip归属地
      */
     private String ip2region;
+
+	/**
+	 * 乐观锁
+	 */
+	private Integer version;
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskServiceImpl.java

@@ -2584,19 +2584,19 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 		// STEP1：更新task状态
 		LambdaUpdateWrapper<WmTask> taskUpdateWrapper = Wrappers.<WmTask>lambdaUpdate()
 				.eq(WmTask::getId, id)
-				.eq(queryTask.getUpdateTime() != null, WmTask::getUpdateTime, queryTask.getUpdateTime())
-				.eq(queryTask.getUpdateUser() != null, WmTask::getUpdateUser, queryTask.getUpdateUser())
+				.eq(WmTask::getVersion, queryTask.getVersion())
 				.set(WmTask::getTaskStatus, taskStatus)
 				.set(WmTask::getRealFlag, "0")
 				.set(WmTask::getTaskStatusInfo, taskStatusInfo)
 				.set(WmTask::getReviewTaskCount, 1)
+				.set(WmTask::getVersion, queryTask.getVersion() + 1)
 				.set(WmTask::getUpdateTime, now)
 				.set(WmTask::getUpdateUser, operatorId)
 				.set(WmTask::getApprovalUserId, operatorId)
 				.set(WmTask::getApprovalTime, now)
 				.set(StrUtil.isNotBlank(compareResult), WmTask::getCompareResult, compareResult);
-		log.info("task更新参数：条件id={},updateTime={},updateUser={},更新项taskStatus={},realFlag={},taskStatusInfo={},updateTime={},updateUser={}",
-				id, queryTask.getUpdateTime(), queryTask.getUpdateUser(), taskStatus, "0", taskStatusInfo, now, operatorId);
+		log.info("task更新参数：条件id={},version={},更新项taskStatus={},realFlag={},taskStatusInfo={},updateTime={},updateUser={}",
+				id, queryTask.getVersion(), taskStatus, "0", taskStatusInfo, now, operatorId);
 		boolean taskUpdate = this.update(taskUpdateWrapper);
 		if (!taskUpdate) {
 			throw new RuntimeException("操作失败，请重试");