From 1d29540c77a0b736e10a9be0c0834c1813c3303e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 20 十二月 2023 14:51:04 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/service/BaselineReleaseService.java | 74 ++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 38 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/service/BaselineReleaseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/service/BaselineReleaseService.java
index e00da6f..ea863bf 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/service/BaselineReleaseService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/service/BaselineReleaseService.java
@@ -8,18 +8,22 @@
import com.zt.life.modules.baselineRelease.dto.BaselineDto;
import com.zt.life.modules.baselineRelease.model.BaselineRelease;
import com.zt.life.modules.baselineRelease.model.BaselineReleaseRemark;
+import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem;
import com.zt.life.modules.mainPart.utils.GetFilesPath;
import com.zt.life.modules.mainPart.utils.GetShowDictList;
import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.modules.testCheckOrder.dto.CheckOrderDto;
import com.zt.life.modules.testCheckOrder.model.TestCheckOrder;
import com.zt.life.modules.testCheckOrder.model.TestCheckOrderList;
+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.workflow.dto.FlowInfoDto;
import com.zt.modules.workflow.service.WorkflowService;
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;
@@ -33,16 +37,19 @@
/**
* baseline_release
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-12-18
*/
@Service
-public class BaselineReleaseService extends BaseService<BaselineReleaseDao, BaselineRelease> {
+public class BaselineReleaseService extends BaseService<BaselineReleaseDao, BaselineRelease> {
@Autowired
private ProjectService projectService;
@Autowired
private GetShowDictList getShowDictList;
+
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
@Autowired
private SysCodeRuleService sysCodeRuleService;
@@ -100,6 +107,20 @@
baseline.setPageCode(pageCode);
data.setBaseline(baseline);
}
+ if ("demand".equals(pageCode)){
+ data.getBaseline().setBaselineType("1");
+ }else if("product".equals(pageCode)){
+ data.getBaseline().setBaselineType("2");
+ }
+ for (BaselineReleaseRemark remark : data.getRemarkList()) {
+ if (remark.getWarehouseDetailId() != null) {
+ Long configItemId = remark.getWarehouseDetailId();
+ OssDto ossDto = sysOssConfigService.getOssByBusiType(configItemId, "config_item_warehouse");
+ if (ossDto != null) {
+ remark.setFiles(ossDto);
+ }
+ }
+ }
if (projectId != null) {
data.setProjectId(projectId);
data.setProject(projectService.get(projectId));
@@ -125,6 +146,8 @@
for (BaselineReleaseRemark remark : baselineDto.getRemarkList()) {
remark.setBaselineId(baselineId);
+ remark.setLibraryType(remark.getLibraryType());
+ remark.setWarehouseDetailId(remark.getSelectId());
if (remark.getId() != null) {
remarkService.update(remark);
} else {
@@ -145,51 +168,26 @@
return baselineId;
}
- /* public void exportCheckOrder(Long id, String pageCode, HttpServletRequest request, HttpServletResponse response) {
+ public void exportBaseline(Long id, String pageCode, HttpServletRequest request, HttpServletResponse response) {
try {
- CheckOrderDto dataObj = this.getDto(id, null, pageCode);
+ BaselineDto dataObj = this.getDto(id, null, pageCode);
- 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 publisherPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getBaseline().getPublisherId()));
+ dataObj.getBaseline().setPublisher(publisherPath);
+ String departSignPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getBaseline().getSignId()));
+ dataObj.getBaseline().setDepartSign(departSignPath);
//閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
- for (TestCheckOrderList checkOrderList : dataObj.getCheckOrderList()) {
- String value = checkOrderList.getCheckResult();
- 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);
- }
+ String baselineTypeStr = getShowDictList.getShowDictList(dataObj.getBaseline().getBaselineType(), "baseline_type", false);
+ dataObj.getBaseline().setBaselineType(baselineTypeStr);
- Map<String, String> map = new HashMap<>();
- map.put("plan", "璁″垝");
- 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();
-
- 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");
- }
+ 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