jiezhoufg/yc_fdjyfluru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改:流程修改v2.0

Browse Source
This commit is contained in:
zjh 2025-12-25 10:14:53 +08:00
parent 57d173a71d
commit 7ece605c71
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java
View File

@ -360,7 +360,7 @@ public class BenchmarkingReportServiceImpl implements BenchmarkingReportService
// 待办环节修改 // 待办环节修改
bd.getBusinessDatabase() bd.getBusinessDatabase()
.eq("document_no", flow.getId()) .eq("document_no", flow.getId())
.update("node", "已完成") .update("current_node", "已完成")
.doUpdate(TodoTaskPojo.class); .doUpdate(TodoTaskPojo.class);
} else { } else {
flow.setCurrentNode(1); flow.setCurrentNode(1);
@ -406,8 +406,10 @@ public class BenchmarkingReportServiceImpl implements BenchmarkingReportService
list.add(todoTask); list.add(todoTask);
} }
} }
if (!list.isEmpty()) {
bd.getBusinessDatabase().doBatchInsert(list); bd.getBusinessDatabase().doBatchInsert(list);
} }
}
private void cancelProcess(ApprovalFlow flow, String status, String userId) { private void cancelProcess(ApprovalFlow flow, String status, String userId) {
flow.setFlowStatus(status); flow.setFlowStatus(status);
@ -427,7 +429,7 @@ public class BenchmarkingReportServiceImpl implements BenchmarkingReportService
bd.getBusinessDatabase() bd.getBusinessDatabase()
.eq("document_no", flow.getId()) .eq("document_no", flow.getId())
.update("node", "已拒绝") .update("current_node", "已拒绝")
.doUpdate(TodoTaskPojo.class); .doUpdate(TodoTaskPojo.class);
// 清除所有待办 // 清除所有待办
clearAllTodo(flow, userId); clearAllTodo(flow, userId);

12
src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java
View File

@ -299,7 +299,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
bd.getBusinessDatabase() bd.getBusinessDatabase()
.eq("document_no", flow.getId()) .eq("document_no", flow.getId())
.update("node", "已拒绝") .update("current_node", "已拒绝")
.doUpdate(TodoTaskPojo.class); .doUpdate(TodoTaskPojo.class);
// 清除所有待办 // 清除所有待办
clearAllTodo(flow); clearAllTodo(flow);
@ -352,7 +352,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
// 待办环节修改 // 待办环节修改
bd.getBusinessDatabase() bd.getBusinessDatabase()
.eq("document_no", flow.getId()) .eq("document_no", flow.getId())
.update("node", "已完成") .update("current_node", "已完成")
.doUpdate(TodoTaskPojo.class); .doUpdate(TodoTaskPojo.class);
// 更新机型版本 // 更新机型版本
// dataEntryEngineModelService.updateModelForNewVersion(); // dataEntryEngineModelService.updateModelForNewVersion();
@ -393,7 +393,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
.eq("owner_id", person).doQueryFirst(TodoTaskPojo.class); .eq("owner_id", person).doQueryFirst(TodoTaskPojo.class);
if (todoTaskPojo != null) { if (todoTaskPojo != null) {
todoTaskPojo.setCurrentNode(node.getNodeName()); todoTaskPojo.setCurrentNode(node.getNodeName());
todoTaskPojo.setCurrentProcessor(JSON.toJSONString(node.getAssignees())); todoTaskPojo.setCurrentProcessor(node.getAssignees());
bd.getBusinessDatabase().doUpdate(todoTaskPojo); bd.getBusinessDatabase().doUpdate(todoTaskPojo);
} else { } else {
TodoTaskPojo todoTask = new TodoTaskPojo(); TodoTaskPojo todoTask = new TodoTaskPojo();
@ -410,12 +410,14 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
todoTask.setStatusCode(flow.getFlowStatus()); todoTask.setStatusCode(flow.getFlowStatus());
todoTask.setVersionNumber(template.getVersion()); todoTask.setVersionNumber(template.getVersion());
todoTask.setOwnerId(person); todoTask.setOwnerId(person);
todoTask.setCurrentProcessor(JSON.toJSONString(node.getAssignees())); todoTask.setCurrentProcessor(node.getAssignees());
list.add(todoTask); list.add(todoTask);
} }
} }
if (!list.isEmpty()) {
bd.getBusinessDatabase().doBatchInsert(list); bd.getBusinessDatabase().doBatchInsert(list);
} }
}
@Override @Override
public PageQueryResult<TemplateChangeView> getTemplateChanges(ApprovalAndParameterForm form) { public PageQueryResult<TemplateChangeView> getTemplateChanges(ApprovalAndParameterForm form) {
@ -562,7 +564,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
} }
ApprovalConfigPojo currentNode = bd.getBusinessDatabase() ApprovalConfigPojo currentNode = bd.getBusinessDatabase()
.eq("approval_id", request.getFlowId()) .eq("approval_id", request.getFlowId())
.eq("current_node", Integer.valueOf(flow.getCurrentNode())) .eq("current_node", flow.getCurrentNode())
.doQueryFirst(ApprovalConfigPojo.class); .doQueryFirst(ApprovalConfigPojo.class);
if ("RETURN".equals(request.getResult())) { if ("RETURN".equals(request.getResult())) {
ApprovalRecord record = new ApprovalRecord(); ApprovalRecord record = new ApprovalRecord();