|
|
@@ -90,6 +90,11 @@ public class ReportCheckServiceImpl implements ReportCheckService {
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public R updateRelevantInformation(String id) {
|
|
|
log.info("保存检验结果后更新相关信息");
|
|
|
+ SysUserVo currentUser = CXCommonUtils.getCurrentUser();
|
|
|
+ if(locks.containsKey(id) && !locks.get(id).equals(currentUser.getId())){
|
|
|
+ log.error("该作业已被其他人：{}检验",locks.get(id));
|
|
|
+ return R.error("该作业已被其他人检验");
|
|
|
+ }
|
|
|
try {
|
|
|
if (StringUtil.isBlank(id)) {
|
|
|
log.debug("参数为空");
|
|
|
@@ -283,7 +288,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
|
|
|
log.error("报工检验前校验失败,当前报工记录已被他人:{}检验", locks.get(id));
|
|
|
return R.error("该作业已被其他人检验");
|
|
|
}
|
|
|
- locks.computeIfAbsent(id, k -> currentUser.getName() + "-;-" + currentUser.getId());
|
|
|
+ locks.computeIfAbsent(id, k -> currentUser.getId());
|
|
|
log.debug("报工检验前校验成功");
|
|
|
return R.ok();
|
|
|
}
|
xiahan