报告添加咨询项目字段

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
      */

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
      */

adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java

@@ -149,13 +149,13 @@ public class ITtReportManageActServiceImpl extends ServiceImpl<TtReportManageAct
             reportLog(ttReportManageAct.getName(),"新增");
         }else {
             //更改
-            ReportEntity reportEntity1 = new ReportEntity();
+            ReportEntity reportEntityInDb = new ReportEntity();
-            BeanUtil.copyProperties(ttReportManageAct,reportEntity1);
+            BeanUtil.copyProperties(ttReportManageAct,reportEntityInDb);
-            reportEntity1.setId(ttReportManageAct.getDataId());
+            reportEntityInDb.setId(ttReportManageAct.getDataId());
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            reportEntity1.setCreateDate(sdf.format(ttReportManageAct.getCreateDate()));
+            reportEntityInDb.setCreateDate(sdf.format(ttReportManageAct.getCreateDate()));
-            reportEntity1.setUpdateDate(sdf.format(ttReportManageAct.getUpdateDate()));
+            reportEntityInDb.setUpdateDate(sdf.format(ttReportManageAct.getUpdateDate()));
-            reportDao.updateById(reportEntity1);
+            reportDao.updateById(reportEntityInDb);
             reportLog(reportEntity.getName(),"编辑");
         }
 

adc-da-report/src/main/java/com/adc/da/report/vo/ReportDetailVo.java

@@ -67,6 +67,11 @@ public class ReportDetailVo {
      */
     private String privacyLevel;
 
+    /**
+     * 咨询项目
+     */
+    private String consultingProject;
+
     /**
      * 创建人id
      */

adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml

@@ -13,6 +13,7 @@
         <result column="year" property="year" />
         <result column="confidentialLevel" property="confidentialLevel" />
         <result column="privacyLevel" property="privacyLevel" />
+        <result column="consultingProject" property="consultingProject" />
         <result column="createUserId" property="createUserId" />
         <result column="secrecy_last" property="secrecyLast" />
         <collection property="fileList" ofType="com.adc.da.report.eo.ReportFile">
@@ -51,7 +52,7 @@
     </resultMap>
     <!-- 通用查询结果列 -->
     <sql id="BaseColumnList">
-        id, name, keycontent, maincontent, department, year,  confidentialLevel, privacyLevel,
+        id, name, keycontent, maincontent, department, year,  confidentialLevel, privacyLevel,consultingProject,
         createUserId, createDate, updateDate, del_flag,secrecy_last
     </sql>
 
@@ -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

adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml

@@ -17,6 +17,7 @@
         <result column="year" property="year" />
         <result column="confidentialLevel" property="confidentialLevel" />
         <result column="privacyLevel" property="privacyLevel" />
+        <result column="consultingProject" property="consultingProject" />
         <result column="createUserId" property="createUserId" />
         <result column="createDate" property="createDate" />
         <result column="updateDate" property="updateDate" />
@@ -37,7 +38,7 @@
     <!-- 通用查询结果列 -->
     <sql id="BaseColumnList">
         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
     </sql>
@@ -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

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;
+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`;