From 0dff85a422669f41ef6d8e88fa24bf26ca164cbd Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 12 十二月 2023 10:38:03 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 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 344a19f..2f1d9b9 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
@@ -1,6 +1,9 @@
package com.zt.life.modules.testCheckOrder.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.dto.ConfigItemWarehouseDto;
import com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit;
import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem;
@@ -8,6 +11,8 @@
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.GetFilesPath;
+import com.zt.life.modules.mainPart.utils.GetShowDictList;
import com.zt.life.modules.project.model.Project;
import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.modules.testCheckOrder.dao.TestCheckOrderDao;
@@ -23,6 +28,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.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -44,10 +53,19 @@
private ProjectService projectService;
@Autowired
+ private GetShowDictList getShowDictList;
+
+ @Autowired
private SysCodeRuleService sysCodeRuleService;
@Autowired
private WorkflowService workflowService;
+
+ @Autowired
+ private GetFilesPath getFilesPath;
+
+ @Autowired
+ private WordFileService wordFileService;
/**
@@ -57,7 +75,9 @@
* @return
*/
public List<TestCheckOrder> page(QueryFilter queryFilter) {
- return baseDao.getList(queryFilter.getQueryParams());
+ List<TestCheckOrder> list = baseDao.getList(queryFilter.getQueryParams());
+ workflowService.getRunFlow(list, "csjcd");
+ return list;
}
/**
@@ -133,4 +153,37 @@
}
return checkId;
}
+
+ public void exportCheckOrder(Long id, String pageCode, HttpServletRequest request, HttpServletResponse response) {
+ try {
+ CheckOrderDto dataObj = this.getDto(id, null, pageCode);
+
+ String processorPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getCheckOrder().getProcessorId()));
+ dataObj.getCheckOrder().setProcessor(processorPath);
+ String verifierPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getCheckOrder().getVerifierId()));
+ dataObj.getCheckOrder().setVerifier(verifierPath);
+ //閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
+ for (TestCheckOrderList checkOrderList : dataObj.getCheckOrderList()) {
+ String value = checkOrderList.getCheckResult();
+ String checkResultStr = getShowDictList.getShowDictList(value, "tristate1", false);
+ checkOrderList.setCheckResult(checkResultStr);
+ }
+
+ Map<String, String> map = new HashMap<>();
+ map.put("plan", "璁″垝");
+ map.put("report", "鎶ュ憡");
+ map.put("record", "璁板綍");
+ map.put("explain", "璇存槑");
+ String type = map.get(pageCode);
+ dataObj.setPageCode(type);
+ WordFile wordFile = new WordFile();
+ wordFile.setModulePath("杞欢娴嬭瘯妫�鏌ュ崟.docx");
+ wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_杞欢娴嬭瘯"+type+"妫�鏌ュ崟.docx");
+ wordFileService.exportWordFile(request, dataObj, wordFile, response);
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.9.1