From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 23 二月 2024 12:19:55 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 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..5e6471d 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
@@ -2,6 +2,8 @@
import cn.hutool.core.convert.Convert;
import com.zt.common.service.BaseService;
+import com.zt.core.context.User;
+import com.zt.core.context.UserContext;
import com.zt.life.export.dto.WordFile;
import com.zt.life.export.service.WordFileService;
import com.zt.life.modules.configItemWarehouse.dto.ConfigItemWarehouseDto;
@@ -75,8 +77,15 @@
* @return
*/
public List<TestCheckOrder> page(QueryFilter queryFilter) {
+ User user = UserContext.getUser();
+ Integer secretClass = user.getSecretClass();
+ Long deptId = user.getDeptId();
+ queryFilter.getQueryParams().put("secretClass",secretClass);
+ queryFilter.getQueryParams().put("deptId",deptId);
List<TestCheckOrder> list = baseDao.getList(queryFilter.getQueryParams());
- workflowService.getRunFlow(list, "csjcd");
+ if (list.size() > 0) {
+ workflowService.getRunFlow(list, "csjcd");
+ }
return list;
}
@@ -157,15 +166,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 +190,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