未收未付明细 按照 客户和提单号 分组 显示开船日期

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/mapper/FinAccBillsMapper.xml

@@ -449,12 +449,15 @@
         acc.bill_no billNo,
         acc.mblno mblNo,
         acc.business_type businessType,
-        CASE
-        acc.business_type
         WHEN 'SI' THEN
         acc.eta
+        WHEN 'SIA' THEN
+        acc.eta
         WHEN 'SE' THEN
-        acc.etd ELSE ''
+        acc.etd
+        WHEN 'SEA' THEN
+        acc.etd
+        ELSE ''
         END AS etdDate,
         SUM(( CASE acc.account_dc WHEN 'D' THEN acc.amount_dr WHEN 'C' THEN acc.amount_cr ELSE 0 END ) ) AS amount,
         SUM(( CASE acc.account_dc WHEN 'D' THEN acc.amount_dr_usd WHEN 'C' THEN acc.amount_cr_usd ELSE 0 END ) ) AS amountUsd,
@@ -528,7 +531,7 @@
         <if test='fee.sortType == null or fee.sortType == ""'>
             GROUP BY acc.mblno
         </if>
-        ORDER BY acc.corp_id
+        ORDER BY acc.mblno,acc.corp_id
     </select>
     <select id="feeSummaryDetailNot" resultType="org.springblade.los.statisticAnalysis.FeeSummaryDetailNotRD">
         SELECT
@@ -553,8 +556,13 @@
             acc.business_type
             WHEN 'SI' THEN
             acc.eta
+            WHEN 'SIA' THEN
+            acc.eta
             WHEN 'SE' THEN
-            acc.etd ELSE ''
+            acc.etd
+            WHEN 'SEA' THEN
+            acc.etd
+            ELSE ''
             END AS etd,
             acc.pod_en_name pod,
             acc.pol_en_name pol,
@@ -624,15 +632,15 @@
             </if>
         </if>
         <if test='fee.sortType != null and fee.sortType != "" and fee.sortType == "1"'>
-            GROUP BY acc.corp_id
+            GROUP BY acc.corp_id,acc.mblno
         </if>
         <if test='fee.sortType != null and fee.sortType != "" and fee.sortType == "3"'>
-            GROUP BY acc.mblno
+            GROUP BY acc.corp_id,acc.mblno
         </if>
         <if test='fee.sortType == null or fee.sortType == ""'>
-            GROUP BY acc.mblno
+            GROUP BY  acc.corp_id,acc.mblno
         </if>
-        ORDER BY acc.corp_id
+        ORDER BY acc.mblno,acc.corp_id
     </select>
     <select id="feeSummaryDetailExportNot"
             resultType="org.springblade.los.statisticAnalysis.FeeSummaryDetailNotRD">
@@ -658,8 +666,13 @@
         acc.business_type
         WHEN 'SI' THEN
         acc.eta
+        WHEN 'SIA' THEN
+        acc.eta
         WHEN 'SE' THEN
-        acc.etd ELSE ''
+        acc.etd
+        WHEN 'SEA' THEN
+        acc.etd
+        ELSE ''
         END AS etd,
         acc.pod_en_name pod,
         acc.pol_en_name pol,
@@ -729,13 +742,13 @@
             </if>
         </if>
         <if test='fee.sortType != null and fee.sortType != "" and fee.sortType == "1"'>
-            GROUP BY acc.corp_id
+            GROUP BY acc.corp_id,acc.mblno
         </if>
         <if test='fee.sortType != null and fee.sortType != "" and fee.sortType == "3"'>
-            GROUP BY acc.mblno
+            GROUP BY acc.corp_id,acc.mblno
         </if>
         <if test='fee.sortType == null or fee.sortType == ""'>
-            GROUP BY acc.mblno
+            GROUP BY acc.corp_id,acc.mblno
         </if>
         ORDER BY acc.corp_id
     </select>