提交 0e87123b authored 作者: Matrix's avatar Matrix

[核查模块] 修正了回退相关的bug

上级 10fa7458
...@@ -6,6 +6,7 @@ import lombok.AllArgsConstructor; ...@@ -6,6 +6,7 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.util.Collections;
import java.util.List; import java.util.List;
/** /**
...@@ -27,12 +28,12 @@ public class CheckExamDetailVo { ...@@ -27,12 +28,12 @@ public class CheckExamDetailVo {
private List<String> userNames; private List<String> userNames;
@ApiModelProperty(name = "需要被检查的区域id") @ApiModelProperty(name = "需要被检查的区域id")
private Integer unitId; private List<Integer> unitIds;
@ApiModelProperty(name = "备注") @ApiModelProperty(name = "备注")
private String remark; private String remark;
public CheckExamDetailVo copy(Integer unitId,String remark) { public CheckExamDetailVo copy(Integer unitId,String remark) {
return new CheckExamDetailVo(this.groupName, this.userNames, unitId, remark); return new CheckExamDetailVo(this.groupName, this.userNames, Collections.singletonList(unitId), remark);
} }
} }
...@@ -317,16 +317,16 @@ public class TaskServiceImpl implements TaskService { ...@@ -317,16 +317,16 @@ public class TaskServiceImpl implements TaskService {
@ExceptionHandler(Exception.class) @ExceptionHandler(Exception.class)
@Log @Log
public TaskBto start(TaskBto taskBto) { public TaskBto start(TaskBto taskBto) {
Task t = taskBto.toDo(); Task task = taskDao.save(taskBto.toDo());
Task task = taskDao.save(t);
myWebSocket.sendMessage1(); myWebSocket.sendMessage1();
Task task1 = taskDao.findById(task.getId()).get();
CompletableFuture.runAsync(() -> { CompletableFuture.runAsync(() -> {
try { try {
Thread.sleep(2000); Thread.sleep(2000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }
Task task1 = taskDao.findById(task.getId()).get();
BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(task1)); BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(task1));
String recordId = bcText.getData().getRecordID(); String recordId = bcText.getData().getRecordID();
task1.setRecordId(recordId); task1.setRecordId(recordId);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论