Преглед на файлове

日志和回收站,废除任务后,电签状态显示

qianxb преди 2 години
родител
ревизия
c8c1f93bb9

+ 0 - 1
blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/OperationLogClient.java

@@ -23,7 +23,6 @@ public interface OperationLogClient {
      * @param json 操作的业务数据
      */
     @PostMapping(API_PREFIX + "/saveUserOperationLog")
-    @Async
     void saveUserOperationLog(@RequestParam Integer type, @RequestParam String operationModule, @RequestParam String operationView, @RequestBody JSONObject json);
 
 }

+ 0 - 1
blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/RecycleBinClient.java

@@ -28,7 +28,6 @@ public interface RecycleBinClient {
      * @param contractId 合同段ID
      */
     @PostMapping(API_PREFIX + "/saveDelBusinessData")
-    @Async
     void saveDelBusinessData(@RequestBody List<String> businessIds, @RequestParam String title, @RequestParam Integer deletedType, @RequestParam String position, @RequestParam String projectId, @RequestParam String contractId);
 
 }

+ 7 - 1
blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -531,7 +531,13 @@ public class TaskController extends BladeController {
                             vo.setParallelProcessInstanceId(flow.getProcessInstanceId());
                             vo.setTaskId(flow.getTaskId());
                             vo.setTaskStatus(new Integer("1").equals(task.getStatus()) ? "待审批" : new Integer("2").equals(task.getStatus()) ? "已审批" : "已废除", task.getStatus());
-                            vo.setEVisaContent(taskParallel.getEVisaContent());
+//                            vo.setEVisaContent(taskParallel.getEVisaContent());
+                            if (task.getStatus() == 3) {
+                                vo.setEVisaContent("废除成功");
+                            }else {
+                                vo.setEVisaContent(taskParallel.getEVisaContent());
+                            }
+
                             //获取主流程下所有相关的审批人
                             List<TaskParallel> linkList = this.taskParallelService.list(Wrappers.<TaskParallel>lambdaQuery().eq(TaskParallel::getProcessInstanceId, task.getProcessInstanceId()).eq(TaskParallel::getIsDeleted, 0));
                             if (linkList != null && linkList.size() > 0) {