From da2330bb7951c602ebe72a9f53ff13d0895b3349 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 15 十二月 2023 10:57:55 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 202 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 197 insertions(+), 5 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 f49494d..74bd644 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
@@ -1,22 +1,76 @@
package com.zt.life.modules.itemCirculatOrder.service;
+import cn.hutool.core.convert.Convert;
import com.zt.common.service.BaseService;
+import com.zt.life.export.dto.WordFile;
+import com.zt.life.export.service.WordFileService;
+import com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse;
import com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderDao;
+import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
+import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
+import com.zt.life.modules.mainPart.utils.GetShowDictList;
+import com.zt.life.modules.mainPart.utils.GetFilesPath;
+import com.zt.life.modules.project.model.*;
+import com.zt.life.modules.project.service.ProjectService;
+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;
+import java.io.FileNotFoundException;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 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;
+
+ @Autowired
+ private SysOssService sysOssService;
+
+ @Autowired
+ private TestAgencyInfoService testAgencyInfoService;
+
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private ProjectService projectService;
+
+ @Autowired
+ private ItemCirculatOrderTechnicalService technicalService;
+
+ @Autowired
+ private WorkflowService workflowService;
+
+ @Autowired
+ private GetShowDictList getShowDictList;
+
+ @Autowired
+ private WordFileService wordFileService;
+
+ @Autowired
+ private GetFilesPath getFilesPath;
+
/**
* 鍒嗛〉鏌ヨ
@@ -25,10 +79,14 @@
* @return
*/
public List<ItemCirculatOrder> page(QueryFilter queryFilter) {
- return baseDao.getList(queryFilter.getQueryParams());
+ List<ItemCirculatOrder> list= baseDao.getList(queryFilter.getQueryParams());
+ if (list.size() > 0) {
+ workflowService.getRunFlow(list, "wplz");
+ }
+ return list;
}
- /**
+ /**yi
* 鍒犻櫎
*
* @param ids
@@ -37,4 +95,138 @@
super.deleteLogic(ids);
}
+ public Boolean save(ItemCirculatOrderDto itemCirculatOrderDto) {
+ Long circulatOrderid = itemCirculatOrderDto.getCirculatOrder().getId();
+ if (circulatOrderid != null)
+ baseDao.updateById(itemCirculatOrderDto.getCirculatOrder());
+ else {
+ Map<String, String> map = new HashMap<>();
+ map.put("funCode", "item_circulat_order");
+ map.put("projectId", itemCirculatOrderDto.getProjectId().toString());
+ itemCirculatOrderDto.getCirculatOrder().setProjectId(itemCirculatOrderDto.getProjectId());
+ itemCirculatOrderDto.getCirculatOrder().setCode(sysCodeRuleService.getNewCode(map));
+ baseDao.insert(itemCirculatOrderDto.getCirculatOrder());
+ circulatOrderid = itemCirculatOrderDto.getCirculatOrder().getId();
+ }
+
+ for (ItemCirculatOrderTechnical circulatOrderTechnical : itemCirculatOrderDto.getTechnicalList()) {
+ circulatOrderTechnical.setCirculatOrderId(circulatOrderid);
+ if (circulatOrderTechnical.getId() != null) {
+ technicalService.update(circulatOrderTechnical);
+ } else {
+ circulatOrderTechnical.setCirculatOrderId(circulatOrderid);
+ technicalService.insert(circulatOrderTechnical);
+ }
+ sysOssConfigService.updateOss(circulatOrderTechnical.getId(), circulatOrderTechnical.getFiles());// 淇濆瓨闄勪欢
+ }
+
+ if (itemCirculatOrderDto.getTestAgencyInfo().getId() == 10000) {
+ itemCirculatOrderDto.getTestAgencyInfo().setId(circulatOrderid);
+ testAgencyInfoService.insert(itemCirculatOrderDto.getTestAgencyInfo());
+ } else {
+ testAgencyInfoService.update(itemCirculatOrderDto.getTestAgencyInfo());
+ }
+
+ Long bizId = itemCirculatOrderDto.getCirculatOrder().getId();
+ FlowInfoDto flowInfoDto = itemCirculatOrderDto.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 true;
+ }
+
+ public ItemCirculatOrderDto getDto(Long projectId, Long circulatOrderid) {
+ ItemCirculatOrderDto data = new ItemCirculatOrderDto();
+ if (circulatOrderid != null) {
+ data.setId(circulatOrderid);
+ ItemCirculatOrder itemCirculatOrder = this.get(circulatOrderid);
+ data.setCirculatOrder(itemCirculatOrder);
+ if (projectId == null) {
+ projectId = itemCirculatOrder.getProjectId();
+ }
+
+ data.setTestAgencyInfo(testAgencyInfoService.get(circulatOrderid));
+
+ List<ItemCirculatOrderTechnical> technicalList = technicalService.getList(circulatOrderid);
+ data.setTechnicalList(technicalList);
+
+ } else {
+ ItemCirculatOrder itemCirculatOrder = new ItemCirculatOrder();
+ data.setCirculatOrder(itemCirculatOrder);
+ List<?> resultList = technicalService.itemList(projectId);
+ List<?> technicalList = resultList;
+ data.setTechnicalList((List<ItemCirculatOrderTechnical>) technicalList);
+ }
+
+ if (projectId != null) {
+ data.setProjectId(projectId);
+ Project project = projectService.get(projectId);
+ String type = project.getSoftwareType();
+ if (type == "3") {
+ type = "2";
+ } else {
+ type = "1";
+ }
+ project.setSoftwareType(type);
+ data.setProject(project);
+ }
+ if (data.getTestAgencyInfo() == null)
+ data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
+ if (circulatOrderid != null) {
+ for (ItemCirculatOrderTechnical technical : data.getTechnicalList()) {
+ Long technicalId = technical.getId();
+ OssDto ossDto = sysOssConfigService.getOssByBusiType(technicalId, "circulat_order");
+ if (ossDto != null) {
+ technical.setFiles(ossDto);
+ }
+ }
+ }
+ return data;
+ }
+
+ public void exportCirculatOrder(Long id, HttpServletRequest request, HttpServletResponse response) {
+ try {
+ ItemCirculatOrderDto dataObj = this.getDto(null, id);
+
+ String acceptorPath = "鏂囦欢鍥剧墖:"+ getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getItemAcceptorId()));
+ dataObj.getCirculatOrder().setItemAcceptor(acceptorPath);
+ String detectorPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getCalibratDetectorId()));
+ dataObj.getCirculatOrder().setCalibratDetector(detectorPath);
+ String issuerPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getItemIssuerId()));
+ dataObj.getCirculatOrder().setItemIssuer(issuerPath);
+ //閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
+ String itemRequireStr = getShowDictList.getShowDictList(dataObj.getCirculatOrder().getItemRequire(), "is_or_not", false);
+ dataObj.getCirculatOrder().setItemRequireStr(itemRequireStr);
+
+ String acceptSituationStr = getShowDictList.getShowDictList(dataObj.getCirculatOrder().getAcceptSituation(), "is_or_not", false);
+ dataObj.getCirculatOrder().setAcceptSituationStr(acceptSituationStr);
+
+ String detectSituationStr = getShowDictList.getShowDictList(dataObj.getCirculatOrder().getDetectSituation(), "is_or_not", false);
+ dataObj.getCirculatOrder().setDetectSituationStr(detectSituationStr);
+
+ String issueSituationStr = getShowDictList.getShowDictList(dataObj.getCirculatOrder().getIssueSituation(), "is_or_not", false);
+ dataObj.getCirculatOrder().setIssueSituationStr(issueSituationStr);
+
+ for (ItemCirculatOrderTechnical technical : dataObj.getTechnicalList()) {
+ String value = technical.getSecretClass();
+ String secretClassStr = getShowDictList.getShowDictList(value, "secret_class", false);
+ technical.setSecretClass(secretClassStr);
+ }
+
+
+ WordFile wordFile = new WordFile();
+ wordFile.setModulePath("鐗╁搧娴佽浆鍗�.docx");
+ wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_鐗╁搧娴佽浆鍗�.docx");
+ wordFileService.exportWordFile(request, dataObj, wordFile, response);
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
+ }
+
}
--
Gitblit v1.9.1