Merge branch 'dev-2.19.2' of province-qinghai/province-all into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/mapper/mapping/FsSaleRevenueMapper.xml

@@ -45,7 +45,9 @@
             tcc. YEAR,
             tcc. MONTH,
             tcc.accounting_quantity accountingQuantity,
-            tcc.accounting_amount accountingAmount
+            tcc.accounting_amount accountingAmount,
+            tcc.province_accounting_quantity provinceAccountingQuantity,
+            tcc.province_accounting_amount provinceAccountingAmount
         FROM
             business_fs_sale_revenue_three_consistence_account tcc
         LEFT JOIN business_fs_sale_revenue sr ON sr.id = tcc.fs_sale_revenue_id
@@ -105,17 +107,9 @@
     </select>
     <select id="getOutStorageDetailsInfo" parameterType="integer" resultType="com.unis.financialSupervision.modular.fsSaleRevenueThreeConsistence.entity.FsSaleRevenueThreeConsistence">
         SELECT
-            tc.id,
-            tc.`year`,
-            tc.`month`,
-            tc.basic_storehouse_id,
-            tc.warehouse_id,
+            tc.*,
             bs.storehouse_name storehouseName,
-            bw.warehouse_name warehouseName,
-            tc.loss,
-            tc.custody_account_quantity,
-            tc.statistical_account_quantity,
-            tc.complete_time
+            bw.warehouse_name warehouseName
         FROM
             business_fs_sale_revenue_three_consistence tc
         LEFT JOIN basic_storehouse bs ON tc.basic_storehouse_id = bs.storehouse_id
@@ -126,6 +120,7 @@
     <select id="getSettlementDetailsInfo" parameterType="integer" resultType="com.unis.financialSupervision.modular.fsSaleRevenueSettle.entity.FsSaleRevenueSettle">
         SELECT
             rs.id,
+            rs.fs_sale_revenue_id fsSaleRevenueId,
             rs.province_acceptance_unit,
             rs.province_total_settle_quantity,
             rs.province_total_settle_amount,
@@ -170,9 +165,12 @@
     <select id="getDiffPriceDetailsInfo" parameterType="integer" resultType="com.unis.financialSupervision.modular.fsSaleRevenueDiffPrice.entity.FsSaleRevenueDiffPrice">
         SELECT
             dp.id,
+            dp.fs_sale_revenue_id fsSaleRevenueId,
             dp.project_type projectType,
             dp.total_quantity totalQuantity,
-            dp.total_amount totalAmount
+            dp.province_total_quantity provinceTotalQuantity,
+            dp.total_amount totalAmount,
+            dp.province_total_amount provinceTotalAmount
         FROM
             business_fs_sale_revenue_diff_price dp
         WHERE