Merge branch 'master_cj_zq' into master_sample_order

@@ -154,7 +154,7 @@ public class ReceiptLedgerInfoController extends DefaultBaseController {
      * 台账报表导出
      * 台账报表导出
      */
      */
     @ApiOperation("台账报表导出")
     @ApiOperation("台账报表导出")
-    @HasPermission({"customer-dev-manage:customer-dev-plan:export"})
+    @HasPermission({"account-manage:ledger-table:export"})
     @GetMapping("/report/export")
     @GetMapping("/report/export")
     public InvokeResult<Void> export(@Valid ReceiptLedgerReportVo vo) {
     public InvokeResult<Void> export(@Valid ReceiptLedgerReportVo vo) {
         if (StringUtils.isBlank(vo.getExportType())) {
         if (StringUtils.isBlank(vo.getExportType())) {

@@ -575,8 +575,8 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
                     reportDetail.setTimingStatus("超期3");
                     reportDetail.setTimingStatus("超期3");
                 }
                 }
                 // 统计待交付订单数
                 // 统计待交付订单数
-                Long count = orderCountMap.get(customerName);
-                if (count != null && !customerNames.contains(customerName)) {
+                long count = orderCountMap.get(customerName) == null ? 0 : orderCountMap.get(customerName);
+                if (!customerNames.contains(customerName)) {
                     waitDeliveredOrderTotal += count;
                     waitDeliveredOrderTotal += count;
                     reportDetail.setWaitDeliveredOrder(count);
                     reportDetail.setWaitDeliveredOrder(count);
                     // 防止重复相加
                     // 防止重复相加

@@ -146,10 +146,14 @@
         ELSE 10  -- 其他办事处按字母顺序排在后面
         ELSE 10  -- 其他办事处按字母顺序排在后面
         END,
         END,
         d.name ASC,
         d.name ASC,
+        CASE WHEN r.name IS NULL THEN 1 ELSE 0 END,
         r.name ASC,
         r.name ASC,
+        CASE WHEN cs.short_name IS NULL THEN 1 ELSE 0 END,
         cs.short_name ASC,
         cs.short_name ASC,
+        CASE WHEN oc.name IS NULL THEN 1 ELSE 0 END,
         oc.name ASC,
         oc.name ASC,
-        tb.shipment_date DESC
+        CASE WHEN tb.shipment_date IS NULL THEN 1 ELSE 0 END,
+        tb.shipment_date ASC
     </select>
     </select>
 
 
     <select id="queryByCustomerShortName" resultMap="ReceiptLedgerInfo">
     <select id="queryByCustomerShortName" resultMap="ReceiptLedgerInfo">
@@ -292,6 +296,7 @@
         else 10  -- 其他办事处按字母顺序排在后面
         else 10  -- 其他办事处按字母顺序排在后面
         end,
         end,
         d.name asc,
         d.name asc,
+        case when r.name is null then 1 else 0 end,
         r.name asc,
         r.name asc,
         sum(distinct rl.end_account_receivable) desc
         sum(distinct rl.end_account_receivable) desc
     </select>
     </select>