update
This commit is contained in:
@@ -110,6 +110,28 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
|
||||
return Result.OK("添加成功!");
|
||||
}
|
||||
|
||||
@AutoLog(value = "试验人员-批量添加")
|
||||
@Operation(summary = "试验人员-批量添加")
|
||||
@RequiresPermissions("database:experiment_user:add")
|
||||
@PostMapping(value = "/batchAdd")
|
||||
public Result<String> batchAdd(@RequestBody List<ExperimentUser> experimentUserList, HttpServletRequest request) {
|
||||
experimentUserList.forEach(v -> {
|
||||
String experimentId = v.getExperimentId();
|
||||
if (StringUtils.isBlank(experimentId)) {
|
||||
throw new RuntimeException("试验数据不存在!");
|
||||
}
|
||||
experimentUserService.save(v);
|
||||
});
|
||||
ExperimentLog experimentLog = new ExperimentLog();
|
||||
experimentLog.setExperimentId(experimentUserList.get(0).getExperimentId());
|
||||
experimentLog.setLogContent("添加试验人员");
|
||||
String username = JwtUtil.getUserNameByToken(request);
|
||||
SysUser userByName = userService.getUserByName(username);
|
||||
experimentLog.setCreateBy(userByName.getRealname());
|
||||
experimentLogService.save(experimentLog);
|
||||
return Result.OK("添加成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
@@ -194,6 +216,35 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
|
||||
return Result.OK(userDTO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过实验id查询
|
||||
*
|
||||
* @param experimentalId
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "试验评定-通过id查询")
|
||||
@Operation(summary = "测试过程-通过实验ID查询")
|
||||
@GetMapping(value = "/queryByExperimentId")
|
||||
public Result<List<ExperimentUserDTO>> queryByExperimentalId(
|
||||
@RequestParam(name = "experimentId", required = true) String experimentalId) {
|
||||
LambdaQueryWrapper<ExperimentUser> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(ExperimentUser::getExperimentId, experimentalId);
|
||||
List<ExperimentUser> list = experimentUserService.list(queryWrapper);
|
||||
if (list == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
List<ExperimentUserDTO> userDTOList = new ArrayList<>();
|
||||
list.forEach(v -> {
|
||||
ExperimentUserDTO userDTO = ExperimentUserDTO.of(v);
|
||||
SysUser user = userService.getById(v.getUserId());
|
||||
if (Objects.nonNull(user)) {
|
||||
userDTO.setUserName(user.getRealname());
|
||||
userDTOList.add(userDTO);
|
||||
}
|
||||
});
|
||||
return Result.OK(userDTOList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过实验id查询
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user