|
|
@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
13
|
13
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
14
|
14
|
import com.sundot.airport.check.domain.CheckProjectItem;
|
|
15
|
15
|
import com.sundot.airport.check.domain.CheckUser;
|
|
|
16
|
+import com.sundot.airport.common.core.domain.ApprovalWorkflowBatchDto;
|
|
16
|
17
|
import com.sundot.airport.check.service.ICheckProjectItemService;
|
|
17
|
18
|
import com.sundot.airport.check.service.ICheckUserService;
|
|
18
|
19
|
import com.sundot.airport.common.constant.Constants;
|
|
|
@@ -29,6 +30,9 @@ import com.sundot.airport.common.utils.DateUtils;
|
|
29
|
30
|
import com.sundot.airport.common.utils.SecurityUtils;
|
|
30
|
31
|
import com.sundot.airport.common.utils.StringUtils;
|
|
31
|
32
|
import com.sundot.airport.system.domain.approval.ApprovalInstance;
|
|
|
33
|
+import com.sundot.airport.system.domain.approval.ApprovalTask;
|
|
|
34
|
+import com.sundot.airport.system.mapper.approval.ApprovalInstanceMapper;
|
|
|
35
|
+import com.sundot.airport.system.mapper.approval.ApprovalTaskMapper;
|
|
32
|
36
|
import com.sundot.airport.system.service.approval.IApprovalEngineService;
|
|
33
|
37
|
import com.sundot.airport.system.service.approval.ICheckApprovalService;
|
|
34
|
38
|
import lombok.SneakyThrows;
|
|
|
@@ -63,6 +67,10 @@ public class CheckCorrectionServiceImpl extends ServiceImpl<CheckCorrectionMappe
|
|
63
|
67
|
private ICheckApprovalService checkApprovalService;
|
|
64
|
68
|
@Autowired
|
|
65
|
69
|
private IApprovalEngineService approvalEngineService;
|
|
|
70
|
+ @Autowired
|
|
|
71
|
+ private ApprovalTaskMapper taskMapper;
|
|
|
72
|
+ @Autowired
|
|
|
73
|
+ private ApprovalInstanceMapper instanceMapper;
|
|
66
|
74
|
|
|
67
|
75
|
/**
|
|
68
|
76
|
* 查询问题整改
|
|
|
@@ -407,4 +415,48 @@ public class CheckCorrectionServiceImpl extends ServiceImpl<CheckCorrectionMappe
|
|
407
|
415
|
throw new ServiceException("被检查级别数据异常");
|
|
408
|
416
|
}
|
|
409
|
417
|
}
|
|
|
418
|
+
|
|
|
419
|
+ /**
|
|
|
420
|
+ * 批量审批任务(同意)
|
|
|
421
|
+ *
|
|
|
422
|
+ * @param approvalWorkflowBatchDto 批量审批参数
|
|
|
423
|
+ * @return 结果
|
|
|
424
|
+ */
|
|
|
425
|
+ @SneakyThrows
|
|
|
426
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
427
|
+ @Override
|
|
|
428
|
+ public int approveTaskBatch(ApprovalWorkflowBatchDto approvalWorkflowBatchDto) {
|
|
|
429
|
+ approvalWorkflowBatchDto.getTaskIdList().forEach(taskId -> {
|
|
|
430
|
+ ApprovalTask task = taskMapper.selectApprovalTaskById(taskId);
|
|
|
431
|
+ ApprovalInstance instance = instanceMapper.selectApprovalInstanceById(task.getInstanceId());
|
|
|
432
|
+ CheckCorrection checkCorrection = selectCheckCorrectionById(instance.getBusinessId());
|
|
|
433
|
+ Map<String, Object> formData = BeanUtil.beanToMap(checkCorrection);
|
|
|
434
|
+ try {
|
|
|
435
|
+ checkApprovalService.approveTask(taskId, approvalWorkflowBatchDto.getComment(), formData, SecurityUtils.getLoginUser().getUserId(), SecurityUtils.getLoginUser().getUsername());
|
|
|
436
|
+ } catch (Exception e) {
|
|
|
437
|
+ throw new ServiceException("审批失败");
|
|
|
438
|
+ }
|
|
|
439
|
+ });
|
|
|
440
|
+ return 1;
|
|
|
441
|
+ }
|
|
|
442
|
+
|
|
|
443
|
+ /**
|
|
|
444
|
+ * 批量审批任务(驳回)
|
|
|
445
|
+ *
|
|
|
446
|
+ * @param approvalWorkflowBatchDto 批量审批参数
|
|
|
447
|
+ * @return 结果
|
|
|
448
|
+ */
|
|
|
449
|
+ @SneakyThrows
|
|
|
450
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
451
|
+ @Override
|
|
|
452
|
+ public int rejectTaskBatch(ApprovalWorkflowBatchDto approvalWorkflowBatchDto) {
|
|
|
453
|
+ approvalWorkflowBatchDto.getTaskIdList().forEach(taskId -> {
|
|
|
454
|
+ try {
|
|
|
455
|
+ checkApprovalService.rejectTask(taskId, approvalWorkflowBatchDto.getComment(), SecurityUtils.getLoginUser().getUserId(), SecurityUtils.getLoginUser().getUsername());
|
|
|
456
|
+ } catch (Exception e) {
|
|
|
457
|
+ throw new ServiceException("审批失败");
|
|
|
458
|
+ }
|
|
|
459
|
+ });
|
|
|
460
|
+ return 1;
|
|
|
461
|
+ }
|
|
410
|
462
|
}
|