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/testReviewComment/service/TestReviewCommentService.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testReviewComment/service/TestReviewCommentService.java b/modules/mainPart/src/main/java/com/zt/life/modules/testReviewComment/service/TestReviewCommentService.java
index ffc7698..f1e3cee 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testReviewComment/service/TestReviewCommentService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testReviewComment/service/TestReviewCommentService.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.baselineRelease.dto.BaselineDto;
@@ -9,16 +11,19 @@
import com.zt.life.modules.baselineRelease.model.BaselineReleaseRemark;
import com.zt.life.modules.baselineRelease.service.BaselineReleaseRemarkService;
import com.zt.life.modules.project.service.ProjectService;
+import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
import com.zt.life.modules.testReviewComment.dao.TestReviewCommentDao;
import com.zt.life.modules.testReviewComment.dto.ReviewCommentDto;
import com.zt.life.modules.testReviewComment.model.TestReviewComment;
import com.zt.life.sys.dto.OssDto;
+import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.oss.service.SysOssService;
import com.zt.modules.workflow.dto.FlowInfoDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
+
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -27,16 +32,18 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* test_review_comment
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-12-28
*/
@Service
-public class TestReviewCommentService extends BaseService<TestReviewCommentDao, TestReviewComment> {
+public class TestReviewCommentService extends BaseService<TestReviewCommentDao, TestReviewComment> {
@Autowired
private SysOssService sysOssService;
@@ -45,10 +52,13 @@
private ProjectService projectService;
@Autowired
- private SysCodeRuleService sysCodeRuleService;
+ private SysOssConfigService sysOssConfigService;
@Autowired
private WordFileService wordFileService;
+
+ @Autowired
+ private TestAgencyInfoService testAgencyInfoService;
/**
* 鍒嗛〉鏌ヨ
@@ -57,9 +67,16 @@
* @return
*/
public List<TestReviewComment> page(QueryFilter queryFilter) {
+ String pageCode = String.valueOf(queryFilter.getParams().get("pageCode"));
+ pageCode=pageCode.replace("%","");
+ User user = UserContext.getUser();
+ Integer secretClass = user.getSecretClass();
+ Long deptId = user.getDeptId();
+ queryFilter.getQueryParams().put("secretClass",secretClass);
+ queryFilter.getQueryParams().put("deptId",deptId);
List<TestReviewComment> list = baseDao.getList(queryFilter.getQueryParams());
if (list.size() > 0) {
- sysOssService.setListOsses(list, "test_review_comment");
+ sysOssService.setListOsses(list, "test_review_comment_" + pageCode);
}
return list;
}
@@ -76,7 +93,6 @@
public ReviewCommentDto getDto(Long commentId, Long projectId, String pageCode) {
ReviewCommentDto data = new ReviewCommentDto();
- data.setPageCode(pageCode);
if (commentId != null) {
data.setId(commentId);
TestReviewComment reviewComment = this.get(commentId);
@@ -95,29 +111,32 @@
}
return data;
}
+
public Long save(ReviewCommentDto reviewCommentDto) {
Long commentId = reviewCommentDto.getReviewComment().getId();
if (commentId != null)
baseDao.updateById(reviewCommentDto.getReviewComment());
else {
- Map<String, String> map = new HashMap<>();
- String pagecode = reviewCommentDto.getPageCode();
- map.put("funCode", "test_review_comment_" + pagecode);
- map.put("projectId", reviewCommentDto.getProjectId().toString());
reviewCommentDto.getReviewComment().setProjectId(reviewCommentDto.getProjectId());
- reviewCommentDto.getReviewComment().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(reviewCommentDto.getReviewComment());
commentId = reviewCommentDto.getReviewComment().getId();
}
+ sysOssConfigService.updateOss(reviewCommentDto.getId(), reviewCommentDto.getFiles());// 淇濆瓨闄勪欢
return commentId;
}
public void exportReviewComment(Long id, String pageCode, HttpServletRequest request, HttpServletResponse response) {
try {
ReviewCommentDto dataObj = this.getDto(id, null, pageCode);
+ Map<String, String> map = new HashMap<>();
+ map.put("plan", "璁″垝");
+ map.put("ready", "灏辩华");
+ map.put("summary", "娴嬭瘯鎬荤粨");
+ String type = map.get(pageCode);
+ dataObj.setPageCode(type);
WordFile wordFile = new WordFile();
- wordFile.setModulePath("鍩虹嚎鍙戝竷涔�.docx");
- wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_鍩虹嚎鍙戝竷涔�.docx");
+ wordFile.setModulePath("娴嬭瘯" + type + "璇勫鎰忚.docx");
+ wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_娴嬭瘯" + type + "璇勫鎰忚.docx");
wordFileService.exportWordFile(request, dataObj, wordFile, response);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
--
Gitblit v1.9.1