|
@@ -2527,19 +2527,18 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
|
|
|
}
|
|
|
|
|
|
// STEP1:更新task状态
|
|
|
- String realFlag = approved ? CommonConstants.STATUS_NORMAL : CommonConstants.STATUS_DEL;
|
|
|
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())
|
|
|
.set(WmTask::getTaskStatus, taskStatus)
|
|
|
- .set(WmTask::getRealFlag, realFlag)
|
|
|
+ .set(WmTask::getRealFlag, "0")
|
|
|
.set(WmTask::getTaskStatusInfo, taskStatusInfo)
|
|
|
.set(WmTask::getReviewTaskCount, 1)
|
|
|
.set(WmTask::getUpdateTime, now)
|
|
|
.set(WmTask::getUpdateUser, operatorId);
|
|
|
log.info("task更新参数:条件id={},updateTime={},updateUser={},更新项taskStatus={},realFlag={},taskStatusInfo={},updateTime={},updateUser={}",
|
|
|
- id, queryTask.getUpdateTime(), queryTask.getUpdateUser(), taskStatus, realFlag, taskStatusInfo, now, operatorId);
|
|
|
+ id, queryTask.getUpdateTime(), queryTask.getUpdateUser(), taskStatus, "0", taskStatusInfo, now, operatorId);
|
|
|
boolean taskUpdate = this.update(taskUpdateWrapper);
|
|
|
if (!taskUpdate) {
|
|
|
throw new RuntimeException("操作失败,请重试");
|