diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/ReportEntity.java b/adc-da-report/src/main/java/com/adc/da/report/eo/ReportEntity.java
index 8dea718..cfc9cf0 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/eo/ReportEntity.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/eo/ReportEntity.java
@@ -65,6 +65,12 @@ public class ReportEntity {
@TableField("privacyLevel")
private String privacyLevel;
+ /**
+ * 咨询项目
+ */
+ @TableField("consultingProject")
+ private String consultingProject;
+
/**
* 文件id
*/
diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java
index b225e12..0cdf8ef 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java
@@ -91,6 +91,12 @@ public class TtReportManageAct {
@TableField("privacyLevel")
private String privacyLevel;
+ /**
+ * 咨询项目
+ */
+ @TableField("consultingProject")
+ private String consultingProject;
+
/**
* 文件id
*/
diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java
index 5707718..6462aee 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java
@@ -149,13 +149,13 @@ public class ITtReportManageActServiceImpl extends ServiceImpl
+
@@ -51,7 +52,7 @@
- id, name, keycontent, maincontent, department, year, confidentialLevel, privacyLevel,
+ id, name, keycontent, maincontent, department, year, confidentialLevel, privacyLevel,consultingProject,
createUserId, createDate, updateDate, del_flag,secrecy_last
@@ -68,6 +69,7 @@
value (
#{Vo.dataId},#{Vo.name},#{Vo.keyContent},#{Vo.mainContent},#{Vo.department},#{Vo.year},
#{Vo.confidentialLevel},#{Vo.privacyLevel},
+ #{Vo.consultingProject},
#{Vo.createUserId},
#{Vo.createDate},#{Vo.updateDate},#{Vo.delFlag},
#{Vo.secrecyLast})
@@ -425,6 +427,7 @@
rm.confidentialLevel AS confidentialLevel,
rm.privacyLevel AS privacyLevel,
rm.secrecy_last AS secrecyLast,
+ rm.consultingProject AS consultingProject,
f.FILE_ID as fileId, f.file_name as fileName ,rf.id as rfId
FROM `tt_report_manage` AS rm
LEFT JOIN ts_user AS u ON u.USID = rm.createUserId
diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml
index a272517..6db7f2d 100644
--- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml
+++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml
@@ -17,6 +17,7 @@
+
@@ -37,7 +38,7 @@
id,
- task_id, prc_id, data_id,report_id ,name, keycontent, maincontent, department, year, confidentialLevel,
+ task_id, prc_id, data_id,report_id ,name, keycontent, maincontent, department, year, confidentialLevel,consultingProject
privacyLevel, createUserId, createDate, updateDate, del_flag
,secrecy_last
@@ -135,7 +136,7 @@
a.id,
task_id, prc_id, data_id,a.report_id, name, keycontent, maincontent, department,
org.LONG_NAME as departmentName,
- year,f.FILE_ID as fileId, f.file_name as fileName ,rf.id as rfId, confidentialLevel, privacyLevel, createUserId,
+ year,f.FILE_ID as fileId, f.file_name as fileName ,rf.id as rfId, confidentialLevel, privacyLevel, consultingProject, createUserId,
createDate,
updateDate, a.del_flag
,secrecy_last
@@ -152,7 +153,7 @@
a.id,
task_id, prc_id, data_id,a.report_id, name, keycontent, maincontent, department,
org.LONG_NAME as departmentName,
- year,f.FILE_ID as fileId, f.file_name as fileName ,rf.id as rfId ,confidentialLevel, privacyLevel, createUserId,
+ year,f.FILE_ID as fileId, f.file_name as fileName ,rf.id as rfId ,confidentialLevel, privacyLevel, consultingProject, createUserId,
createDate,
updateDate, a.del_flag
,secrecy_last
diff --git a/db/20231027-黑白模式功能新增.sql b/db/202310-202312新增.sql
similarity index 73%
rename from db/20231027-黑白模式功能新增.sql
rename to db/202310-202312新增.sql
index bd6355e..4eddd9e 100644
--- a/db/20231027-黑白模式功能新增.sql
+++ b/db/202310-202312新增.sql
@@ -6,4 +6,10 @@ ALTER TABLE `report-library`.`ts_report_content`
ADD INDEX `REPORT_CONTENT_REPORT_ID_INDEX`(`report_id`) USING BTREE;
ALTER TABLE `report-library`.`tt_report_manage`
-ADD INDEX `REPORT_MANAGER_CREATEUSERID_INDEX`(`createUserId`) USING BTREE;
\ No newline at end of file
+ADD INDEX `REPORT_MANAGER_CREATEUSERID_INDEX`(`createUserId`) USING BTREE;
+
+ALTER TABLE `report-library`.`tt_report_manage`
+ ADD COLUMN `consultingProject` varchar(1000) NULL COMMENT '咨询项目' AFTER `privacyLevel`;
+
+ALTER TABLE `report-library`.`tt_report_manage_act`
+ ADD COLUMN `consultingProject` varchar(1000) NULL COMMENT '咨询项目' AFTER `privacyLevel`;
\ No newline at end of file