解决平台协议查询条件不生效的问题

私有应收	保司开票没有开票号。先选的我方开票，写了个开票号，随后又选的保司开票，最终开票记录还是显示出开票号

commons/src/main/java/com/jzg/commons/entity/finance/vo/SettlementQueryVo.java

@@ -68,6 +68,9 @@ public class SettlementQueryVo extends PageRequest {
     @Schema(description = "结算时间结束")
     private String settlementTimeEnd;
 
+    @Schema(description = "结算时间")
+    private String[] settlementTime;
+
     @Schema(description = "结算记录编号集合")
     private List<String> settlementIds;
 

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -482,7 +482,7 @@ public class ReceivableController {
                 receivableQueryVo.getSigningTime() != null &&
                 receivableQueryVo.getSigningTime().length == 2){
             receivableQueryVo.setSigningTimeStart(DateUtil.format(LocalDate.parse(receivableQueryVo.getSigningTime()[0], DateTimeFormatter.ISO_DATE).atStartOfDay(), "yyyy-MM-dd HH:mm:ss"));
-            receivableQueryVo.setSigningTimeEnd(DateUtil.format(LocalDate.parse(receivableQueryVo.getSigningTime()[0], DateTimeFormatter.ISO_DATE).plusDays(1).atStartOfDay(), "yyyy-MM-dd HH:mm:ss"));
+            receivableQueryVo.setSigningTimeEnd(DateUtil.format(LocalDate.parse(receivableQueryVo.getSigningTime()[1], DateTimeFormatter.ISO_DATE).plusDays(1).atStartOfDay(), "yyyy-MM-dd HH:mm:ss"));
         }
 
         receivableQueryVo.setSystemCode(baseController.getSystemCode());

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -1806,6 +1806,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Transactional
     public InvoiceingResult addInvoicing(InsPlyIncomeInvoiceVO invoicingVo) {
         log.info("开票：invoicingVo=[{}]", JSONUtil.toJsonStr(invoicingVo));
+        // add by lipf, 如果是保司开票， 设置发票号为空
+        if("2".equals(invoicingVo.getInvoiceType())){
+            invoicingVo.setInvoiceNo(null);
+        }
         try {
             this.valide4Invoicing(invoicingVo);
             InvoiceingResult result = new InvoiceingResult();
@@ -5115,6 +5119,16 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     public Page<ExportSuperviseSettlementExcelDto> platformSettlementExcel(Page page, SettlementQueryVo settlementQueryVo) {
         log.info("查询平台结算记录：settlementQueryVo=[{}]", JSONUtil.toJsonStr(settlementQueryVo));
+
+        if(StrUtil.isEmpty(settlementQueryVo.getSettlementDateStart())
+            && StrUtil.isEmpty(settlementQueryVo.getSettlementDateEnd())
+            && settlementQueryVo.getSettlementTime() != null &&
+                settlementQueryVo.getSettlementTime().length ==2){
+            DateUtil.parse(settlementQueryVo.getSettlementDateStart());
+            settlementQueryVo.setSettlementDateStart(DateUtil.format(LocalDate.parse(settlementQueryVo.getSettlementTime()[0], DateTimeFormatter.ISO_DATE).atStartOfDay(), "yyyy-MM-dd HH:mm:ss"));
+            settlementQueryVo.setSettlementDateEnd(DateUtil.format(LocalDate.parse(settlementQueryVo.getSettlementTime()[1], DateTimeFormatter.ISO_DATE).plusDays(1).atStartOfDay(), "yyyy-MM-dd HH:mm:ss"));
+        }
+
         // 设置空条件
         setNoneCondition(settlementQueryVo);
         settlementQueryVo.setSystemCode(baseController.getSystemCode());