From 497ee5e5905f1808717ffec2ee2889262d2ba90c Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 07 十二月 2023 17:15:35 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
index 1d396dd..344a19f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
@@ -17,6 +17,7 @@
import com.zt.life.sys.dto.OssDto;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.workflow.dto.FlowInfoDto;
+import com.zt.modules.workflow.service.WorkflowService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
@@ -44,6 +45,9 @@
@Autowired
private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private WorkflowService workflowService;
/**
@@ -76,12 +80,12 @@
if (projectId == null) {
projectId = checkOrder.getProjectId();
}
-
List<TestCheckOrderList> checkOrderList = checkOrderListService.getList(checkId);
data.setCheckOrderList(checkOrderList);
} else {
TestCheckOrder checkOrder = new TestCheckOrder();
+ checkOrder.setPageCode(pageCode);
data.setCheckOrder(checkOrder);
List<TestCheckOrderList> checkOrderList = checkOrderListService.itemList(pageCode + "_check_item");
data.setCheckOrderList(checkOrderList);
@@ -93,7 +97,7 @@
return data;
}
- public Boolean save(CheckOrderDto checkOrderDto) {
+ public Long save(CheckOrderDto checkOrderDto) {
Long checkId = checkOrderDto.getCheckOrder().getId();
if (checkId != null)
baseDao.updateById(checkOrderDto.getCheckOrder());
@@ -117,6 +121,16 @@
checkOrderListService.insert(checkOrderList);
}
}
- return true;
+
+ Long bizId = checkOrderDto.getCheckOrder().getId();
+ FlowInfoDto flowInfoDto = checkOrderDto.getFlowInfoDto();
+
+ if (flowInfoDto != null && flowInfoDto.getSubmitType() != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
+ if ("tj".equals(flowInfoDto.getSubmitType())) {
+ workflowService.startFlow(flowInfoDto.getFlowCode(), bizId);
+ }
+ workflowService.approvePass(flowInfoDto.getFlowCode(), bizId, flowInfoDto.getStepIdMark());
+ }
+ return checkId;
}
}
--
Gitblit v1.9.1