待办状态根据抢签与被抢签调整
This commit is contained in:
parent
b2882d58e1
commit
b2ff53fa48
@ -328,6 +328,22 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
|
|||||||
|
|
||||||
//必须已经全部通过 不是会签的话例外
|
//必须已经全部通过 不是会签的话例外
|
||||||
if (operatedUsers.containsAll(assigneeList) || notAll) {
|
if (operatedUsers.containsAll(assigneeList) || notAll) {
|
||||||
|
//当前环节审批人 用来完成当前环节审批人的待办
|
||||||
|
String assignees = approvalConfigPojo.getAssignees();
|
||||||
|
for (String assID : Arrays.asList(assignees.split(","))) {
|
||||||
|
Integer isd;
|
||||||
|
if (assID.equals(approver)) {
|
||||||
|
isd = 1;//抢签者完成
|
||||||
|
} else {
|
||||||
|
isd = 2;//被抢签完成
|
||||||
|
}
|
||||||
|
sw.buildFromDatasource("xdap_app_223770822127386625")
|
||||||
|
.update("is_delete", isd)
|
||||||
|
.update("last_update_date", new Date())
|
||||||
|
.eq("document_no", approvalId)
|
||||||
|
.eq("owner_id", assID)
|
||||||
|
.doUpdate(TodoTaskPojo.class);
|
||||||
|
}
|
||||||
// 获取下一个环节
|
// 获取下一个环节
|
||||||
List<ApprovalConfigPojo> approvalConfigPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
|
List<ApprovalConfigPojo> approvalConfigPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
|
||||||
.eq("approval_id", approvalId)
|
.eq("approval_id", approvalId)
|
||||||
@ -335,15 +351,7 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
|
|||||||
.doQuery(ApprovalConfigPojo.class);
|
.doQuery(ApprovalConfigPojo.class);
|
||||||
|
|
||||||
if (ObjectUtils.isNotEmpty(approvalConfigPojos)) {
|
if (ObjectUtils.isNotEmpty(approvalConfigPojos)) {
|
||||||
//当前环节审批人 用来完成当前环节审批人的待办
|
|
||||||
String assignees = approvalConfigPojo.getAssignees();
|
|
||||||
for (String assID : Arrays.asList(assignees.split(","))) {
|
|
||||||
sw.buildFromDatasource("xdap_app_223770822127386625")
|
|
||||||
.update("is_delete", 1)
|
|
||||||
.update("last_update_date", new Date())
|
|
||||||
.eq("document_no", approvalId)
|
|
||||||
.doUpdate(TodoTaskPojo.class);
|
|
||||||
}
|
|
||||||
ApprovalConfigPojo approvalConfigPojo1 = approvalConfigPojos.get(0);
|
ApprovalConfigPojo approvalConfigPojo1 = approvalConfigPojos.get(0);
|
||||||
for (String nextAssId : Arrays.asList(approvalConfigPojo1.getAssignees().split(","))) {
|
for (String nextAssId : Arrays.asList(approvalConfigPojo1.getAssignees().split(","))) {
|
||||||
TodoTaskPojo todoTaskPojo = new TodoTaskPojo();
|
TodoTaskPojo todoTaskPojo = new TodoTaskPojo();
|
||||||
@ -415,12 +423,6 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
|
|||||||
.update("approver_persons", "")
|
.update("approver_persons", "")
|
||||||
.update("last_update_date", new Date())
|
.update("last_update_date", new Date())
|
||||||
.eq("id", approvalId).doUpdate(EngineReviewListPojo.class);
|
.eq("id", approvalId).doUpdate(EngineReviewListPojo.class);
|
||||||
//审批流所有的待办完成处理
|
|
||||||
sw.buildFromDatasource("xdap_app_223770822127386625")
|
|
||||||
.update("is_delete", 1)
|
|
||||||
.update("last_update_date", new Date())
|
|
||||||
.eq("document_no", approvalId)
|
|
||||||
.doUpdate(TodoTaskPojo.class);
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
//如果还有未通过的 找到未通过的
|
//如果还有未通过的 找到未通过的
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user