Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/TaskDto.java

@@ -26,6 +26,8 @@ public class TaskDto {
         private Long taskId;
         @ApiModelProperty("开始任务的时间 如果为空则为当前时间")
         private Long startTime;
+        @ApiModelProperty("是否修改后续任务的时间(0否,1是)")
+        private Byte isUpdateTime = 0;
     }
 
     @ApiModel

tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java

@@ -168,6 +168,8 @@ public class TaskDto {
         private Long taskId;
         @ApiModelProperty("开始任务的时间 如果为空则为当前时间")
         private Long startTime;
+        @ApiModelProperty("是否修改后续任务的时间(0否,1是)")
+        private Byte isUpdateTime = 0;
     }
 
     @Data

tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java

@@ -263,7 +263,14 @@ public class TaskSubTimeService implements ITaskSubTimeService {
             }
             taskSubTime.setComplatedStatus(1);
             taskSubTimeDao.updateByPrimaryKeySelective(taskSubTime);
-
+            if (1 == startTaskDto.getIsUpdateTime()){
+                ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(taskSubTime.getTaskDetailId());
+                if (ObjectUtil.isNotNull(taskDetail)){
+                    Long timeDifference = taskSubTime.getBeginTime()-now;
+                    //寻找下到工序并修改时间
+                    updateTimeDifference(timeDifference,taskDetail.getId());
+                }
+            }
 
             //查找任务的负责人名
             String player = null;
@@ -336,6 +343,30 @@ public class TaskSubTimeService implements ITaskSubTimeService {
         }
     }
 
+    /**
+     * 修改分解任务预计时间
+     * @param timeDifference 时间差
+     * @param taskDetailId 任务详情id
+     */
+    public void updateTimeDifference(Long timeDifference,Long taskDetailId){
+        Long currentTime = System.currentTimeMillis();
+        ProTaskDetailExample taskDetailExample = new ProTaskDetailExample();
+        taskDetailExample.createCriteria().andLastTaskDetailIdEqualTo(taskDetailId);
+        List<ProTaskDetail> proTaskDetails = taskDetailDao.selectByExample(taskDetailExample);
+        if (CollectionUtil.isNotEmpty(proTaskDetails)){
+            for (ProTaskDetail proTaskDetail : proTaskDetails) {
+                ProTaskSubTimeExample subTimeExample = new ProTaskSubTimeExample();
+                subTimeExample.createCriteria().andBeginTimeGreaterThan(currentTime).andTaskDetailIdEqualTo(proTaskDetail.getId());
+                List<ProTaskSubTime> taskSubTimes = taskSubTimeDao.selectByExample(subTimeExample);
+                if (CollectionUtil.isNotEmpty(taskSubTimes)){
+                    taskSubTimes.get(0).setBeginTime(taskSubTimes.get(0).getBeginTime()+timeDifference);
+                    taskSubTimeDao.updateByPrimaryKeySelective(taskSubTimes.get(0));
+                }
+                updateTimeDifference(timeDifference,proTaskDetail.getId());
+            }
+        }
+    }
+
     /**
      * 结束其他进行中的任务
      *

wisdomcar/src/main/java/com/ccsens/wisdomcar/service/AsyncService.java

@@ -55,6 +55,7 @@ public class AsyncService implements IAsyncService {
         startTask.setRoleId(0L);
         startTask.setProjectId(patient.getProjectId());
         startTask.setStartTime(data.getStartTime());
+        startTask.setIsUpdateTime((byte)1);
         updateData.setPushStatus(Constant.PUSH_STATUS_FAIL);
         try {
             JsonResponse response = tallFeignClient.startNode(startTask);

wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java

@@ -310,10 +310,10 @@ public class WisdomCarService implements IWisdomCarService {
             throw new BaseException(CodeEnum.TASK_IS_EXIST);
         }
         //查询任务是否是分诊环节的任务ID
-        Integer taskIsTriageTask = stepTaskDao.findTaskIsTriageTask(param.getTaskSubId());
-        if (0 == taskIsTriageTask){
-            throw new BaseException(CodeEnum.PARAM_ERROR);
-        }
+//        Integer taskIsTriageTask = stepTaskDao.findTaskIsTriageTask(param.getTaskSubId());
+//        if (0 == taskIsTriageTask){
+//            throw new BaseException(CodeEnum.PARAM_ERROR);
+//        }
         //查询患者是否存在
         Integer patientIsExist = patientProjectDao.findPatientIsExist(param.getProjectId());
         if (0 == patientIsExist){
@@ -381,8 +381,9 @@ public class WisdomCarService implements IWisdomCarService {
     public List<WisdomCarVo.BindingCarInfo> queryBindingCar(WisdomCarDto.QueryInfo param) {
         List<WisdomCarVo.BindingCarInfo> bindingCarList = patientWisdomCarDao.queryBindingCarList(param.getTaskSubId());
         if(CollectionUtil.isEmpty(bindingCarList)){
-            log.info("未找到对应的任务");
-            throw new BaseException(CodeEnum.PARAM_ERROR);
+//            log.info("未找到对应的任务");
+//            throw new BaseException(CodeEnum.PARAM_ERROR);
+            return bindingCarList;
         }
         for (WisdomCarVo.BindingCarInfo bindingCar : bindingCarList) {
             //拿到患者id把 患者的信息存入

wisdomcar/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: prod
+    include: common, util-prod