From bfa0b90c002d6d01f1442ce6882b426efa077a30 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 29 十二月 2023 10:09:26 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java | 18 ++++++++++--------
1 files changed, 10 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 a087e32..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
@@ -159,19 +159,21 @@
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="";
+ 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);
+ checkResultStr = getShowDictList.getShowDictList(value, "tristate1", false);
+ } else {
+ checkResultStr = getShowDictList.getShowDictList(value, "tristate2", false);
}
checkOrderList.setCheckResult(checkResultStr);
}
--
Gitblit v1.9.1