未收付明细合计 客户+hblno+mblno+branch_id 分组

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

@@ -574,18 +574,7 @@
     </select>
     <select id="feeSummaryDetailNotList" resultType="org.springblade.los.statisticAnalysis.FeeSummaryDetailNotRD">
         SELECT
-        <if test='fee.type != null and fee.type != "" and fee.type == "1"'>
-            acc.corp_cn_name corpName,
-        </if>
-        <if test='fee.type != null and fee.type != "" and fee.type == "2"'>
-            acc.bill_corp_cn_name corpName,
-        </if>
-        <if test='fee.type != null and fee.type != "" and fee.type == "3"'>
-            acc.src_cn_name corpName,
-        </if>
-        <if test='fee.type == null or fee.type == ""'>
-            acc.corp_cn_name corpName,
-        </if>
+            acc.corp_id,acc.corp_cn_name , acc.branch_id,
             acc.business_bill_no billNo,
             acc.vessel_en_name vesselName,
             acc.voyage_no voyageNo,
@@ -673,35 +662,13 @@
                 and acc.approved_date &lt;= #{fee.etdEnd}
             </if>
         </if>
-        <if test='fee.type != null and fee.type != "" and fee.type == "1"'>
-            GROUP BY acc.corp_id, acc.branch_id
-        </if>
-        <if test='fee.type != null and fee.type != "" and fee.type == "2"'>
-            GROUP BY acc.bill_corp_id, acc.branch_id
-        </if>
-        <if test='fee.type != null and fee.type != "" and fee.type == "3"'>
-            GROUP BY acc.mblno,acc.hblno, acc.branch_id
-        </if>
-        <if test='fee.type == null or fee.type == ""'>
-            GROUP BY acc.mblno,acc.hblno, acc.branch_id
-        </if>
-        ORDER BY acc.corp_id,acc.mblno,acc.hblno
+         GROUP BY acc.corp_id,acc.mblno,acc.hblno, acc.branch_id
+        ORDER BY acc.corp_id,acc.mblno,acc.hblno, acc.branch_id
     </select>
     <select id="feeSummaryDetailExportNotList"
             resultType="org.springblade.los.statisticAnalysis.FeeSummaryDetailNotRD">
         SELECT
-        <if test='fee.type != null and fee.type != "" and fee.type == "1"'>
-            acc.corp_cn_name corpName,
-        </if>
-        <if test='fee.type != null and fee.type != "" and fee.type == "2"'>
-            acc.bill_corp_cn_name corpName,
-        </if>
-        <if test='fee.type != null and fee.type != "" and fee.type == "3"'>
-            acc.src_cn_name corpName,
-        </if>
-        <if test='fee.type == null or fee.type == ""'>
-            acc.corp_cn_name corpName,
-        </if>
+        acc.corp_id,acc.corp_cn_name , acc.branch_id,
         acc.business_bill_no billNo,
         acc.vessel_en_name vesselName,
         acc.voyage_no voyageNo,
@@ -789,18 +756,7 @@
                 and acc.approved_date &lt;= #{fee.etdEnd}
             </if>
         </if>
-        <if test='fee.type != null and fee.type != "" and fee.type == "1"'>
-            GROUP BY acc.corp_id, acc.branch_id
-        </if>
-        <if test='fee.type != null and fee.type != "" and fee.type == "2"'>
-            GROUP BY acc.bill_corp_id, acc.branch_id
-        </if>
-        <if test='fee.type != null and fee.type != "" and fee.type == "3"'>
-            GROUP BY acc.mblno,acc.hblno, acc.branch_id
-        </if>
-        <if test='fee.type == null or fee.type == ""'>
-            GROUP BY acc.mblno,acc.hblno, acc.branch_id
-        </if>
+        GROUP BY acc.corp_id,acc.mblno,acc.hblno, acc.branch_id
         ORDER BY acc.corp_id,acc.mblno,acc.hblno
     </select>
     <select id="agingAnalysis" resultType="org.springblade.los.statisticAnalysis.AgingAnalysisRD">