From b21945e7dea2daa8b30bee3cdd4bca91277e3b5f Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 29 十一月 2023 09:22:17 +0800
Subject: [PATCH] 6
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
index 54ded60..93b4818 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
@@ -6,6 +6,7 @@
import com.zt.core.sys.dto.DictLeafDto;
import com.zt.life.export.dto.WordFile;
import com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderDao;
+import com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderTechnicalDao;
import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
@@ -14,12 +15,16 @@
import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.modules.project.service.SoftwareTestOrderService;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
+import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.oss.service.SysOssService;
+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 javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -35,11 +40,11 @@
/**
* item_circulat_order
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-11-22
*/
@Service
-public class ItemCirculatOrderService extends BaseService<ItemCirculatOrderDao, ItemCirculatOrder> {
+public class ItemCirculatOrderService extends BaseService<ItemCirculatOrderDao, ItemCirculatOrder> {
@Autowired
private SysOssConfigService sysOssConfigService;
@@ -59,7 +64,8 @@
private ItemCirculatOrderTechnicalService technicalService;
@Autowired
- private SoftwareTestOrderService softwareTestOrderService;
+ private WorkflowService workflowService;
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -86,7 +92,7 @@
else {
Map<String, String> map = new HashMap<>();
map.put("funCode", "item_circulat_order");
- map.put("projectId",itemCirculatOrderDto.getProjectId().toString());
+ map.put("projectId", itemCirculatOrderDto.getProjectId().toString());
itemCirculatOrderDto.getCirculatOrder().setProjectId(itemCirculatOrderDto.getProjectId());
itemCirculatOrderDto.getCirculatOrder().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(itemCirculatOrderDto.getCirculatOrder());
@@ -101,6 +107,7 @@
circulatOrderTechnical.setCirculatOrderId(circulatOrderid);
technicalService.insert(circulatOrderTechnical);
}
+ sysOssConfigService.updateOss(circulatOrderTechnical.getId(), circulatOrderTechnical.getFiles());// 淇濆瓨闄勪欢
}
if (itemCirculatOrderDto.getTestAgencyInfo().getId() == 10000) {
@@ -109,7 +116,15 @@
} else {
testAgencyInfoService.update(itemCirculatOrderDto.getTestAgencyInfo());
}
- sysOssConfigService.updateOss(itemCirculatOrderDto.getId(), itemCirculatOrderDto.getFiles());// 淇濆瓨闄勪欢
+
+ Long bizId = itemCirculatOrderDto.getCirculatOrder().getId();
+ FlowInfoDto flowInfoDto = itemCirculatOrderDto.getFlowInfoDto();
+ if ("tj".equals(flowInfoDto.getSubmitType()) || "bl".equals(flowInfoDto.getSubmitType())) {
+ if ("tj".equals(flowInfoDto.getSubmitType())) {
+ workflowService.startFlow(flowInfoDto.getFlowCode(), bizId);
+ }
+ workflowService.approvePass(flowInfoDto.getFlowCode(), bizId, flowInfoDto.getStepIdMark());
+ }
return true;
}
@@ -128,12 +143,11 @@
data.setTechnicalList(technicalList);
} else {
- ItemCirculatOrder itemCirculatOrder =new ItemCirculatOrder();
+ ItemCirculatOrder itemCirculatOrder = new ItemCirculatOrder();
data.setCirculatOrder(itemCirculatOrder);
- List<?> resultList = baseDao.itemList(projectId);
+ List<?> resultList = technicalService.itemList(projectId);
List<?> technicalList = resultList;
data.setTechnicalList((List<ItemCirculatOrderTechnical>) technicalList);
-
}
if (projectId != null) {
--
Gitblit v1.9.1