From a38a1ac77bb6ac9ea8bf0cf5f5f6b68d0e6e6974 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 02 一月 2024 08:44:10 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 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 2f1d9b9..c1d3206 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
@@ -76,7 +76,9 @@
*/
public List<TestCheckOrder> page(QueryFilter queryFilter) {
List<TestCheckOrder> list = baseDao.getList(queryFilter.getQueryParams());
- workflowService.getRunFlow(list, "csjcd");
+ if (list.size() > 0) {
+ workflowService.getRunFlow(list, "csjcd");
+ }
return list;
}
@@ -157,15 +159,22 @@
public void exportCheckOrder(Long id, String pageCode, HttpServletRequest request, HttpServletResponse response) {
try {
CheckOrderDto dataObj = this.getDto(id, null, pageCode);
+ if (dataObj.getCheckOrder().getProcessorId() != null && dataObj.getCheckOrder().getVerifierId() != null) {
+ 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);
+ }
- 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);
+ String checkResultStr = "";
+ if ("plan".equals(pageCode) || "report".equals(pageCode) || "record".equals(pageCode) || "explain".equals(pageCode)) {
+ checkResultStr = getShowDictList.getShowDictList(value, "tristate1", false);
+ } else {
+ checkResultStr = getShowDictList.getShowDictList(value, "tristate2", false);
+ }
checkOrderList.setCheckResult(checkResultStr);
}
@@ -174,11 +183,21 @@
map.put("report", "鎶ュ憡");
map.put("record", "璁板綍");
map.put("explain", "璇存槑");
+ map.put("contract", "鍚堝悓璇勫");
+ map.put("require", "娴嬭瘯闇�姹傚垎鏋愪笌绛栧垝");
+ map.put("execute", "娴嬭瘯璁捐銆佸疄鐜颁笌鎵ц");
+ map.put("summary", "娴嬭瘯鎬荤粨");
String type = map.get(pageCode);
dataObj.setPageCode(type);
WordFile wordFile = new WordFile();
- wordFile.setModulePath("杞欢娴嬭瘯妫�鏌ュ崟.docx");
- wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_杞欢娴嬭瘯"+type+"妫�鏌ュ崟.docx");
+
+ if ("plan".equals(pageCode) || "report".equals(pageCode) || "record".equals(pageCode) || "explain".equals(pageCode)) {
+ wordFile.setModulePath("杞欢娴嬭瘯妫�鏌ュ崟.docx");
+ wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_杞欢娴嬭瘯" + type + "妫�鏌ュ崟.docx");
+ } else {
+ wordFile.setModulePath("璐ㄩ噺淇濊瘉妫�鏌ュ崟.docx");
+ wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_璐ㄩ噺淇濊瘉妫�鏌ュ崟(" + type + ").docx");
+ }
wordFileService.exportWordFile(request, dataObj, wordFile, response);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
--
Gitblit v1.9.1