|
|
|
|
@ -3,7 +3,6 @@ package com.biutag.supervision.flow;
|
|
|
|
|
import cn.hutool.core.util.IdUtil; |
|
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; |
|
|
|
|
import com.biutag.supervision.common.UserContextHolder; |
|
|
|
|
import com.biutag.supervision.flow.action.Action; |
|
|
|
|
@ -58,18 +57,23 @@ public class FlowService {
|
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
NegativeWork work = workService.getById(actionDto.getWorkId()); |
|
|
|
|
UserAuth user = UserContextHolder.getCurrentUser(); |
|
|
|
|
|
|
|
|
|
NegativeHistory history = new NegativeHistory().setHistoryId(IdUtil.fastSimpleUUID()) |
|
|
|
|
.setNegativeId(actionDto.getNegativeId()) |
|
|
|
|
.setActionName(actionDto.getActionName()) |
|
|
|
|
.setDepartName(departService.getById(work.getDepartId()).getShortName()) |
|
|
|
|
.setCrtUser(user.getUserId()) |
|
|
|
|
.setCrtUserName(user.getUserName()) |
|
|
|
|
.setCrtName(user.getNickName()) |
|
|
|
|
|
|
|
|
|
.setCrtTime(LocalDateTime.now()) |
|
|
|
|
.setDataJson(JSON.toJSONString(actionDto)); |
|
|
|
|
try { |
|
|
|
|
UserAuth user = UserContextHolder.getCurrentUser(); |
|
|
|
|
history.setCrtUser(user.getUserId()) |
|
|
|
|
.setCrtUserName(user.getUserName()) |
|
|
|
|
.setCrtName(user.getNickName()); |
|
|
|
|
} catch (RuntimeException e) { |
|
|
|
|
history.setCrtName("模型超市"); |
|
|
|
|
} |
|
|
|
|
return negativeHistoryService.save(history); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|