From bfa0b90c002d6d01f1442ce6882b426efa077a30 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 29 十二月 2023 10:09:26 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/configAuditReport/ConfigAuditReport.vue | 1 +
modules/mainPart/src/main/resources/mapper/configAuditReport/ConfigAuditReportContentDao.xml | 6 +++---
web/src/views/modules/testReviewComment/TestReviewComment.vue | 3 ++-
modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportService.java | 5 ++---
modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/dao/ConfigAuditReportContentDao.java | 2 +-
modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportContentService.java | 2 +-
6 files changed, 10 insertions(+), 9 deletions(-)
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 455b6ca..1128e72 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,5 +20,5 @@
List<ConfigAuditReportContent> getList(Map<String, Object> params);
- List<?> dictList(String dictType);
+ List<ConfigAuditReportContent> dictList(String dictType);
}
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 0236749..6e78508 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
@@ -46,7 +46,7 @@
return baseDao.getList(params);
}
- public List<?> dictList(String dictType) {
+ public List<ConfigAuditReportContent> dictList(String dictType) {
return baseDao.dictList(dictType);
}
}
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 ba65030..f8243ba 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
@@ -111,9 +111,8 @@
} else {
ConfigAuditReport auditReport = new ConfigAuditReport();
data.setAuditReport(auditReport);
- List<?> contentResult = contentService.dictList("config_check_item");
- List<?> contentList = contentResult;
- data.setContentList((List<ConfigAuditReportContent>) contentList);
+ List<ConfigAuditReportContent> contentList = contentService.dictList("config_check_item");
+ data.setContentList( contentList);
}
if (projectId != null) {
data.setProjectId(projectId);
diff --git a/modules/mainPart/src/main/resources/mapper/configAuditReport/ConfigAuditReportContentDao.xml b/modules/mainPart/src/main/resources/mapper/configAuditReport/ConfigAuditReportContentDao.xml
index 6a31947..4fe485b 100644
--- a/modules/mainPart/src/main/resources/mapper/configAuditReport/ConfigAuditReportContentDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configAuditReport/ConfigAuditReportContentDao.xml
@@ -16,10 +16,10 @@
ORDER BY ${orderBySql}
</if>
</select>
- <select id="dictList" resultType="java.util.List">
+ <select id="dictList" resultType="com.zt.life.modules.configAuditReport.model.ConfigAuditReportContent">
SET @row_number = 0;
- SELECT dd.dict_label AS audit_content,
- (@row_number := @row_number + 1) AS no,
+ SELECT (@row_number := @row_number + 1) AS no,
+ dd.dict_label AS auditContent
FROM sys_dict_type dt
JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID
<where>
diff --git a/web/src/views/modules/configAuditReport/ConfigAuditReport.vue b/web/src/views/modules/configAuditReport/ConfigAuditReport.vue
index f16467b..a316a59 100644
--- a/web/src/views/modules/configAuditReport/ConfigAuditReport.vue
+++ b/web/src/views/modules/configAuditReport/ConfigAuditReport.vue
@@ -40,6 +40,7 @@
<script>
import AddOrUpdate from './ConfigAuditReport-AddOrUpdate'
import ProjectSelect from "../project/Project-select";
+ import Preview from '@/views/pages/view'
export default {
data() {
return {
diff --git a/web/src/views/modules/testReviewComment/TestReviewComment.vue b/web/src/views/modules/testReviewComment/TestReviewComment.vue
index 8debf6b..c97e935 100644
--- a/web/src/views/modules/testReviewComment/TestReviewComment.vue
+++ b/web/src/views/modules/testReviewComment/TestReviewComment.vue
@@ -34,7 +34,7 @@
@refreshDataList="table.query"
@setProjectInfo="openAddWin">
</ProjectSelect>
- <Preview ref="view"></Preview>
+ <Preview ref="view" :pageMarkerfun="TestReviewComment"></Preview>
</zt-table-wraper>
</div>
</el-card>
@@ -47,6 +47,7 @@
export default {
data() {
return {
+ TestReviewComment:'TestReviewComment',
pageCode: '',
dataForm: {
code: '',
--
Gitblit v1.9.1