修改审批bug

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -777,10 +777,7 @@ public class SpmkController {
 			redisUtil.set(asId.toString(),0,500);
 			redisUtil.set(asId.toString(),0,500);
 			return ResultUtil.error("您已审批过!");
 			return ResultUtil.error("您已审批过!");
 		}
 		}
-		Integer integer = spmkExecutorMapper.selectCount(new QueryWrapper<SpmkExecutor>().lambda()
-				.eq(SpmkExecutor::getId, approvingDto.getExecutorId())
-				.eq(SpmkExecutor::getEmpNum, userBean.getEmpNum())
-				.eq(SpmkExecutor::getSts, ExecutorSts.IN_EXECUTION.ordinal()));
+
 		if ( spmkExecutorMapper.selectCount(new QueryWrapper<SpmkExecutor>().lambda()
 		if ( spmkExecutorMapper.selectCount(new QueryWrapper<SpmkExecutor>().lambda()
 				.eq(SpmkExecutor::getId, approvingDto.getExecutorId())
 				.eq(SpmkExecutor::getId, approvingDto.getExecutorId())
 				.eq(SpmkExecutor::getEmpNum, userBean.getEmpNum())
 				.eq(SpmkExecutor::getEmpNum, userBean.getEmpNum())

src/main/java/cn/timer/api/dto/spmk/Relation.java

@@ -49,7 +49,7 @@ public class Relation implements Serializable{
 	private List<User> users;
 	private List<User> users;
 
 
 	/**
 	/**
-	 * 主管是否手签 1是 0否
+	 * 是否手签 1是 0否
 	 */
 	 */
 	private Integer signature;
 	private Integer signature;
 
 

src/main/java/cn/timer/api/dto/spmk/User.java

@@ -26,6 +26,4 @@ public class User implements Serializable{
 	
 	
 	private String headUrl;
 	private String headUrl;
 
 
-	private Integer signature;
-
 }
 }

src/main/java/cn/timer/api/utils/router/RouterUtils.java

@@ -616,42 +616,47 @@ public class RouterUtils {
 									.build()
 									.build()
 									.updateById();
 									.updateById();
 							listUser.get(i_user).setExecute(EXECUTED);
 							listUser.get(i_user).setExecute(EXECUTED);
-						}
 
 
-						
-						// 历史审批人
-						SpmkApproveSummary.builder()
-						.id(asId)
-						.historyApprover(listUser.get(i_user).getName())
-						.build()
-						.updateById();
-						//拒绝处理
-						// 0未执行 1执行中 2同意 3拒绝 4 转派
-						if (sts == ExecutorSts.REFUSE.ordinal()) {
-							// 更新 审批汇总 状态
-							SpmkApproveSummary.builder().id(asId).currentApprover(CommonEnum.NULL_STR.getDesc()).endTime(new Date()).sts(sts).build().updateById();
-							SpmkApproveExecuteRecord
-									.builder()
-									.id(executeRecordId)
-									.sts(sts)
+
+							// 历史审批人
+							SpmkApproveSummary.builder()
+									.id(asId)
+									.historyApprover(listUser.get(i_user).getName())
 									.build()
 									.build()
-									// 更新 审批执行记录
 									.updateById();
 									.updateById();
-							listFlowChildren.get(i_user).setExecute(EXECUTED);
-							return;
-						//转派 处理
-						//在 原审批人 列表中 插入 一个被转派人(审批人)
-						}else if (sts == ExecutorSts.REDEPLOY.ordinal()) {
-							List<User> users1 = CollectionUtil.sub(listUser, 0, i_user+1);
-							redeployUser.setExecute(UNEXECUTED);
-							users1.add(redeployUser);
-							List<User> users2 = CollectionUtil.sub(listUser, i_user+1, listUser.size());
+
+							//拒绝处理
+							// 0未执行 1执行中 2同意 3拒绝 4 转派
+							if (sts == ExecutorSts.REFUSE.ordinal()) {
+								// 更新 审批汇总 状态
+								SpmkApproveSummary.builder().id(asId).currentApprover(CommonEnum.NULL_STR.getDesc()).endTime(new Date()).sts(sts).build().updateById();
+								SpmkApproveExecuteRecord
+										.builder()
+										.id(executeRecordId)
+										.sts(sts)
+										.build()
+										// 更新 审批执行记录
+										.updateById();
+								listFlowChildren.get(i_user).setExecute(EXECUTED);
+								return;
+								//转派 处理
+								//在 原审批人 列表中 插入 一个被转派人(审批人)
+							}else if (sts == ExecutorSts.REDEPLOY.ordinal()) {
+								List<User> users1 = CollectionUtil.sub(listUser, 0, i_user+1);
+								redeployUser.setExecute(UNEXECUTED);
+								users1.add(redeployUser);
+								List<User> users2 = CollectionUtil.sub(listUser, i_user+1, listUser.size());
 //							System.out.println(users1);
 //							System.out.println(users1);
 //							System.out.println(users2);
 //							System.out.println(users2);
-							listUser = ListUtils.union(users1, users2);
-							n_user = listUser.size();
+								listUser = ListUtils.union(users1, users2);
+								n_user = listUser.size();
 //							System.out.println(listUser);
 //							System.out.println(listUser);
+							}
 						}
 						}
+
+						
+
+
 					}else if (UNEXECUTED.equals(listUser.get(i_user).getExecute())) {
 					}else if (UNEXECUTED.equals(listUser.get(i_user).getExecute())) {
 						SpmkExecutor.builder()
 						SpmkExecutor.builder()
 							.approveExecuteRecordId(executeRecordId)
 							.approveExecuteRecordId(executeRecordId)