修改了最近一次的操作

notes-job/src/main/java/com/zjty/tynotes/job/status/service/impl/BusinessTreeManagementImpl.java

@@ -94,12 +94,12 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
         switch (noteResource.getAction()) {
             case 1:
                 if (work.getSuperiorId()==null) {
-                    actionHistory.setActionMsg(name + "新建了任务");
+                    actionHistory.setActionMsg(name + "  新建任务");
                     actionHistoryRepository.save(actionHistory);
                     testService.saveTakePushWork(work.getPublisher(), actionHistory.getActionMsg(), work);
                     log.info("[TREE] {}新建任务", name);
                 }else {
-                    actionHistory.setActionMsg(name + "新建了分解任务");
+                    actionHistory.setActionMsg(name + "  分解任务");
                     actionHistoryRepository.save(actionHistory);
                     testService.saveTakePushWork(work.getPublisher(), actionHistory.getActionMsg(), work);
                     log.info("[TREE] {}新建分解任务，执行人id是{}", name);
@@ -108,7 +108,7 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
 
             case 2:
 
-                actionHistory.setActionMsg(name + "提交了任务");
+                actionHistory.setActionMsg(name + "  提交任务");
                 actionHistoryRepository.save(actionHistory);
                 testService.updateWorkStatus(noteResource.getId(),
                                                  actionHistory.getActionMsg(),
@@ -119,18 +119,18 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
 
             case 3:
 
-                actionHistory.setActionMsg(name + "撤回了任务");
+                actionHistory.setActionMsg(name + "  撤回任务");
                 actionHistoryRepository.save(actionHistory);
                 testService.updateWorkStatus(noteResource.getId(),
                         actionHistory.getActionMsg(),
                         status,
                         work);
-                log.info("[TREE] {}退回了任务", name);
+                log.info("[TREE] {}测绘了任务", name);
                 break;
 
             case 4:
 
-                actionHistory.setActionMsg(name + "审核任务不通过");
+                actionHistory.setActionMsg(name + "  审核任务不通过");
                 actionHistoryRepository.save(actionHistory);
                 testService.updateWorkStatus(noteResource.getId(),
                         actionHistory.getActionMsg(),
@@ -141,7 +141,7 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
 
             case 5:
 
-                actionHistory.setActionMsg(name + "审核任务通过");
+                actionHistory.setActionMsg(name + "  审核任务通过");
                 actionHistoryRepository.save(actionHistory);
                 testService.updateWorkStatus(noteResource.getId(),
                         actionHistory.getActionMsg(),
@@ -153,7 +153,7 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
             case 6:
 
 
-                actionHistory.setActionMsg(name + "删除任务");
+                actionHistory.setActionMsg(name + "  删除任务");
                 actionHistoryRepository.save(actionHistory);
                 testService.updateWorkStatus(noteResource.getId(),
                         actionHistory.getActionMsg(),
@@ -163,7 +163,7 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
                 break;
 
             case 7:
-                actionHistory.setActionMsg(name + "修改了任务的组员");
+                actionHistory.setActionMsg(name + " 修改任务");
                 actionHistoryRepository.save(actionHistory);
                 testService.upDateWork(noteResource.getId(),
                         actionHistory.getActionMsg(),
@@ -171,7 +171,7 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
                 log.info("[TREE] {}修改了任务的组员", name);
                 break;
             case 8:
-                actionHistory.setActionMsg(name + "修改了任务的工作量和考评系数");
+                actionHistory.setActionMsg(name + " 修改任务");
                 actionHistoryRepository.save(actionHistory);
                 testService.upDateWork(noteResource.getId(),
                         actionHistory.getActionMsg(),
@@ -183,9 +183,9 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
                ScoreCoefficient scoreCoefficient= scoreCoefficientRepository.findByWordId(work.getId()).get(0);
                String actionMsg = null;
                if (scoreCoefficient.getScore1()!=null){
-                   actionMsg=name+"对任务进行了自我评价";
+                   actionMsg=name+"  自我评价";
                }else if (scoreCoefficient.getScore2()!=null){
-                   actionMsg=name+"对任务进行了发布者评价";
+                   actionMsg=name+"  发布者评价";
                }
                 actionHistory.setActionMsg(actionMsg);
                 actionHistoryRepository.save(actionHistory);
@@ -195,19 +195,19 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
 
             case 10:
                 //保存任务
-                actionHistory.setActionMsg(name + "保存了任务");
+                actionHistory.setActionMsg(name + "  保存任务");
                 actionHistoryRepository.save(actionHistory);
                 testService.saveWork(work.getPublisher(),actionHistory.getActionMsg(),work);
                 log.info("[TREE] {}保存任务", name);
                 break;
             case 11:
-                actionHistory.setActionMsg(name + "修改任务从未发布到进行中");
+                actionHistory.setActionMsg(name + "  发布任务");
                 actionHistoryRepository.save(actionHistory);
                 testService.unpublishedToOngoing(work.getPublisher(), actionHistory.getActionMsg(), work);
                 log.info("[TREE] {}修改任务从未发布到进行中", name);
                 break;
             case 12:
-                actionHistory.setActionMsg(name + "完结任务");
+                actionHistory.setActionMsg(name + "  完结任务");
                 actionHistoryRepository.save(actionHistory);
                 testService.updateWorkStatus(noteResource.getId(),
                         actionHistory.getActionMsg(),

notes-job/src/main/java/com/zjty/tynotes/job/task/Task.java

@@ -36,6 +36,7 @@ public class Task {
                 .atOffset(ZoneOffset.ofHours(8))
                 .toEpochSecond();
 
+
         scoreCoefficientService.selectSorct2IsNull()
                                .forEach(
                                        sc->{
@@ -44,7 +45,6 @@ public class Task {
                                               sc.setScore2(sc.getScore1());
                                               scoreCoefficientService.modify(sc);
                                               businessTreeManagement.saveAction(work.getPublisher(),sc.getWordId(),Action.APPRAISAL_WORD,new Date(),"");
-
                                               workService.alterTaskStatus(sc.getWordId(),WorkStatus.FINISHED,work.getPublisher());
                                               businessTreeManagement.saveAction(work.getPublisher(), sc.getWordId(), Action.FINISHED_WORK, new Date(), "");
                                           }