[新增] 上传报告流程开发

adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml

@@ -4,21 +4,26 @@
 
     <!-- 通用查询结果列 -->
     <sql id="BaseColumnList">
-        id,
-        data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag
+        id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel,
+        createUserId, createDate, updateDate, del_flag,secrecy_last
     </sql>
 
     <sql id="BaseColumnValue">
-        #{Vo.id},
-        #{Vo.dataId},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId},
+        #{Vo.id},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId},
         #{Vo.confidentialLevel},#{Vo.privacyLevel},
         #{Vo.createUserId},
-        #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag}
+        #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag},
+        #{Vo.secrecyLast}
     </sql>
 
     <insert id="saveReportAct">
         insert into TT_REPORT_MANAGE (<include refid="BaseColumnList"/>)
-        value (<include refid="BaseColumnValue"/>)
+        value (
+        #{Vo.dataId},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId},
+        #{Vo.confidentialLevel},#{Vo.privacyLevel},
+        #{Vo.createUserId},
+        #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag},
+        #{Vo.secrecyLast})
     </insert>
 
     <select id="getReportDateList" parameterType="string" resultType="string">

adc-da-report/target/classes/mybatis/mapper/mysql/TtReportManageActMapper.xml

@@ -20,6 +20,12 @@
         <result column="createDate" property="createDate" />
         <result column="updateDate" property="updateDate" />
         <result column="del_flag" property="delFlag" />
+        <result column="secrecy_last" property="secrecyLast" />
+        <result column="file_name" property="fileName" />
+        <collection property="labelList" ofType="com.adc.da.report.eo.LabelEntity">
+            <id column="lableId" property="id"/>
+            <result column="lableName" property="name"/>
+        </collection>
     </resultMap>
 
     <!--表名信息-->
@@ -31,6 +37,7 @@
     <sql id="BaseColumnList">
         id,
         task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag
+        ,secrecy_last,file_name
     </sql>
 
     <!-- 查询条件 -->
@@ -117,12 +124,30 @@
         <include refid="BaseQuerySql"/>
         ORDER BY create_time DESC
     </select>
-    <select id="selectByDataId" resultType="com.adc.da.report.vo.TtReportManageActPageVO">
+    <select id="selectByDataId" resultMap="BaseResultMap">
         SELECT
-        <include refid="BaseColumnList"/>
-        FROM <include refid="TableName"/>
+        a.id,
+        task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag
+        ,secrecy_last,file_name
+        ,label.label as lableName,label.id as labelId
+        FROM <include refid="TableName"/> a
+             LEFT JOIN ts_report_label rl on rl.report_id = a.data_id
+             LEFT JOIN ts_tree_label label  on rl.label_id = label.id
         <where>
             data_id = #{dataId}
         </where>
     </select>
+    <select id="selectByPrcId"  resultMap="BaseResultMap">
+        SELECT
+        a.id,
+        task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag
+        ,secrecy_last,file_name
+        ,label.label as lableName,label.id as labelId
+        FROM <include refid="TableName"/> a
+        LEFT JOIN ts_report_label rl on rl.report_id = a.data_id
+        LEFT JOIN ts_tree_label label  on rl.label_id = label.id
+        <where>
+            prc_id = #{prcId}
+        </where>
+    </select>
 </mapper>