✨ 完善核销用户记录和毛利报表导出日志

bms-back/bms-system/src/main/resources/mapper/price/PrcProfitReportMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="storageKey" column="storage_key"/>
         <result property="rowCount" column="row_count"/>
         <result property="exportStatus" column="export_status"/>
+        <result property="exportUserId" column="export_user_id"/>
         <result property="exportBy" column="export_by"/>
         <result property="exportTime" column="export_time"/>
         <result property="remark" column="remark"/>
@@ -18,15 +19,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="profitReportExportColumns">
         select export_id, dimension, file_name, storage_key, row_count,
-               export_status, export_by, export_time, remark
+               export_status, export_user_id, export_by, export_time, remark
         from prc_profit_report_export
     </sql>
 
     <insert id="insertExport" parameterType="PrcProfitReportExport" useGeneratedKeys="true" keyProperty="exportId">
         insert into prc_profit_report_export (
-            dimension, file_name, storage_key, row_count, export_status, export_by, export_time, remark
+            dimension, file_name, storage_key, row_count, export_status, export_user_id, export_by, export_time, remark
         ) values (
-            #{dimension}, #{fileName}, #{storageKey}, #{rowCount}, #{exportStatus}, #{exportBy}, sysdate(), #{remark}
+            #{dimension}, #{fileName}, #{storageKey}, #{rowCount}, #{exportStatus}, #{exportUserId}, #{exportBy}, sysdate(), #{remark}
         )
     </insert>
 
@@ -43,15 +44,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where export_id = #{exportId} and export_status = 'PROCESSING'
     </update>
 
-    <select id="selectExportsByUser" resultMap="PrcProfitReportExportResult">
+    <select id="selectExports" resultMap="PrcProfitReportExportResult">
         <include refid="profitReportExportColumns"/>
-        where export_by = #{exportBy}
         order by export_time desc, export_id desc
     </select>
 
-    <select id="selectExportByIdAndUser" resultMap="PrcProfitReportExportResult">
+    <select id="selectExportById" resultMap="PrcProfitReportExportResult">
         <include refid="profitReportExportColumns"/>
-        where export_id = #{exportId} and export_by = #{exportBy}
+        where export_id = #{exportId}
     </select>
 
     <resultMap type="PrcProfitReportOrderRow" id="PrcProfitReportOrderResult">