From 67c04bf46afc584884b73a57d3d23012126c5afc Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 19 十二月 2023 10:23:06 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/contractReview/service/ContractReviewService.java | 37 ++++++++++++-------------------------
1 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/service/ContractReviewService.java b/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/service/ContractReviewService.java
index e928147..e98c842 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/service/ContractReviewService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/contractReview/service/ContractReviewService.java
@@ -124,6 +124,7 @@
} else {
testAgencyInfoService.update(reviewDto.getTestAgencyInfo());
}
+ sysOssConfigService.updateOss(reviewDto.getId(), reviewDto.getFiles());// 淇濆瓨闄勪欢
return true;
}
@@ -161,45 +162,31 @@
data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
return data;
}
-/*
- public void exportCirculatOrder(Long id, HttpServletRequest request, HttpServletResponse response) {
+
+
+ public void exportReview(Long id, HttpServletRequest request, HttpServletResponse response) {
try {
ContractReviewDto dataObj = this.getDto(null, id);
- String acceptorPath = "鏂囦欢鍥剧墖:"+ getFilesPath.getSignPath(Convert.toLong(dataObj.getContractReview().getItemAcceptorId()));
- dataObj.getContractReview().setItemAcceptor(acceptorPath);
- String detectorPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getContractReview().getCalibratDetectorId()));
- dataObj.getContractReview().setCalibratDetector(detectorPath);
- String issuerPath = "鏂囦欢鍥剧墖:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getContractReview().getItemIssuerId()));
- dataObj.getContractReview().setItemIssuer(issuerPath);
//閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
- String itemRequireStr = getShowDictList.getShowDictList(dataObj.getContractReview().getItemRequire(), "is_or_not", false);
- dataObj.getContractReview().setItemRequireStr(itemRequireStr);
-
- String acceptSituationStr = getShowDictList.getShowDictList(dataObj.getContractReview().getAcceptSituation(), "is_or_not", false);
- dataObj.getContractReview().setAcceptSituationStr(acceptSituationStr);
-
- String detectSituationStr = getShowDictList.getShowDictList(dataObj.getContractReview().getDetectSituation(), "is_or_not", false);
- dataObj.getContractReview().setDetectSituationStr(detectSituationStr);
-
- String issueSituationStr = getShowDictList.getShowDictList(dataObj.getContractReview().getIssueSituation(), "is_or_not", false);
- dataObj.getContractReview().setIssueSituationStr(issueSituationStr);
+ String reviewTypeStr = getShowDictList.getShowDictList(dataObj.getContractReview().getReviewType(), "review_type", false);
+ dataObj.getContractReview().setReviewType(reviewTypeStr);
for (ContractReviewItem reviewItem : dataObj.getReviewItemList()) {
- String value = reviewItem.getSecretClass();
- String secretClassStr = getShowDictList.getShowDictList(value, "secret_class", false);
- reviewItem.setSecretClass(secretClassStr);
+ String value = reviewItem.getResult();
+ String ResultStr = getShowDictList.getShowDictList(value, "tristate1", false);
+ reviewItem.setResult(ResultStr);
}
WordFile wordFile = new WordFile();
- wordFile.setModulePath("鐗╁搧娴佽浆鍗�.docx");
- wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_鐗╁搧娴佽浆鍗�.docx");
+ 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