|
@@ -683,14 +683,30 @@ public class TaskController {
|
|
|
}
|
|
|
} else if (saved&&shouldUpdatetaskDailyAllocate) {
|
|
|
if (initTaskStatus==3||initTaskStatus==4){
|
|
|
+ StringJoiner stringJoiner = new StringJoiner(",");
|
|
|
if (joiner.length()>0){
|
|
|
- log.info("任务变化内容:"+joiner.toString());
|
|
|
+// log.info("任务变化内容:"+joiner.toString());
|
|
|
+ stringJoiner.add(joiner.toString());
|
|
|
}
|
|
|
if (joinerExecutor.length()>0){
|
|
|
- log.info("执行人变化:"+joinerExecutor.toString());
|
|
|
+// log.info("执行人变化:"+joinerExecutor.toString());
|
|
|
+ stringJoiner.add(joinerExecutor.toString());
|
|
|
}
|
|
|
if (joinerAllocate.length()>0){
|
|
|
- log.info("分配每日工时变化:"+joinerAllocate.toString());
|
|
|
+// log.info("分配每日工时变化:"+joinerAllocate.toString());
|
|
|
+ stringJoiner.add(joinerAllocate.toString());
|
|
|
+ }
|
|
|
+ if (stringJoiner.length()>0){
|
|
|
+ log.info("stringJoiner==>"+stringJoiner.toString());
|
|
|
+ String msg1="计划:"+task.getName()+",审核人有以下改动:";
|
|
|
+ Information information = new Information();
|
|
|
+ information.setType(11);
|
|
|
+ information.setMsg(msg1+stringJoiner.toString());
|
|
|
+ information.setJumpType(2);
|
|
|
+ information.setTaskId(task.getId());
|
|
|
+ information.setUserId(task.getCreaterId());
|
|
|
+ information.setTime(LocalDateTime.now());
|
|
|
+ informationService.save(information);
|
|
|
}
|
|
|
}
|
|
|
if (!allocateArrayList.isEmpty()) {
|