Commit 766cf7fb by 龙于生

修改审批bug

parent 211fbfdc
......@@ -777,10 +777,7 @@ public class SpmkController {
redisUtil.set(asId.toString(),0,500);
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()
.eq(SpmkExecutor::getId, approvingDto.getExecutorId())
.eq(SpmkExecutor::getEmpNum, userBean.getEmpNum())
......
......@@ -49,7 +49,7 @@ public class Relation implements Serializable{
private List<User> users;
/**
* 主管是否手签 1是 0否
* 是否手签 1是 0否
*/
private Integer signature;
......
......@@ -26,6 +26,4 @@ public class User implements Serializable{
private String headUrl;
private Integer signature;
}
......@@ -616,7 +616,6 @@ public class RouterUtils {
.build()
.updateById();
listUser.get(i_user).setExecute(EXECUTED);
}
// 历史审批人
......@@ -625,6 +624,7 @@ public class RouterUtils {
.historyApprover(listUser.get(i_user).getName())
.build()
.updateById();
//拒绝处理
// 0未执行 1执行中 2同意 3拒绝 4 转派
if (sts == ExecutorSts.REFUSE.ordinal()) {
......@@ -652,6 +652,11 @@ public class RouterUtils {
n_user = listUser.size();
// System.out.println(listUser);
}
}
}else if (UNEXECUTED.equals(listUser.get(i_user).getExecute())) {
SpmkExecutor.builder()
.approveExecuteRecordId(executeRecordId)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment