Merge branch 'refs/heads/v20.9_settlement_20240805' into dev

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

@@ -19,6 +19,9 @@ public class PageInvoiceOwnerSettlementOwnerDetailParam extends PageParam {
     @ApiModelProperty(value = "是否已开票，0：否，1：是")
     private Integer invoiceStatus;
 
+    @ApiModelProperty(value = "货主用户编号")
+    private Long ownerUserNo;
+
     @ApiModelProperty(value = "货主名称")
     private String ownerName;
 

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/PageOwnerSettlementOwnerDetailVO.java

@@ -123,6 +123,9 @@ public class PageOwnerSettlementOwnerDetailVO {
     @ApiModelProperty(value="是否上报 0-否;1-是",example = "1")
     private Integer reportFlag;  //是否上报 0-否;1-是
 
+    @ApiModelProperty(value = "开票时间")
+    private String invoiceTime;
+
     @ApiModelProperty(value="创建时间",example = "2013-01-01 00:00:00")
     private String createTime;
 

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDetailDaoImpl.java

@@ -204,14 +204,27 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
         LambdaQueryWrapper<SettlementOwnerDetail> query = new LambdaQueryWrapper<>();
         query.in(SettlementOwnerDetail :: getFinalPaymentStatus, SettlementOwnerDetailEnum.FinalPaymentStatus.YES,SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE);
         query.eq(SettlementOwnerDetail::getInvoiceStatus,param.getInvoiceStatus());
+        query.eq(Objects.nonNull(param.getOwnerUserNo()),SettlementOwnerDetail::getOwnerUserNo,param.getOwnerUserNo());
         query.like(StringUtils.isNotBlank(param.getOwnerName()),SettlementOwnerDetail :: getOwnerName,param.getOwnerName());
         query.eq(StringUtils.isNotBlank(param.getSettlementNo()),SettlementOwnerDetail :: getSettlementNo,param.getSettlementNo());
         query.eq(StringUtils.isNotBlank(param.getChildNo()),SettlementOwnerDetail :: getChildNo,param.getChildNo());
         query.like(StringUtils.isNotBlank(param.getInvoicingCompanyShorterName()),SettlementOwnerDetail :: getInvoicingCompanyShorterName,param.getInvoicingCompanyShorterName());
         query.eq(Objects.nonNull(param.getInvoiceType()),SettlementOwnerDetail :: getInvoiceType,param.getInvoiceType());
-        query.between(StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime()),SettlementOwnerDetail::getCreateTime,param.getBeginTime(),param.getEndTime());
-        query.between(StringUtils.isBlank(param.getBeginTime()) || StringUtils.isBlank(param.getEndTime()),SettlementOwnerDetail::getCreateTime,LocalDateTime.now().minusMonths(3),LocalDateTime.now());
-        query.orderByAsc(SettlementOwnerDetail::getCreateTime);
+
+        //待开票列表根据创建时间查找
+        if (param.getInvoiceStatus().equals(SettlementOwnerDetailEnum.InvoiceStatus.NO.getCode())) {
+            query.between(StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime()),SettlementOwnerDetail::getCreateTime,param.getBeginTime(),param.getEndTime());
+            query.between(StringUtils.isBlank(param.getBeginTime()) || StringUtils.isBlank(param.getEndTime()),SettlementOwnerDetail::getCreateTime,LocalDateTime.now().minusMonths(3),LocalDateTime.now());
+        //已开票列表根据开票时间查找
+        }else {
+            query.between(StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime()),SettlementOwnerDetail::getInvoiceTime,param.getBeginTime(),param.getEndTime());
+            query.between(StringUtils.isBlank(param.getBeginTime()) || StringUtils.isBlank(param.getEndTime()),SettlementOwnerDetail::getInvoiceTime,LocalDateTime.now().minusMonths(3),LocalDateTime.now());
+        }
+
+        //待开票列表根据创建时间正序排，已开票列表根据开票时间倒序排
+        query.orderByAsc(param.getInvoiceStatus().equals(SettlementOwnerDetailEnum.InvoiceStatus.NO.getCode()),SettlementOwnerDetail::getCreateTime);
+        query.orderByDesc(param.getInvoiceStatus().equals(SettlementOwnerDetailEnum.InvoiceStatus.YES.getCode()),SettlementOwnerDetail::getInvoiceTime);
+
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
     }
 

performance-web/src/main/java/com/clx/performance/model/settle/SettlementOwnerDetail.java

@@ -70,6 +70,7 @@ public class SettlementOwnerDetail implements HasKey<Integer> {
     private String invoicingCompanyGroupCode;  //开票公司统一社会信用代码
     private Integer reportFlag;  //是否上报 0-否;1-是
     private Integer invoiceChannel;                //开票渠道：1无车承运
+    private LocalDateTime invoiceTime;                //开票时间
     private String remark;                              //备注
     private Integer payStatus;                  //支付状态：0未支付 1已支付（网络货运是否支付）
     private LocalDateTime poundAuditTime;                  //磅单审核通过时间

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

@@ -585,7 +585,12 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         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));
+        if (param.getInvoiceStatus().equals(SettlementOwnerDetailEnum.InvoiceStatus.NO.getCode())) {
+            fieldList.add(new ExcelField(26, "备注", "remark", 5000));
+        }else {
+            fieldList.add(new ExcelField(26, "开票时间", "invoiceTime", 5000));
+            fieldList.add(new ExcelField(27, "备注", "remark", 5000));
+        }
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -620,12 +625,21 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(vo.getCreateTime()));
             rowData.add(new ExcelData(vo.getFinalPaymentStatusMsg()));
             rowData.add(new ExcelData(vo.getInvoiceStatusMsg()));
-            rowData.add(new ExcelData(vo.getRemark()));
+            if (param.getInvoiceStatus().equals(SettlementOwnerDetailEnum.InvoiceStatus.NO.getCode())) {
+                rowData.add(new ExcelData(vo.getRemark()));
+            }else {
+                rowData.add(new ExcelData(vo.getInvoiceTime()));
+                rowData.add(new ExcelData(vo.getRemark()));
+            }
 
             dataList.add(rowData);
         }
 
-        ExcelSheet excelSheet = new ExcelSheet("待开票列表", "待开票列表", fieldList, dataList);
+        String name = "已开票列表";
+        if (param.getInvoiceStatus().equals(SettlementOwnerDetailEnum.InvoiceStatus.NO.getCode())) {
+            name = "待开票列表";;
+        }
+        ExcelSheet excelSheet = new ExcelSheet(name, name, fieldList, dataList);
 
         //创建excel
         return ExcelUtil.create(excelSheet);