批量审批修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -857,12 +857,17 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 			e.setAuditMsg(auditMsg);
 			if ("ffsq".equals(e.getCheckType())) {
 				this.operationFinanceProcess(e);
-			} else if ("xsqh".equals(e.getCheckType())) {
+			} else if ("xsqh".equals(e.getCheckType()) || "cgqh".equals(e.getCheckType()) || "xstpqh".equals(e.getCheckType())) {
 				this.orderCheckProcess(e);
+			} else if ("xsgz".equals(e.getCheckType()) || "czgz".equals(e.getCheckType()) || "gzgz".equals(e.getCheckType()) || "hqgz".equals(e.getCheckType())) {
+				this.salaryCheck(e);
+			} else if ("dldd".equals(e.getCheckType())) {
+				this.agencyOrderProcess(e);
+			} else if ("ocg".equals(e.getCheckType()) || "oly".equals(e.getCheckType())) {
+				this.officeCheck(e);
 			} else {
-				throw new SecurityException("存在审批类型为空的数据,请联系管理员");
+				this.commonCheck(e);
 			}
-
 		});
 	}
 
@@ -946,9 +951,9 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 		List<AuditProecess> auditProecessList = proecessList.stream().filter(e -> e.getBatchNo() == max).collect(Collectors.toList());
 		//如果最新审批记录 第一级已经操作,就禁止撤回
 		long count = auditProecessList.stream().filter(
-			e -> e.getBatchNo() == max &&
-				e.getLevelId() == 1 &&
-				("A".equals(e.getAuditStatus()) || "B".equals(e.getAuditStatus())))
+				e -> e.getBatchNo() == max &&
+					e.getLevelId() == 1 &&
+					("A".equals(e.getAuditStatus()) || "B".equals(e.getAuditStatus())))
 			.count();
 		if (count > 0) {
 			throw new SecurityException("第一级审批已经开始,禁止撤回");
@@ -1537,7 +1542,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class,timeoutMills = 12000000)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void agencyOrderProcess(AuditProecess auditProecess) {
 		//查看最新操作记录,防止重复提交
 		AuditProecess proecessTemp = baseMapper.selectById(auditProecess.getId());