完善

platform-activiti/src/main/java/com/platform/activiti/config/ActivitiConfig.java

@@ -40,6 +40,9 @@ public class ActivitiConfig {
         processEngineConfiguration.setLabelFontName("宋体");
 
         processEngineConfiguration.setProcessDiagramGenerator(new DefaultProcessDiagramGenerator());
+        //processEngineConfiguration.setJobExecutorActivate(true);//JobExecutor是管理几个线程计时器的组成部分,JobExecutor对多线程的处理较为笨重缓慢
+        processEngineConfiguration.setAsyncExecutorEnabled(true);//定义为true，使用AsyncExecutor代替默认的JobExecutor;
+        processEngineConfiguration.setAsyncExecutorActivate(true);//定义为true，工作流引擎在启动时就建立启动AsyncExecutor线程
 
         return processEngineConfiguration;
     }

platform-dao/src/main/java/com/platform/dao/dto/sb/SbInfoDTO.java

@@ -537,4 +537,10 @@ public class SbInfoDTO extends BaseDTO implements Serializable {
      * 报废创建人
      */
     private String scrapUserName;
+
+    /**
+     * 设备报废转签指定别人
+     */
+    @Transient
+    private String changeUser;
 }

platform-rest/src/main/java/com/platform/rest/controller/activiti/SbInfoActivitiController.java

@@ -94,7 +94,6 @@ public class SbInfoActivitiController {
         }
         log.info("流程实例ID:" + instance.getId());
         log.info("流程定义ID:" + instance.getProcessDefinitionId());
-        sbInfoDTO.setProcessInstanceId(instance.getId());
         SbInfo sbInfo = new SbInfo();
         sbInfo.setStatus(SbInfoStatusEnum.IN_SCRAP.getValue());
         sbInfo.setId(sbInfoDTO.getId());
@@ -141,11 +140,14 @@ public class SbInfoActivitiController {
     private boolean checkFinish(String processInstanceId) {
         HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
         if (Objects.isNull(historicProcessInstance)) {
+            log.info("完成1");
             return true;
         }
         if (Objects.isNull(historicProcessInstance.getEndTime())) {
+            log.info("未完成");
             return false;
         } else {
+            log.info("完成2");
             return true;
         }
     }
@@ -172,6 +174,31 @@ public class SbInfoActivitiController {
         return new R<>();
     }
 
+    /**
+     * 审核
+     *
+     * @param sbInfoDTO
+     * @return R
+     */
+    @SysLog("设备报废转签")
+    @PutMapping("/assign")
+    public R assign(@RequestBody SbInfoDTO sbInfoDTO) {
+        String taskId = sbInfoDTO.getTaskId();
+        String userId = sbInfoDTO.getChangeUser();
+        if (StringUtils.isEmpty(taskId)) {
+            throw new BusinessException("taskId为空，请选择");
+        }
+        if (StringUtils.isEmpty(userId)) {
+            throw new BusinessException("请设置转签人员");
+        }
+        SysUser sysUser = sysUserService.getModelById(userId);
+        if(sysUser == null){
+            throw new BusinessException("用户不存在，请选择其他人员");
+        }
+        taskService.setAssignee(taskId, userId);
+        return new R<>();
+    }
+
     /**
      * 审核历史
      *

platform-rest/src/main/resources/application-dev.yml

@@ -2,7 +2,6 @@ server:
   # 端口号
   port: 5000
 
-
 security:
   oauth2:
     client:

platform-rest/src/main/resources/application-prod.yml

@@ -2,7 +2,6 @@ server:
   # 端口号
   port: 5000
 
-
 security:
   oauth2:
     client:

platform-rest/src/main/resources/application-test.yml

@@ -2,7 +2,6 @@ server:
   # 端口号
   port: 5000
 
-
 security:
   oauth2:
     client: