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/configItemWarehouse/service/ConfigItemWarehouseService.java | 72 +++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 1 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
index 4d1257c..f07f6d4 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
@@ -1,7 +1,10 @@
package com.zt.life.modules.configItemWarehouse.service;
+import cn.hutool.core.convert.Convert;
import com.zt.common.service.BaseService;
import com.zt.common.utils.CommonUtils;
+import com.zt.life.export.dto.WordFile;
+import com.zt.life.export.service.WordFileService;
import com.zt.life.modules.configItemWarehouse.dao.ConfigItemWarehouseDao;
import com.zt.life.modules.configItemWarehouse.dto.ConfigItemWarehouseDto;
import com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse;
@@ -12,6 +15,8 @@
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
import com.zt.life.modules.itemCirculatOrder.service.ItemCirculatOrderTechnicalService;
+import com.zt.life.modules.mainPart.utils.GetFilesPath;
+import com.zt.life.modules.mainPart.utils.GetShowDictList;
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.project.service.ProjectService;
@@ -29,6 +34,10 @@
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;
@@ -69,6 +78,15 @@
@Autowired
private TestCheckOrderService testCheckOrderService;
+ @Autowired
+ private GetShowDictList getShowDictList;
+
+ @Autowired
+ private WordFileService wordFileService;
+
+ @Autowired
+ private GetFilesPath getFilesPath;
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -77,7 +95,9 @@
*/
public List<ConfigItemWarehouse> page(QueryFilter queryFilter) {
List<ConfigItemWarehouse> list= baseDao.getList(queryFilter.getQueryParams());
- workflowService.getRunFlow(list,"pzxrk");
+ if (list.size() > 0) {
+ workflowService.getRunFlow(list, "pzxrk");
+ }
return list;
}
@@ -207,4 +227,54 @@
return data;
}
+ public void exportWarehouseOrder(Long id, HttpServletRequest request, HttpServletResponse response) {
+ try {
+ ConfigItemWarehouseDto dataObj = this.getDto(null, id);
+
+ String qaAuditorPath = "鏂囦欢鍥剧墖:"+ getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemWarehouse().getQaAuditorId()));
+ dataObj.getConfigItemWarehouse().setQaAuditor(qaAuditorPath);
+ String cmAuditorPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemWarehouse().getCmAuditorId()));
+ dataObj.getConfigItemWarehouse().setCmAuditor(cmAuditorPath);
+ String approvalSignPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemWarehouse().getApprovalId()));
+ dataObj.getConfigItemWarehouse().setApprovalSign(approvalSignPath);
+ String operatorPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getConfigItemWarehouse().getOperatorId()));
+ dataObj.getConfigItemWarehouse().setOperator(operatorPath);
+ //閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
+ String libraryTypeStr = getShowDictList.getShowDictList(dataObj.getConfigItemWarehouse().getLibraryType(), "library_type", false);
+ dataObj.getConfigItemWarehouse().setLibraryType(libraryTypeStr);
+
+ String QaAuditResultStr = getShowDictList.getShowDictList(dataObj.getConfigItemWarehouse().getQaAuditResults(), "is_pass", false);
+ dataObj.getConfigItemWarehouse().setQaAuditResults(QaAuditResultStr);
+
+ String CmAuditResultStr = getShowDictList.getShowDictList(dataObj.getConfigItemWarehouse().getCmAuditResults(), "is_pass", false);
+ dataObj.getConfigItemWarehouse().setCmAuditResults(CmAuditResultStr);
+
+ String ApprovalOpinionStr = getShowDictList.getShowDictList(dataObj.getConfigItemWarehouse().getApprovalOpinions(), "is_agree", false);
+ dataObj.getConfigItemWarehouse().setApprovalOpinions(ApprovalOpinionStr);
+
+ for (WarehouseCmAudit cmAuditList : dataObj.getCmAuditList()) {
+ String value = cmAuditList.getExamineResult();
+ String ExamineResultStr = getShowDictList.getShowDictList(value, "tristate2", false);
+ cmAuditList.setExamineResult(ExamineResultStr);
+ }
+ for (WarehouseQaAudit qaAuditList : dataObj.getQaAuditList()) {
+ String value = qaAuditList.getExamineResult();
+ String ExamineResultStr = getShowDictList.getShowDictList(value, "tristate2", false);
+ qaAuditList.setExamineResult(ExamineResultStr);
+ }
+ for (WarehouseConfigItem configItemList : dataObj.getConfigItemList()) {
+ String value = configItemList.getSecretClass();
+ String secretClassStr = getShowDictList.getShowDictList(value, "secret_class", false);
+ configItemList.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