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

bms-back/bms-system/src/main/resources/mapper/ar/ArBalanceWriteoffMapper.xml

@@ -19,8 +19,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="writeoffDate"    column="writeoff_date"/>
         <result property="status"          column="status"/>
         <result property="remark"          column="remark"/>
+        <result property="createUserId"    column="create_user_id"/>
         <result property="createBy"        column="create_by"/>
         <result property="createTime"      column="create_time"/>
+        <result property="cancelUserId"    column="cancel_user_id"/>
         <result property="cancelBy"        column="cancel_by"/>
         <result property="cancelTime"      column="cancel_time"/>
         <result property="cancelRemark"    column="cancel_remark"/>
@@ -31,8 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectColumns">
         select w.writeoff_id, w.writeoff_no, w.ar_bill_id, w.bill_no, w.customer_id, w.receipt_id, w.account_id,
                w.currency, w.writeoff_amount, w.balance_flow_id, w.reverse_flow_id,
-               w.writeoff_date, w.status, w.remark, w.create_by, w.create_time,
-               w.cancel_by, w.cancel_time, w.cancel_remark,
+               w.writeoff_date, w.status, w.remark, w.create_user_id, w.create_by, w.create_time,
+               w.cancel_user_id, w.cancel_by, w.cancel_time, w.cancel_remark,
                b.bill_name, b.customer_name
         from ar_balance_writeoff w
         left join ar_bill b on b.ar_bill_id = w.ar_bill_id
@@ -43,11 +45,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into ar_balance_writeoff (
             writeoff_no, ar_bill_id, bill_no, customer_id, receipt_id, account_id, currency,
             writeoff_amount, balance_flow_id, reverse_flow_id, writeoff_date,
-            status, remark, create_by, create_time
+            status, remark, create_user_id, create_by, create_time
         ) values (
             #{writeoffNo}, #{arBillId}, #{billNo}, #{customerId}, #{receiptId}, #{accountId}, #{currency},
             #{writeoffAmount}, #{balanceFlowId}, #{reverseFlowId}, #{writeoffDate},
-            #{status}, #{remark}, #{createBy}, sysdate()
+            #{status}, #{remark}, #{createUserId}, #{createBy}, sysdate()
         )
     </insert>
 
@@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update ar_balance_writeoff
         set status = #{status},
             reverse_flow_id = #{reverseFlowId},
+            cancel_user_id = #{cancelUserId},
             cancel_by = #{cancelBy},
             cancel_time = sysdate(),
             cancel_remark = #{cancelRemark}

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">