From 2df883fcbed176f83d8d144fd007e7f72fcb54d6 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 01 二月 2024 17:21:24 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportService.java | 180 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 108 insertions(+), 72 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportService.java
index 2e150ca..045009f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportService.java
@@ -1,11 +1,20 @@
package com.zt.life.modules.configAuditReport.service;
+import cn.hutool.core.convert.Convert;
import com.zt.common.service.BaseService;
import com.zt.common.utils.CommonUtils;
+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;
+import com.zt.life.modules.baselineRelease.model.BaselineRelease;
+import com.zt.life.modules.baselineRelease.model.BaselineReleaseRemark;
import com.zt.life.modules.configAuditReport.dao.ConfigAuditReportDao;
import com.zt.life.modules.configAuditReport.dto.ConfigAuditDto;
import com.zt.life.modules.configAuditReport.model.ConfigAuditReport;
+import com.zt.life.modules.configAuditReport.model.ConfigAuditReportContent;
+import com.zt.life.modules.configAuditReport.model.ConfigAuditReportProblem;
import com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit;
import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem;
import com.zt.life.modules.configItemWarehouse.model.WarehouseQaAudit;
@@ -14,19 +23,30 @@
import com.zt.life.modules.configItemWarehouse.service.WarehouseQaAuditService;
import com.zt.life.modules.mainPart.utils.GetFilesPath;
import com.zt.life.modules.mainPart.utils.GetShowDictList;
+import com.zt.life.modules.project.model.Project;
+import com.zt.life.modules.project.model.SoftwareTestOrder;
+import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
+import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.modules.testCheckOrder.model.TestCheckOrder;
import com.zt.life.modules.testCheckOrder.service.TestCheckOrderService;
+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 com.zt.modules.workflow.service.WorkflowService;
+import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
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;
+import java.io.FileNotFoundException;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -53,13 +73,17 @@
private ProjectService projectService;
@Autowired
+ private ConfigAuditReportContentService contentService;
+
+ @Autowired
+ private ConfigAuditReportProblemService problemService;
+
+ @Autowired
private GetShowDictList getShowDictList;
@Autowired
private WordFileService wordFileService;
- @Autowired
- private GetFilesPath getFilesPath;
/**
* 鍒嗛〉鏌ヨ
*
@@ -67,7 +91,16 @@
* @return
*/
public List<ConfigAuditReport> page(QueryFilter queryFilter) {
- return baseDao.getList(queryFilter.getQueryParams());
+ User user = UserContext.getUser();
+ Integer secretClass = user.getSecretClass();
+ Long deptId = user.getDeptId();
+ queryFilter.getQueryParams().put("secretClass",secretClass);
+ queryFilter.getQueryParams().put("deptId",deptId);
+ List<ConfigAuditReport> list = baseDao.getList(queryFilter.getQueryParams());
+ if (list != null && list.size() > 0) {
+ sysOssService.setListOsses(list, "config_audit_report");
+ }
+ return list;
}
/**
@@ -78,90 +111,93 @@
public void delete(Long[] ids) {
super.deleteLogic(ids);
}
-/*
public ConfigAuditDto getDto(Long projectId, Long reportId) {
-
+ ConfigAuditDto data = new ConfigAuditDto();
+ if (reportId != null) {
+ data.setId(reportId);
+ ConfigAuditReport auditReport = this.get(reportId);
+ data.setAuditReport(auditReport);
+ if (auditReport != null && projectId == null) {
+ projectId = auditReport.getProjectId();
+ }
+ List<ConfigAuditReportProblem> problemList = problemService.getList(reportId);
+ List<ConfigAuditReportContent> contentList = contentService.getList(reportId);
+ data.setContentList(contentList);
+ data.setProblemList(problemList);
+ } else {
+ ConfigAuditReport auditReport = new ConfigAuditReport();
+ data.setAuditReport(auditReport);
+ List<ConfigAuditReportContent> contentList = contentService.dictList("config_check_item");
+ data.setContentList( contentList);
+ }
+ if (projectId != null) {
+ data.setProjectId(projectId);
+ data.setProject(projectService.get(projectId));
+ }
+ return data;
}
public Boolean save(ConfigAuditDto configAuditDto) {
- Long warehouseId = configItemDto.getConfigItemWarehouse().getId();
- if (warehouseId != null)
- baseDao.updateById(configItemDto.getConfigItemWarehouse());
+ Long reportId = configAuditDto.getAuditReport().getId();
+ if (reportId != null)
+ baseDao.updateById(configAuditDto.getAuditReport());
else {
Map<String, String> map = new HashMap<>();
- map.put("funCode", "config_item_warehouse");
- map.put("projectId", configItemDto.getProjectId().toString());
- configItemDto.getConfigItemWarehouse().setProjectId(configItemDto.getProjectId());
- configItemDto.getConfigItemWarehouse().setCode(sysCodeRuleService.getNewCode(map));
- baseDao.insert(configItemDto.getConfigItemWarehouse());
- warehouseId = configItemDto.getConfigItemWarehouse().getId();
+ map.put("funCode", "config_audit_report");
+ map.put("projectId", configAuditDto.getProjectId().toString());
+ configAuditDto.getAuditReport().setProjectId(configAuditDto.getProjectId());
+ configAuditDto.getAuditReport().setCode(sysCodeRuleService.getNewCode(map));
+ baseDao.insert(configAuditDto.getAuditReport());
+ reportId = configAuditDto.getAuditReport().getId();
}
- for (WarehouseConfigItem configItem : configItemDto.getConfigItemList()) {
- configItem.setWarehouseId(warehouseId);
- if (configItem.getId() != null) {
- WarehouseConfigItem configItem2 = configItemService.get(configItem.getId());
- if (CommonUtils.isActureChangeData(configItem,configItem2)) {
- configItemService.update(configItem);
- }
- if(CommonUtils.isActureChangeData(configItemDto.getConfigItemWarehouse().getLibraryType(),configItem.getLibraryType())){
- configItem.setLibraryType(configItemDto.getConfigItemWarehouse().getLibraryType());
- configItemService.update(configItem);
+ for (ConfigAuditReportContent content : configAuditDto.getContentList()) {
+ content.setReportId(reportId);
+ if (content.getId() != null) {
+ ConfigAuditReportContent content2 = contentService.get(content.getId());
+ if (CommonUtils.isActureChangeData(content,content2)) {
+ contentService.update(content);
}
} else {
- Map<String, String> map = new HashMap<>();
- String pageCode = configItem.getPageCode();
- if (StringUtils.isNotBlank(pageCode) && "plan,explain,record,report".contains(pageCode)) {
- map.put("funCode", "test_" + pageCode);
- configItem.setItemIdentify(sysCodeRuleService.getNewCode(map));
- }
- configItem.setLibraryType(configItemDto.getConfigItemWarehouse().getLibraryType());
- configItem.setWarehouseId(warehouseId);
- configItem.setProjectId(configItemDto.getConfigItemWarehouse().getProjectId());
- configItemService.insert(configItem);
+ content.setProjectId(configAuditDto.getAuditReport().getProjectId());
+ contentService.insert(content);
}
- Long checkId = configItem.getCheckId();
- if (checkId != null) {
- TestCheckOrder testCheckOrder = testCheckOrderService.get(checkId);
- if (testCheckOrder.getConfigItemId() == null) {
- Long configItemId = configItem.getId();
- testCheckOrder.setConfigItemId(configItemId);
- testCheckOrder.setConfigOrderId(warehouseId);
- testCheckOrderService.update(testCheckOrder);
- }
- }
- sysOssConfigService.updateOss(configItem.getId(), configItem.getFiles());// 淇濆瓨闄勪欢
}
- for (WarehouseCmAudit cmAudit : configItemDto.getCmAuditList()) {
- cmAudit.setWarehouseId(warehouseId);
- if (cmAudit.getId() != null) {
- cmAuditService.update(cmAudit);
+ for (ConfigAuditReportProblem problem : configAuditDto.getProblemList()) {
+ problem.setReportId(reportId);
+ if (problem.getId() != null) {
+ problemService.update(problem);
} else {
- cmAudit.setWarehouseId(warehouseId);
- cmAuditService.insert(cmAudit);
+ problemService.insert(problem);
}
}
-
- for (WarehouseQaAudit qaAudit : configItemDto.getQaAuditList()) {
- qaAudit.setWarehouseId(warehouseId);
- if (qaAudit.getId() != null) {
- qaAuditService.update(qaAudit);
- } else {
- qaAudit.setWarehouseId(warehouseId);
- qaAuditService.insert(qaAudit);
- }
- }
-
- Long bizId = configItemDto.getConfigItemWarehouse().getId();
- FlowInfoDto flowInfoDto = configItemDto.getFlowInfoDto();
-
- if (flowInfoDto != null && flowInfoDto.getSubmitType() != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
- if ("tj".equals(flowInfoDto.getSubmitType())) {
- workflowService.startFlow(flowInfoDto.getFlowCode(), bizId);
- }
- workflowService.approvePass(flowInfoDto.getFlowCode(), bizId, flowInfoDto.getStepIdMark());
- }
+ sysOssConfigService.updateOss(configAuditDto.getId(), configAuditDto.getFiles());// 淇濆瓨闄勪欢
return true;
- }*/
+ }
+
+ public void exportConfigAudit(Long id, HttpServletRequest request, HttpServletResponse response) {
+ try {
+ ConfigAuditDto dataObj = this.getDto(null, id);
+ //閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
+ for (ConfigAuditReportContent content : dataObj.getContentList()) {
+ String value = content.getAuditResult();
+ String auditResult = getShowDictList.getShowDictList(value, "status_tag", false);
+ content.setAuditResult(auditResult);
+ }
+ for (ConfigAuditReportProblem problem : dataObj.getProblemList()) {
+ String value = problem.getIsNotTrue();
+ String IsNotTrue = getShowDictList.getShowDictList(value, "is_or_not", false);
+ problem.setIsNotTrue(IsNotTrue);
+ }
+ WordFile wordFile = new WordFile();
+ 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