Browse Source

电签相关

huangjn 2 years ago
parent
commit
34aadad141

+ 0 - 2
blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TaskBatch.java

@@ -51,8 +51,6 @@ public class TaskBatch extends BaseEntity {
         this.setId(SnowFlakeUtil.getId());
         this.taskParallelId = taskParallelId;
         this.jsonData = jsonData;
-        this.setCreateUser(AuthUtil.getUserId());
-        this.setCreateTime(new Date());
     }
 
     public TaskBatch(){}

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

@@ -505,7 +505,10 @@ public class TaskController extends BladeController {
 			taskApprovalVOS.add(taskApprovalVO);
 
 			//存在批次,当前审批的追加进队列
-			this.taskBatchService.save(new TaskBatch(taskApprovalVO.getParallelProcessInstanceId(), JSONObject.toJSONString(taskApprovalVOS)));
+			TaskBatch taskBatch = new TaskBatch(taskApprovalVO.getParallelProcessInstanceId(), JSONObject.toJSONString(taskApprovalVOS));
+			taskBatch.setCreateUser(AuthUtil.getUserId());
+			taskBatch.setCreateTime(new Date());
+			this.taskBatchService.save(taskBatch);
 
 			return R.data(true, "当前等待电签的批次较多,请等待几分钟后刷新页面查看........");
 		} else {

+ 6 - 1
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -295,7 +295,10 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     .set(TaskParallel::getEVisaContent, "当前等待电签的批次较多,请等待几分钟后刷新页面查看........")
                     .in(TaskParallel::getParallelProcessInstanceId, taskIds));
             //保存批次
-            this.taskBatchService.save(new TaskBatch(null, JSONObject.toJSONString(taskApprovalVOS)));
+            TaskBatch taskBatch = new TaskBatch(null, JSONObject.toJSONString(taskApprovalVOS));
+            taskBatch.setCreateUser(AuthUtil.getUserId());
+            taskBatch.setCreateTime(new Date());
+            this.taskBatchService.save(taskBatch);
         } else {
             //修改电签状态
             this.taskParallelService.update(Wrappers.<TaskParallel>lambdaUpdate()
@@ -304,6 +307,8 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 
             //保存批次
             TaskBatch taskBatch = new TaskBatch(null, JSONObject.toJSONString(taskApprovalVOS));
+            taskBatch.setCreateUser(AuthUtil.getUserId());
+            taskBatch.setCreateTime(new Date());
             this.taskBatchService.save(taskBatch);
 
             //执行电签,结束后检查在执行是否有新的等待批次