[修改] 保存到草稿 因dataId引起的偶现问题

adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java

@@ -40,6 +40,12 @@ public class TtReportManageAct  {
     @TableField("data_id")
     private String dataId;
 
+    /**
+     * 报告id
+     */
+    @TableField("report_id")
+    private String reportId;
+
     /**
      * 报告名
      */

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

@@ -8,6 +8,7 @@
         <result column="task_id" property="taskId" />
         <result column="prc_id" property="prcId" />
         <result column="data_id" property="dataId" />
+        <result column="report_id" property="reportId" />
         <result column="name" property="name" />
         <result column="keycontent" property="keyContent" />
         <result column="maincontent" property="mainContent" />
@@ -33,7 +34,8 @@
     <!-- 通用查询结果列 -->
     <sql id="BaseColumnList">
         id,
-        task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag
+        task_id, prc_id, data_id,report_id ,name, keycontent, maincontent, department, year, fileId, confidentialLevel,
+        privacyLevel, createUserId, createDate, updateDate, del_flag
         ,secrecy_last,file_name
     </sql>
 
@@ -51,6 +53,9 @@
                 <if test="pageVO.dataId !=null and pageVO.dataId !=''">
                     AND data_id LIKE CONCAT(CONCAT('%',#{pageVO.dataId}),'%')
                 </if>
+                <if test="pageVO.reportId !=null and pageVO.reportId !=''">
+                    AND report_id LIKE CONCAT(CONCAT('%',#{pageVO.reportId}),'%')
+                </if>
                 <if test="pageVO.name !=null and pageVO.name !=''">
                     AND name LIKE CONCAT(CONCAT('%',#{pageVO.name}),'%')
                 </if>
@@ -128,7 +133,7 @@
     <select id="selectByDataId" resultMap="BaseResultMap">
         SELECT
         a.id,
-        task_id, prc_id, data_id, name, keycontent, maincontent, department,
+        task_id, prc_id, data_id,report_id, name, keycontent, maincontent, department,
         org.LONG_NAME as departmentName,
                year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag
         ,secrecy_last,file_name
@@ -141,7 +146,7 @@
     <select id="selectByPrcId"  resultMap="BaseResultMap">
         SELECT
         a.id,
-        task_id, prc_id, data_id, name, keycontent, maincontent, department,
+        task_id, prc_id, data_id,report_id, name, keycontent, maincontent, department,
         org.LONG_NAME as departmentName,
         year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag
         ,secrecy_last,file_name