1.工作流终止接口扩展适配修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICmWorkflowService.java

@@ -19,7 +19,8 @@ public interface ICmWorkflowService {
     /**
      * 终止流程
      * @param processInstanceId 流程实例id
+     * @param stopReason 作废原因
      * @return ProcessInstanceDTO
      */
-    ProcessInstanceDTO stopProcess(String processInstanceId);
+    ProcessInstanceDTO stopProcess(String processInstanceId, String stopReason);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CmWorkflowServiceImpl.java

@@ -122,11 +122,11 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
 
 
     @Override
-    public ProcessInstanceDTO stopProcess(String processInstanceId) {
+    public ProcessInstanceDTO stopProcess(String processInstanceId, String stopReason) {
         ProcessInstanceDTO processTaskDTO = new ProcessInstanceDTO();
         try {
-            log.info("开始请求工作流终止流程接口:/stopProcess/{processInstanceId},请求参数：{}", processInstanceId);
-            processTaskDTO = Workflow.taskV2Client.stopProcess(processInstanceId).getResult();
+            log.info("开始请求工作流终止流程接口:/stopProcess/{processInstanceId},请求参数：{}，{}", processInstanceId, stopReason);
+            processTaskDTO = Workflow.taskV2Client.stopProcess(processInstanceId, stopReason).getResult();
         } catch (InnerInvokException e) {
             //拦截无审核人异常信息
             String devMessage = getErrorMessage(e);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -1293,7 +1293,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 // 1.待办任务更新为已完成
                 this.finishedTask(installationNotice);
                 // 2.终止流程-工作流报错暂时注释掉
-                // iCmWorkflowService.stopProcess(installationNotice.getInstanceId());
+                iCmWorkflowService.stopProcess(installationNotice.getInstanceId(), installationNotice.getCancelReason());
                 // 3.写入历史表
                 this.saveHisDataBeforeUpdate(installationNotice);
                 // 4.清空redis（缓存的流程中及已完成安装告知的设备）

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -1649,7 +1649,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 // 1.待办任务更新为已完成
                 this.finishedTask(jgUseRegistration);
                 // 2.终止流程-工作流报错暂时注释掉
-                // iCmWorkflowService.stopProcess(jgUseRegistration.getInstanceId());
+                cmWorkflowService.stopProcess(jgUseRegistration.getInstanceId(), jgUseRegistration.getCancelReason());
                 // 3.清空redis（缓存的流程中及已完成使用登记的设备）
                 this.clearDataForCheckEquipRepeatUsed(jgUseRegistration);
 
@@ -1706,7 +1706,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         idxBizJgRegisterInfoService.update(updateWrapper);
     }
 
-    private void rollBackUseInfo(String record) {
+    private void  rollBackUseInfo(String record) {
         LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(IdxBizJgUseInfo::getRecord, record);
         updateWrapper.set(IdxBizJgUseInfo::getCity, null);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java

@@ -1092,7 +1092,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 // 1.待办任务更新为已完成
                 this.finishedTask(vehicleInformation);
                 // 2.终止流程-工作流报错暂时注释掉
-                // iCmWorkflowService.stopProcess(vehicleInformation.getInstanceId());
+                 cmWorkflowService.stopProcess(vehicleInformation.getInstanceId(), vehicleInformation.getCancelReason());
 
         }
     }

pom.xml

@@ -256,7 +256,7 @@
 			<dependency>
 				<groupId>com.yeejoin</groupId>
 				<artifactId>amos-feign-workflow</artifactId>
-				<version>1.10.5</version>
+				<version>1.10.8</version>
 			</dependency>
 			<dependency>
 				<groupId>com.yeejoin</groupId>