update
This commit is contained in:
@@ -148,6 +148,20 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
|
|||||||
@RequiresPermissions("database:experiment:edit")
|
@RequiresPermissions("database:experiment:edit")
|
||||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||||
public Result<String> edit(@RequestBody Experiment experiment, HttpServletRequest request) {
|
public Result<String> edit(@RequestBody Experiment experiment, HttpServletRequest request) {
|
||||||
|
String experimentUser = experiment.getExperimentUser();
|
||||||
|
if (StringUtils.isNotBlank(experimentUser)) {
|
||||||
|
experimentUserService.removeByExperimentId(experiment.getId());
|
||||||
|
String[] split = experimentUser.split(",");
|
||||||
|
List<ExperimentUser> userList = new ArrayList<>();
|
||||||
|
for (String userId : split) {
|
||||||
|
ExperimentUser userDomain = new ExperimentUser();
|
||||||
|
userDomain.setExperimentId(experiment.getId());
|
||||||
|
userDomain.setUserId(userId);
|
||||||
|
userDomain.setType("OPERATOR");
|
||||||
|
userList.add(userDomain);
|
||||||
|
}
|
||||||
|
experimentUserService.saveBatch(userList);
|
||||||
|
}
|
||||||
experimentService.updateById(experiment);
|
experimentService.updateById(experiment);
|
||||||
ExperimentLog experimentLog = new ExperimentLog();
|
ExperimentLog experimentLog = new ExperimentLog();
|
||||||
experimentLog.setExperimentId(experiment.getId());
|
experimentLog.setExperimentId(experiment.getId());
|
||||||
|
|||||||
@@ -163,6 +163,14 @@ public class Experiment implements Serializable {
|
|||||||
@Schema(description = "复制次数")
|
@Schema(description = "复制次数")
|
||||||
private Integer copyCount;
|
private Integer copyCount;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 试验人员ID, 逗号分割多个
|
||||||
|
*/
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String experimentUser;
|
||||||
|
|
||||||
|
|
||||||
public void addCopyCount() {
|
public void addCopyCount() {
|
||||||
if (Objects.isNull(copyCount)) {
|
if (Objects.isNull(copyCount)) {
|
||||||
setCopyCount(1);
|
setCopyCount(1);
|
||||||
|
|||||||
@@ -14,4 +14,5 @@ import java.util.List;
|
|||||||
public interface IExperimentUserService extends IService<ExperimentUser> {
|
public interface IExperimentUserService extends IService<ExperimentUser> {
|
||||||
List<ExperimentUser> getByExperimentId(String experimentId);
|
List<ExperimentUser> getByExperimentId(String experimentId);
|
||||||
|
|
||||||
|
void removeByExperimentId(String experimentId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,4 +22,10 @@ public class ExperimentUserServiceImpl extends ServiceImpl<ExperimentUserMapper,
|
|||||||
public List<ExperimentUser> getByExperimentId(String experimentId) {
|
public List<ExperimentUser> getByExperimentId(String experimentId) {
|
||||||
return list(new LambdaQueryWrapper<ExperimentUser>().eq(ExperimentUser::getExperimentId, experimentId));
|
return list(new LambdaQueryWrapper<ExperimentUser>().eq(ExperimentUser::getExperimentId, experimentId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void removeByExperimentId(String experimentId) {
|
||||||
|
List<ExperimentUser> userList = getByExperimentId(experimentId);
|
||||||
|
userList.forEach(user -> removeById(user.getId()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user