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 | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 3f0dff6..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,9 +17,11 @@
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;
+
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
@@ -30,11 +32,11 @@
/**
* test_check_order
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-12-05
*/
@Service
-public class TestCheckOrderService extends BaseService<TestCheckOrderDao, TestCheckOrder> {
+public class TestCheckOrderService extends BaseService<TestCheckOrderDao, TestCheckOrder> {
@Autowired
private TestCheckOrderListService checkOrderListService;
@@ -43,6 +45,9 @@
@Autowired
private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private WorkflowService workflowService;
/**
@@ -65,7 +70,7 @@
}
- public CheckOrderDto getDto(Long checkId, Long projectId,String pageCode) {
+ public CheckOrderDto getDto(Long checkId, Long projectId, String pageCode) {
CheckOrderDto data = new CheckOrderDto();
data.setPageCode(pageCode);
if (checkId != null) {
@@ -75,14 +80,14 @@
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");
+ List<TestCheckOrderList> checkOrderList = checkOrderListService.itemList(pageCode + "_check_item");
data.setCheckOrderList(checkOrderList);
}
if (projectId != null) {
@@ -92,13 +97,14 @@
return data;
}
- public Boolean save(CheckOrderDto checkOrderDto) {
+ public Long save(CheckOrderDto checkOrderDto) {
Long checkId = checkOrderDto.getCheckOrder().getId();
if (checkId != null)
baseDao.updateById(checkOrderDto.getCheckOrder());
else {
Map<String, String> map = new HashMap<>();
- map.put("funCode", "test_check_order");
+ String pagecode = checkOrderDto.getPageCode();
+ map.put("funCode", "test_check_order_" + pagecode);
map.put("projectId", checkOrderDto.getProjectId().toString());
checkOrderDto.getCheckOrder().setProjectId(checkOrderDto.getProjectId());
checkOrderDto.getCheckOrder().setCode(sysCodeRuleService.getNewCode(map));
@@ -115,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