From a4f932c6ca705feb3bee3b7d7bbe0ee5c0c85515 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 29 十二月 2023 09:41:11 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/testReviewComment/TestReviewComment-AddOrUpdate.vue | 29 +---
modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/dao/ConfigAuditReportDao.java | 1
web/src/views/modules/configAuditReport/ConfigAuditReport-AddOrUpdate.vue | 65 +++++++---
modules/mainPart/src/main/resources/mapper/configAuditReport/ConfigAuditReportContentDao.xml | 19 ++
modules/mainPart/src/main/java/com/zt/life/modules/testReviewComment/service/TestReviewCommentService.java | 12 -
modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportProblemService.java | 9 +
/dev/null | 0
modules/mainPart/src/main/java/com/zt/life/modules/testReviewComment/dto/ReviewCommentDto.java | 2
modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/controller/ConfigAuditReportController.java | 21 +--
web/src/views/modules/configAuditReport/ConfigAuditReport.vue | 8 +
modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportService.java | 133 ++++++++++-----------
modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/dao/ConfigAuditReportContentDao.java | 1
modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportContentService.java | 12 ++
modules/mainPart/src/main/java/com/zt/life/modules/testReviewComment/model/TestReviewComment.java | 3
modules/mainPart/src/main/resources/mapper/configAuditReport/ConfigAuditReportProblemDao.xml | 4
15 files changed, 181 insertions(+), 138 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/controller/ConfigAuditReportController.java b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/controller/ConfigAuditReportController.java
index 6602d04..d0a15c5 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/controller/ConfigAuditReportController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/controller/ConfigAuditReportController.java
@@ -63,21 +63,13 @@
return PageResult.ok(configAuditReportService.page(queryFilter));
}
- /* @GetMapping("getDto")
+
+ @GetMapping("getDto")
@ApiOperation("淇℃伅")
public Result<ConfigAuditDto> getDto(Long projectId, Long reportId) {
- //ConfigAuditDto data =configAuditReportService.getDto(projectId, reportId);
- if (reportId!=null) {
- for (WarehouseConfigItem configItem : data.getConfigItemList()) {
- Long configItemId = configItem.getId();
- OssDto ossDto = sysOssConfigService.getOssByBusiType(configItemId, "config_item_warehouse");
- if (ossDto != null) {
- configItem.setFiles(ossDto);
- }
- }
- }
+ ConfigAuditDto data =configAuditReportService.getDto(projectId, reportId);
return Result.ok(data);
- }*/
+ }
@PostMapping
@ApiOperation("鏂板")
@@ -89,7 +81,7 @@
map.put("funCode", "config_audit_report");
map.put("projectId",configAuditDto.getProjectId().toString());
configAuditDto.getAuditReport().setCode(sysCodeRuleService.getNewCode(map));
-// Boolean result = configAuditReportService.save(configAuditDto);
+ Boolean result = configAuditReportService.save(configAuditDto);
return Result.ok();
}
@@ -99,8 +91,7 @@
public Result update(@RequestBody ConfigAuditDto configAuditDto){
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(configAuditDto, UpdateGroup.class, DefaultGroup.class);
-// Boolean result = configAuditReportService.save(configAuditDto);
-
+ Boolean result = configAuditReportService.save(configAuditDto);
return Result.ok();
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/dao/ConfigAuditReportContentDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/dao/ConfigAuditReportContentDao.java
index 61a10cb..455b6ca 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/dao/ConfigAuditReportContentDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/dao/ConfigAuditReportContentDao.java
@@ -20,4 +20,5 @@
List<ConfigAuditReportContent> getList(Map<String, Object> params);
+ List<?> dictList(String dictType);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/dao/ConfigAuditReportDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/dao/ConfigAuditReportDao.java
index ed0b320..4abf559 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/dao/ConfigAuditReportDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/dao/ConfigAuditReportDao.java
@@ -19,5 +19,4 @@
public interface ConfigAuditReportDao extends BaseDao<ConfigAuditReport> {
List<ConfigAuditReport> getList(Map<String, Object> params);
-
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportContentService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportContentService.java
index 46e94d0..0236749 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportContentService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportContentService.java
@@ -3,10 +3,13 @@
import com.zt.common.service.BaseService;
import com.zt.life.modules.configAuditReport.dao.ConfigAuditReportContentDao;
import com.zt.life.modules.configAuditReport.model.ConfigAuditReportContent;
+import com.zt.life.modules.configAuditReport.model.ConfigAuditReportProblem;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
@@ -37,4 +40,13 @@
super.deleteLogic(ids);
}
+ public List<ConfigAuditReportContent> getList(Long reportId) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("reportId",reportId);
+ return baseDao.getList(params);
+ }
+
+ public List<?> dictList(String dictType) {
+ return baseDao.dictList(dictType);
+ }
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportProblemService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportProblemService.java
index 3b14718..ad9d490 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportProblemService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportProblemService.java
@@ -3,10 +3,13 @@
import com.zt.common.service.BaseService;
import com.zt.life.modules.configAuditReport.dao.ConfigAuditReportProblemDao;
import com.zt.life.modules.configAuditReport.model.ConfigAuditReportProblem;
+import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
@@ -37,4 +40,10 @@
super.deleteLogic(ids);
}
+ public List<ConfigAuditReportProblem> getList(Long reportId) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("reportId",reportId);
+ return baseDao.getList(params);
+ }
+
}
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..ba65030 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
@@ -3,9 +3,14 @@
import com.zt.common.service.BaseService;
import com.zt.common.utils.CommonUtils;
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 +19,25 @@
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.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 java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -51,6 +62,12 @@
@Autowired
private ProjectService projectService;
+
+ @Autowired
+ private ConfigAuditReportContentService contentService;
+
+ @Autowired
+ private ConfigAuditReportProblemService problemService;
@Autowired
private GetShowDictList getShowDictList;
@@ -78,90 +95,68 @@
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<?> contentResult = contentService.dictList("config_check_item");
+ List<?> contentList = contentResult;
+ data.setContentList((List<ConfigAuditReportContent>) 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());
}
return true;
- }*/
+ }
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testReviewComment/dto/ReviewCommentDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/testReviewComment/dto/ReviewCommentDto.java
index c372876..356b6e8 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testReviewComment/dto/ReviewCommentDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testReviewComment/dto/ReviewCommentDto.java
@@ -3,6 +3,7 @@
import com.zt.life.modules.baselineRelease.model.BaselineRelease;
import com.zt.life.modules.baselineRelease.model.BaselineReleaseRemark;
import com.zt.life.modules.project.model.Project;
+import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo;
import com.zt.life.modules.testReviewComment.model.TestReviewComment;
import com.zt.modules.workflow.dto.FlowInfoDto;
import io.swagger.annotations.ApiModelProperty;
@@ -22,5 +23,4 @@
private TestReviewComment reviewComment;
@ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
private Project project;
-
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testReviewComment/model/TestReviewComment.java b/modules/mainPart/src/main/java/com/zt/life/modules/testReviewComment/model/TestReviewComment.java
index 7ad0133..cba340a 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testReviewComment/model/TestReviewComment.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testReviewComment/model/TestReviewComment.java
@@ -28,9 +28,6 @@
@ApiModelProperty(value = "椤甸潰鏍囪瘑")
private String pageCode;
- @ApiModelProperty(value = "娴嬭瘯璇勫缂栧彿")
- private String code;
-
@ApiModelProperty(value = "璇勫鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date reviewDate;
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..7a93a5b 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
@@ -9,6 +9,7 @@
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;
@@ -50,6 +51,9 @@
@Autowired
private WordFileService wordFileService;
+ @Autowired
+ private TestAgencyInfoService testAgencyInfoService;
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -76,7 +80,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);
@@ -86,7 +89,6 @@
}
} else {
TestReviewComment reviewComment = new TestReviewComment();
- reviewComment.setPageCode(pageCode);
data.setReviewComment(reviewComment);
}
if (projectId != null) {
@@ -95,17 +97,13 @@
}
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();
}
diff --git a/modules/mainPart/src/main/resources/mapper/configAuditReport/ConfigAuditReportContentDao.xml b/modules/mainPart/src/main/resources/mapper/configAuditReport/ConfigAuditReportContentDao.xml
index f8faf65..6a31947 100644
--- a/modules/mainPart/src/main/resources/mapper/configAuditReport/ConfigAuditReportContentDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configAuditReport/ConfigAuditReportContentDao.xml
@@ -8,13 +8,26 @@
from config_audit_report_content a
<where>
a.is_delete = 0
- <if test="whereSql!=null">
- and ${whereSql}
+ <if test="reportId!=null">
+ and a.report_id = ${reportId}
</if>
</where>
<if test="orderBySql!=null">
ORDER BY ${orderBySql}
</if>
</select>
-
+ <select id="dictList" resultType="java.util.List">
+ SET @row_number = 0;
+ SELECT dd.dict_label AS audit_content,
+ (@row_number := @row_number + 1) AS no,
+ FROM sys_dict_type dt
+ JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID
+ <where>
+ dd.IS_DELETE = 0
+ <if test="dictType != null and dictType != ''">
+ and dt.DICT_TYPE = #{dictType}
+ </if>
+ </where>
+ ORDER BY dd.sort
+ </select>
</mapper>
diff --git a/modules/mainPart/src/main/resources/mapper/configAuditReport/ConfigAuditReportProblemDao.xml b/modules/mainPart/src/main/resources/mapper/configAuditReport/ConfigAuditReportProblemDao.xml
index 61b339d..c26bc69 100644
--- a/modules/mainPart/src/main/resources/mapper/configAuditReport/ConfigAuditReportProblemDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configAuditReport/ConfigAuditReportProblemDao.xml
@@ -8,8 +8,8 @@
from config_audit_report_problem a
<where>
a.is_delete = 0
- <if test="whereSql!=null">
- and ${whereSql}
+ <if test="reportId!=null">
+ and a.report_id = ${reportId}
</if>
</where>
<if test="orderBySql!=null">
diff --git a/web/dist.zip b/web/dist.zip
deleted file mode 100644
index fa8e8e4..0000000
--- a/web/dist.zip
+++ /dev/null
Binary files differ
diff --git a/web/src/views/modules/configAuditReport/ConfigAuditReport-AddOrUpdate.vue b/web/src/views/modules/configAuditReport/ConfigAuditReport-AddOrUpdate.vue
index b54cabe..b67de3d 100644
--- a/web/src/views/modules/configAuditReport/ConfigAuditReport-AddOrUpdate.vue
+++ b/web/src/views/modules/configAuditReport/ConfigAuditReport-AddOrUpdate.vue
@@ -1,29 +1,26 @@
<template>
<zt-dialog ref="dialog" @confirm="formSubmit">
<el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">
- <zt-form-item label="椤圭洰ID" prop="projectId" rules="required">
- <el-input v-model="dataForm.projectId"></el-input>
- </zt-form-item>
<zt-form-item label="缂栧彿" prop="code" rules="required">
- <el-input v-model="dataForm.code"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.code"></el-input>
+ </zt-form-item>
<zt-form-item label="瀹℃牳浜�" prop="auditor" rules="required">
- <el-input v-model="dataForm.auditor"></el-input>
- </zt-form-item>
- <zt-form-item label="瀹℃牳浜篒D" prop="auditorId" rules="required">
- <el-input v-model="dataForm.auditorId"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.auditor"></el-input>
+ </zt-form-item>
<zt-form-item label="瀹℃牳鏃堕棿" prop="auditorDate" rules="required">
- <el-input v-model="dataForm.auditorDate"></el-input>
- </zt-form-item>
- <zt-form-item label="骞翠唤" prop="year" rules="required">
- <el-input v-model="dataForm.year"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.auditorDate"></el-input>
+ </zt-form-item>
</el-form>
+ <template v-slot:footer>
+ <el-button v-if="dataForm.disabled" type="primary" @click="print()">鎵撳嵃</el-button>
+ </template>
</zt-dialog>
</template>
<script>
+ import qs from "qs";
+ import Cookies from "js-cookie";
+
export default {
data() {
return {
@@ -32,24 +29,56 @@
configAuditReport:{
code: '',
auditor: '',
- auditorId: '',
auditorDate: '',
},
project: {
softwareIdentity: '',
softwareName: ''
- }
+ },
+ problemList:[],
+ contentList:[]
}
}
},
methods: {
+ indexFormat(index) {
+ return index += 1
+ },
+ init(id, row) {
+ if (id) {
+ this.dataForm.id = id
+ } else {
+ this.dataForm.id = row.id
+ }
+ if (row.projectId) {
+ this.dataForm.projectId = row.projectId
+ }
+ this.getInfo()
+ console.log(this.dataForm.id, this.dataForm.projectId, 'params params')
+ },
// 鑾峰彇淇℃伅
async getInfo() {
- let res = await this.$http.get(`/configAuditReport/ConfigAuditReport/${this.dataForm.id}`)
+ let params = {
+ reportId: this.dataForm.id,
+ projectId: this.dataForm.projectId
+ }
+ let res = await this.$http.get(`/configAuditReport/ConfigAuditReport/getDto`, {params: params})
this.dataForm = {
...this.dataForm,
...res.data
}
+ if(this.dataForm.configAuditReport === null){
+ this.dataForm.contractReview={}
+ }
+ console.log(this.dataForm, "getInfo this.dataForm")
+ },
+ async print(){
+ var params = qs.stringify({
+ token: Cookies.get('token'),
+ id:this.dataForm.id
+ })
+ let apiURL = `/configAuditReport/ConfigAuditReport/exportReport`
+ window.location.href = `${window.SITE_CONFIG['apiURL']}${apiURL}?${params}`
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
diff --git a/web/src/views/modules/configAuditReport/ConfigAuditReport.vue b/web/src/views/modules/configAuditReport/ConfigAuditReport.vue
index b88c084..f16467b 100644
--- a/web/src/views/modules/configAuditReport/ConfigAuditReport.vue
+++ b/web/src/views/modules/configAuditReport/ConfigAuditReport.vue
@@ -31,6 +31,7 @@
@refreshDataList="table.query"
@setProjectInfo="openAddWin">
</ProjectSelect>
+ <Preview ref="view" :pageMarkerfun="ConfigAuditReport"></Preview>
</zt-table-wraper>
</div>
</el-card>
@@ -42,6 +43,7 @@
export default {
data() {
return {
+ ConfigAuditReport:'ConfigAuditReport',
dataForm: {
code: '',
softwareIdentity: '',
@@ -51,7 +53,8 @@
},
components: {
AddOrUpdate,
- ProjectSelect
+ ProjectSelect,
+ Preview
},
methods:{
add() {
@@ -62,6 +65,9 @@
// this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: row.id})
this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: row.id})
},
+ preview(row){
+ this.$refs.view.openAccessoryFormatSingle(row)
+ }
}
}
</script>
diff --git a/web/src/views/modules/testReviewComment/TestReviewComment-AddOrUpdate.vue b/web/src/views/modules/testReviewComment/TestReviewComment-AddOrUpdate.vue
index 129261a..89b896a 100644
--- a/web/src/views/modules/testReviewComment/TestReviewComment-AddOrUpdate.vue
+++ b/web/src/views/modules/testReviewComment/TestReviewComment-AddOrUpdate.vue
@@ -1,21 +1,19 @@
<template>
<zt-dialog ref="dialog" @confirm="formSubmit">
<el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">
- <zt-form-item label="椤圭洰ID" prop="projectId" rules="required">
- <el-input v-model="dataForm.projectId"></el-input>
- </zt-form-item>
- <zt-form-item label="椤甸潰鏍囪瘑" prop="pageCode" rules="required">
- <el-input v-model="dataForm.pageCode"></el-input>
- </zt-form-item>
- <zt-form-item label="娴嬭瘯璇勫缂栧彿" prop="code" rules="required">
- <el-input v-model="dataForm.code"></el-input>
- </zt-form-item>
+ <zt-form-item label="杞欢鍚嶇О" prop="reviewDate" rules="required">
+ <el-input v-model="dataForm.project.softwareName"></el-input>
+ </zt-form-item>
<zt-form-item label="璇勫鏃ユ湡" prop="reviewDate" rules="required">
- <el-input v-model="dataForm.reviewDate"></el-input>
- </zt-form-item>
+ <el-date-picker
+ v-model="dataForm.reviewComment.reviewDate"
+ type="date"
+ placeholder="璇烽�夋嫨璇勫鏃ユ湡">
+ </el-date-picker>
+ </zt-form-item>
<zt-form-item label="璇勫浜烘暟" prop="reviewerNum" rules="required">
- <el-input v-model="dataForm.reviewerNum"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.reviewComment.reviewerNum"></el-input>
+ </zt-form-item>
</el-form>
<template v-slot:footer>
<el-button v-if="dataForm.disabled" type="primary" @click="print()">鎵撳嵃</el-button>
@@ -31,17 +29,12 @@
data() {
return {
pageCode: '',
- subtitle: '',
- pageName: {
- plan: '娴嬭瘯璁″垝', explain: '娴嬭瘯灏辩华', record: '娴嬭瘯鎬荤粨'
- },
dataForm: {
id: '',
project: {
softwareName: '',
},
reviewComment: {
- code: '',
reviewDate: '',
reviewerNum: ''
},
--
Gitblit v1.9.1