结算单优化

performance-api/src/main/java/com/clx/performance/param/pc/PageCarrierOrderChildParam.java

@@ -53,7 +53,7 @@ public class PageCarrierOrderChildParam extends PageParam {
     @ApiModelProperty(value = "运单状态集合")
     private List<Integer> statusList;
 
-    @ApiModelProperty(value = "时间筛选类型，1：接单时间，2：磅单审核通过时间")
+    @ApiModelProperty(value = "时间筛选类型，1：接单时间，2：磅单审核通过时间，3：完成时间")
     private Integer timeType;
 
 }

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementOwnerDetailController.java

@@ -66,6 +66,15 @@ public class CarrierSettlementOwnerDetailController {
         return Result.page(page.getRecords(),page.getTotal(),page.getPages());
     }
 
+    @ApiOperation(value = "导出开票管理待开票、已开票",notes = "<br>By:杨启发")
+    @PostMapping("/exportInvoiceOwnerSettlementOrderDetail")
+    public void exportInvoiceOwnerSettlementOrderDetail(@RequestBody @Validated PageInvoiceOwnerSettlementOwnerDetailParam param, HttpServletResponse response) throws Exception {
+        try (SXSSFWorkbook workbook = settlementOwnerDetailService.exportInvoiceOwnerSettlementOrderDetail(param)) {
+            response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            workbook.write(response.getOutputStream());
+        }
+    }
+
     @ApiOperation(value = "导出货主结算单运单明细",notes = "<br>By:姜文业")
     @PostMapping("/exportOwnerSettlementOrderDetailList")
     public void exportCarrierSettlementOwnerPageList(@RequestBody @Validated PageOwnerSettlementOwnerDetailParam param, HttpServletResponse response) throws Exception {

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerDetailServiceImpl.java

@@ -525,4 +525,86 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         //创建excel
         return ExcelUtil.create(excelSheet);
     }
+
+    @Override
+    public SXSSFWorkbook exportInvoiceOwnerSettlementOrderDetail(PageInvoiceOwnerSettlementOwnerDetailParam param) {
+        param.setPage(1);
+        param.setPageSize(1000000);
+        IPage<PageOwnerSettlementOwnerDetailVO> settlementOwnerDetailPage = pageInvoiceOwnerSettlementOrderDetailList(param);
+
+        List<PageOwnerSettlementOwnerDetailVO> list = settlementOwnerDetailPage.getRecords();
+
+        // 组装表头
+        List<ExcelField> fieldList = new ArrayList<>();
+        fieldList.add(new ExcelField(0, "运单编号", "childNo", 5000));
+        fieldList.add(new ExcelField(1, "货主名称", "ownerName", 5000));
+        fieldList.add(new ExcelField(2, "结算方式", "settlementWay", 5000));
+        fieldList.add(new ExcelField(3, "开票公司", "invoicingCompanyShorterName", 5000));
+        fieldList.add(new ExcelField(4, "开票标识", "invoiceTypeMsg", 5000));
+        fieldList.add(new ExcelField(5, "货物名称", "goodsName", 5000));
+        fieldList.add(new ExcelField(6, "装车净重（吨）", "loadNet", 5000));
+        fieldList.add(new ExcelField(7, "卸车净重（吨）", "unloadNet", 5000));
+        fieldList.add(new ExcelField(8, "实际净重（吨）", "weight", 5000));
+        fieldList.add(new ExcelField(9, "平台运费报价", "freightPrice", 5000));
+        fieldList.add(new ExcelField(10, "应付运费", "freight", 5000));
+        fieldList.add(new ExcelField(11, "货损吨数", "lossWeight", 5000));
+        fieldList.add(new ExcelField(12, "货损单价", "lossPrice", 5000));
+        fieldList.add(new ExcelField(13, "货损金额", "lossFreight", 5000));
+        fieldList.add(new ExcelField(14, "管理费率（%）", "invoiceServiceFeeRate", 5000));
+        fieldList.add(new ExcelField(15, "管理费", "invoiceServiceFee", 5000));
+        fieldList.add(new ExcelField(16, "预付运费金额", "prepayFreight", 5000));
+        fieldList.add(new ExcelField(17, "借款抵扣金额", "loanFreight", 5000));
+        fieldList.add(new ExcelField(18, "结算金额", "settlementFreight", 5000));
+        fieldList.add(new ExcelField(19, "开票金额", "invoiceFreight", 5000));
+        fieldList.add(new ExcelField(20, "订单编号", "orderNo", 5000));
+        fieldList.add(new ExcelField(21, "结算单号", "settlementNo", 5000));
+        fieldList.add(new ExcelField(22, "结算子单号", "settlementSubNo", 5000));
+        fieldList.add(new ExcelField(23, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(24, "是否已付尾款", "finalPaymentStatusMsg", 5000));
+        fieldList.add(new ExcelField(25, "是否已开票", "invoiceStatusMsg", 5000));
+        fieldList.add(new ExcelField(26, "备注", "remark", 5000));
+
+        // 组装数据
+        List<List<ExcelData>> dataList = new ArrayList<>();
+        for (PageOwnerSettlementOwnerDetailVO vo : list) {
+
+            List<ExcelData> rowData = new ArrayList<>();
+
+            rowData.add(new ExcelData(vo.getChildNo()));
+            rowData.add(new ExcelData(vo.getOwnerName()));
+            rowData.add(new ExcelData(SettlementWayEnum.WayType.getMsgByCode(vo.getSettlementWay())));
+            rowData.add(new ExcelData(vo.getInvoicingCompanyShorterName()));
+            rowData.add(new ExcelData(vo.getInvoiceTypeMsg()));
+            rowData.add(new ExcelData(vo.getGoodsName()));
+            rowData.add(new ExcelData(vo.getLoadNet()));
+            rowData.add(new ExcelData(vo.getUnloadNet()));
+            rowData.add(new ExcelData(vo.getWeight()));
+            rowData.add(new ExcelData(vo.getFreightPrice()));
+            rowData.add(new ExcelData(vo.getFreight()));
+            rowData.add(new ExcelData(vo.getLossWeight()));
+            rowData.add(new ExcelData(vo.getLossPrice()));
+
+            rowData.add(new ExcelData(vo.getLossFreight()));
+            rowData.add(new ExcelData(vo.getInvoiceServiceFeeRate()));
+            rowData.add(new ExcelData(vo.getInvoiceServiceFee()));
+            rowData.add(new ExcelData(vo.getPrepayFreight()));
+            rowData.add(new ExcelData(vo.getLoanFreight()));
+            rowData.add(new ExcelData(vo.getSettlementFreight()));
+            rowData.add(new ExcelData(vo.getInvoiceFreight()));
+            rowData.add(new ExcelData(vo.getOrderNo()));
+            rowData.add(new ExcelData(vo.getSettlementNo()));
+            rowData.add(new ExcelData(vo.getSettlementSubNo()));
+            rowData.add(new ExcelData(vo.getCreateTime()));
+            rowData.add(new ExcelData(vo.getFinalPaymentStatusMsg()));
+            rowData.add(new ExcelData(vo.getInvoiceStatusMsg()));
+            rowData.add(new ExcelData(vo.getRemark()));
+
+            dataList.add(rowData);
+        }
+
+        ExcelSheet excelSheet = new ExcelSheet("待开票列表", "待开票列表", fieldList, dataList);
+
+        //创建excel
+        return ExcelUtil.create(excelSheet);
+    }
 }

performance-web/src/main/java/com/clx/performance/service/settle/SettlementOwnerDetailService.java

@@ -42,5 +42,5 @@ public interface SettlementOwnerDetailService  {
 
     SXSSFWorkbook exportBatchSettlementOwnerDetail(ExportBatchOwnerSettlementDetailParam param);
 
-
+    SXSSFWorkbook exportInvoiceOwnerSettlementOrderDetail(PageInvoiceOwnerSettlementOwnerDetailParam param);
 }

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildSqlProvider.java

@@ -124,6 +124,9 @@ public class OrderChildSqlProvider {
             }else if (Objects.equals(param.getTimeType(),2)) {
                 if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("pound_audit_time >= #{param.beginTime}");}
                 if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("pound_audit_time <= #{param.endTime}");}
+            }else if (Objects.equals(param.getTimeType(),3)) {
+                if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("finish_time >= #{param.beginTime}");}
+                if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("finish_time <= #{param.endTime}");}
             }
 
             if (StringUtils.isNotBlank(param.getOrderGoodsNo())) {WHERE("order_goods_no = #{param.orderGoodsNo}");}