修改显示的bug 代办任务

notes-job/src/main/java/com/zjty/tynotes/job/basic/controller/WorkController.java

@@ -6,6 +6,7 @@ import com.zjty.tynotes.job.basic.entity.request.WorkRo;
 import com.zjty.tynotes.job.basic.entity.response.JobResponse;
 import com.zjty.tynotes.job.basic.entity.response.WorkIsNotCommit;
 import com.zjty.tynotes.job.basic.entity.response.WorkVo;
+import com.zjty.tynotes.job.basic.repository.WorkRepository;
 import com.zjty.tynotes.job.basic.service.ConversionService;
 import com.zjty.tynotes.job.basic.service.WorkService;
 import com.zjty.tynotes.job.common.Action;
@@ -36,8 +37,10 @@ public class WorkController {
 
     @Autowired
     WorkService workService;
-@Autowired
+    @Autowired
     ConversionService conversionService;
+    @Autowired
+    WorkRepository workRepository;
 
     @Autowired
     private BusinessTreeManagement businessTreeManagement;
@@ -160,7 +163,9 @@ public class WorkController {
                 break;
             case "audit":
                 //执行者提交
-
+                Work work1=  workRepository.findById(workId).get();
+                work1.setEndTime(new Date());
+                workRepository.save(work1);
                 workService.alterTaskStatus(workId, status);
                 businessTreeManagement.saveAction(userId, workId, Action.COMMIT_WORK, new Date(), msg);
                 break;

notes-job/src/main/java/com/zjty/tynotes/job/basic/service/impl/WorkServiceImpl.java

@@ -140,6 +140,9 @@ public class WorkServiceImpl implements WorkService {
 
     @Override
     public WorkIsNotCommit findBySuperoirId(String SuperoirId) {
+        if (!workRepository.existsById(SuperoirId)){
+            throw new NotFoundException(String.format("[job] id为 %s 的任务不存在.", SuperoirId));
+        }
        List<Work> works= workRepository.findBySuperiorId(SuperoirId);
        List<String> list=new ArrayList<>();
        String isNotCommit="1";
@@ -158,11 +161,16 @@ public class WorkServiceImpl implements WorkService {
 
     @Override
     public int findBySuperoirIdCount(String SuperoirId) {
+        if (!workRepository.existsById(SuperoirId)){
+            throw new NotFoundException(String.format("[job] id为 %s 的任务不存在.", SuperoirId));
+        }
         List<Work> works= workRepository.findBySuperiorId(SuperoirId);
         int count= workRepository.findById(SuperoirId).get().getWorkload();
         if (works!=null && works.size()!=0){
             for (Work work:works){
-                count=count-work.getWorkload();
+                if(work.getWorkloadCount()==1) {
+                    count = count - work.getWorkload();
+                }
             }
             return count;
         }else {

notes-job/src/main/java/com/zjty/tynotes/job/status/entity/RedisPersonalWork.java

@@ -76,7 +76,7 @@ public class RedisPersonalWork {
     /**
      * 子任务id集合
      */
-    @ApiModelProperty(value = "上级任务id",name = "superiorId",example = "root留言")
+    @ApiModelProperty(value = "子任务id集合",name = "superiorId",example = "root留言")
     private List<String> subtaskIds;
 
     /**

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

@@ -107,6 +107,7 @@ public class TestServiceImpl implements TestService {
             for (String id : uIds) {
                 personalWork.setWorkAttribution(WorkAttribution1.ME_RELATED_WORK);
                 personalWork.setReadState(1);
+                personalWork.setIsNotCommission(0);
                 redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + id, personalWork);
 
                 asynchronousAddEs(Constants.REDIS_EVENT + id, personalWork);
@@ -196,6 +197,7 @@ public class TestServiceImpl implements TestService {
         for (String id:uIds){
             personalWork.setWorkAttribution(WorkAttribution1.ME_RELATED_WORK);
             personalWork.setReadState(1);
+            personalWork.setIsNotCommission(0);
             redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT+id,personalWork);
 
             asynchronousAddEs(Constants.REDIS_EVENT+id,personalWork);
@@ -210,7 +212,7 @@ public class TestServiceImpl implements TestService {
     @Override
     public void updateWorkStatus(String executorId, String latestNews, String status, Work work) {
         List<String> uIds=new ArrayList<>();
-
+        Long time=new Date().getTime();
         if (work.getSuperiorId()!=null) {
             uIds = tests(work.getSuperiorId(), uIds);
         }
@@ -221,6 +223,7 @@ public class TestServiceImpl implements TestService {
             if (redisPersonalWork.getWorkId().equals(work.getId())){
                 redisTemplate.opsForList().remove(Constants.REDIS_EVENT+work.getPublisher(),1,redisPersonalWork);
                 redisPersonalWork.setStatus(status);
+                redisPersonalWork.setTime(time);
                 if (work.getPublisher().equals(executorId)){
                     redisPersonalWork.setReadState(0);
                 }else {
@@ -259,6 +262,7 @@ public class TestServiceImpl implements TestService {
                 }else {
                     redisPersonalWork.setReadState(1);
                 }
+                redisPersonalWork.setTime(time);
                 switch(status){
                     case WorkStatus.ONGOING:
                         redisPersonalWork.setIsNotCommission(1);
@@ -288,6 +292,7 @@ public class TestServiceImpl implements TestService {
                    redisTemplate.opsForList().remove(Constants.REDIS_EVENT + uId, 1, redisPersonalWork);
                    redisPersonalWork.setStatus(status);
                    redisPersonalWork.setReadState(1);
+                   redisPersonalWork.setTime(time);
                    redisPersonalWork.setLatestNews(latestNews);
                    redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + uId, redisPersonalWork);
                    asynchronousAddEs(Constants.REDIS_EVENT + uId, redisPersonalWork);
@@ -306,6 +311,7 @@ public class TestServiceImpl implements TestService {
         if (work.getSuperiorId()!=null) {
             uIds = tests(work.getSuperiorId(), uIds);
         }
+        Long time=new Date().getTime();
         //发布者
         List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1);
         for (Object object:list){
@@ -313,6 +319,7 @@ public class TestServiceImpl implements TestService {
             if (redisPersonalWork.getWorkId().equals(work.getId())){
                 redisTemplate.opsForList().remove(Constants.REDIS_EVENT+work.getPublisher(),1,redisPersonalWork);
                 redisPersonalWork.setReadState(0);
+                redisPersonalWork.setTime(time);
                 redisPersonalWork.setLatestNews(latestNews);
                 redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT+work.getPublisher(),redisPersonalWork);
                 asynchronousAddEs(Constants.REDIS_EVENT+work.getPublisher(),redisPersonalWork);
@@ -326,6 +333,7 @@ public class TestServiceImpl implements TestService {
             if (redisPersonalWork.getWorkId().equals(work.getId())){
                 redisTemplate.opsForList().remove(Constants.REDIS_EVENT+work.getExecutor(),1,redisPersonalWork);
                 redisPersonalWork.setReadState(1);
+                redisPersonalWork.setTime(time);
                 redisPersonalWork.setLatestNews(latestNews);
                 redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT+work.getExecutor(),redisPersonalWork);
                 asynchronousAddEs(Constants.REDIS_EVENT+work.getExecutor(),redisPersonalWork);
@@ -340,6 +348,7 @@ public class TestServiceImpl implements TestService {
                     if (redisPersonalWork.getWorkId().equals(work.getId())) {
                         redisTemplate.opsForList().remove(Constants.REDIS_EVENT + uId, 1, redisPersonalWork);
                         redisPersonalWork.setReadState(1);
+                        redisPersonalWork.setTime(time);
                         redisPersonalWork.setLatestNews(latestNews);
                         redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + uId, redisPersonalWork);
                         asynchronousAddEs(Constants.REDIS_EVENT + uId, redisPersonalWork);
@@ -352,11 +361,12 @@ public class TestServiceImpl implements TestService {
     }
 
     @Override
-    public void appraisal(String executorId, String latestNews,  Work work){
+    public void appraisal(String executorId, String latestNews, Work work){
         List<String> uIds=new ArrayList<>();
         if (work.getSuperiorId()!=null) {
             uIds = tests(work.getSuperiorId(), uIds);
         }
+        Long time=new Date().getTime();
         //发布者
         List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1);
         for (Object object:list){
@@ -370,6 +380,7 @@ public class TestServiceImpl implements TestService {
                     redisPersonalWork.setReadState(1);
                     redisPersonalWork.setIsNotCommission(1);
                 }
+                redisPersonalWork.setTime(time);
                 redisPersonalWork.setLatestNews(latestNews);
                 redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT+work.getPublisher(),redisPersonalWork);
                 asynchronousAddEs(Constants.REDIS_EVENT+work.getPublisher(),redisPersonalWork);
@@ -389,6 +400,7 @@ public class TestServiceImpl implements TestService {
                     redisPersonalWork.setReadState(1);
                     redisPersonalWork.setIsNotCommission(0);
                 }
+                redisPersonalWork.setTime(time);
                 redisPersonalWork.setLatestNews(latestNews);
                 redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT+work.getExecutor(),redisPersonalWork);
                 asynchronousAddEs(Constants.REDIS_EVENT+work.getExecutor(),redisPersonalWork);
@@ -403,6 +415,7 @@ public class TestServiceImpl implements TestService {
                     if (redisPersonalWork.getWorkId().equals(work.getId())) {
                         redisTemplate.opsForList().remove(Constants.REDIS_EVENT + uId, 1, redisPersonalWork);
                         redisPersonalWork.setReadState(1);
+                        redisPersonalWork.setTime(time);
                         redisPersonalWork.setLatestNews(latestNews);
                         redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + uId, redisPersonalWork);
                         asynchronousAddEs(Constants.REDIS_EVENT + uId, redisPersonalWork);
@@ -551,7 +564,7 @@ public class TestServiceImpl implements TestService {
     // 添加es
     private void asynchronousAddEs(String index,RedisPersonalWork personalWork){
         CompletableFuture.runAsync(() -> {
-            esUtil.save(index, eventToEs(personalWork));
+//            esUtil.save(index, eventToEs(personalWork));
             log.info("异步写入es完成");
         });