update 强制撤回增加日志

laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
@@ -19,7 +20,6 @@ import com.jero.modules.activiti.vo.ResolveTaskParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.activiti.engine.history.HistoricTaskInstance;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jetbrains.annotations.NotNull;
@@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -157,12 +156,13 @@ public class WorkCenterController {
         return queryWrapper;
     }
 
-    @ApiOperation(value = "强制撤销")
-    @PostMapping("/delete")
-    public Result<?> delete(@RequestBody Map<String, String> map) {
+    @AutoLog(value = "强制撤回")
+    @ApiOperation(value = "强制撤回")
+    @PostMapping("/forcedWithdrawal")
+    public Result<?> forcedWithdrawal(@RequestBody Map<String, String> map) {
         String processInstanceId = map.get("processInstanceId");
 
-        processAllService.delete(processInstanceId);
+        processAllService.forcedWithdrawal(processInstanceId);
         return Result.OK();
     }
 

laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java

@@ -66,9 +66,9 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
         return processAllMapper.getSentList(page,queryWrapper);
     }
 
-    public void delete(String processInstanceId) {
+    public void forcedWithdrawal(String processInstanceId) {
         //activiti撤销
-        runtimeService.deleteProcessInstance(processInstanceId,"强制撤销");
+        runtimeService.deleteProcessInstance(processInstanceId,"强制撤回");
         //获得流程总表
         ProcessAll processAll = getByProcessInstanceId(processInstanceId);
         //删除流程总表