发票管理修复

src/main/java/com/ydtech/modules/inv/model/InvAccountIncoice.java

@@ -14,6 +14,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * 发票管理表(InvAccountIncoice)表实体类
@@ -101,6 +102,11 @@ public class InvAccountIncoice implements Serializable{
     @TableField(exist = false)
     private String payoutDate;
 
+    @ApiModelProperty(value = "进账日期")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private LocalDate payoutTime;
+
     @ApiModelProperty(value = "进账卡号")
     private String revBankCardNum;
 

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountIncoiceServiceImpl.java

@@ -140,7 +140,7 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
         invAccountOperate.setFundUse(invAccountIncoice.getFundUse());
         invAccountOperate.setFundFen(invAccountIncoice.getFundFen());
         invAccountOperate.setInvoiceId(invAccountIncoice1.getInvoiceId());
-        invAccountOperate.setCreateTime(LocalDateTime.now());
+        invAccountOperate.setCreateTime(invAccountIncoice.getPayoutTime().atStartOfDay());
         invAccountOperate.setEntProfit(entProfit);
         invAccountOperate.setDel(String.valueOf(date.getTime()));
         invAccountOperate.setOutCardNum(outCard.getBankCardNum());
@@ -159,7 +159,7 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
         outInvAccountOperate.setFundUse(invAccountIncoice.getFundUse());
         outInvAccountOperate.setFundFen(invAccountIncoice.getFundFen());
         outInvAccountOperate.setInvoiceId(invAccountIncoice1.getInvoiceId());
-        outInvAccountOperate.setCreateTime(LocalDateTime.now());
+        outInvAccountOperate.setCreateTime(invAccountIncoice.getPayoutTime().atStartOfDay());
         outInvAccountOperate.setOutProfit(outProfit);
         outInvAccountOperate.setDel(String.valueOf(date.getTime()));
         outInvAccountOperate.setOutCardNum(outCard.getBankCardNum());
@@ -334,8 +334,15 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
             }
 
         } else {
-            list = new ArrayList<>();
-            invAccountIncoices = selectExcel(lambdaQuery, invAccountIncoiceQueryVo);
+            LambdaQueryWrapper<InvAccountOperate> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.isNotNull(InvAccountOperate::getInvoiceId);
+            list = invAccountOperateService.list(lambdaQueryWrapper);
+            List<String> collect = list.stream().map(InvAccountOperate::getInvoiceId).collect(Collectors.toList());
+            //将开票id集合放入查询中
+            if (!collect.isEmpty()) {
+                lambdaQuery.in(InvAccountIncoice::getInvoiceId, collect);
+                invAccountIncoices = selectExcel(lambdaQuery, invAccountIncoiceQueryVo);
+            }
         }
 
 
@@ -440,6 +447,7 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
             invAccountIncoiceResult1.setCurrent(invAccountIncoice.getPageNo());
             invAccountIncoiceResult1.setTotal(invAccountIncoicePage.getTotal());
             invAccountIncoiceResult1.setSize(invAccountIncoice.getPageSize());
+            return invAccountIncoiceResult1;
         }
         invAccountIncoiceResult.setRecords(invAccountIncoicePage.getRecords());
         invAccountIncoiceResult.setCurrent(invAccountIncoice.getPageNo());