Browse Source

补充进账日期

y 2 năm trước cách đây
mục cha
commit
9697a182c4

+ 6 - 3
src/main/java/com/ydtech/modules/inv/service/impl/InvAccountIncoiceServiceImpl.java

@@ -315,7 +315,7 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
     public String excel(InvAccountIncoiceQueryVo invAccountIncoiceQueryVo) {
     public String excel(InvAccountIncoiceQueryVo invAccountIncoiceQueryVo) {
         LambdaQueryWrapper<InvAccountIncoice> lambdaQuery = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<InvAccountIncoice> lambdaQuery = new LambdaQueryWrapper<>();
         List<InvAccountIncoice> invAccountIncoices = new ArrayList<>();
         List<InvAccountIncoice> invAccountIncoices = new ArrayList<>();
-
+        List<InvAccountOperate> list;
         /**
         /**
          * 如果有开票时间范围,查询开票记录表
          * 如果有开票时间范围,查询开票记录表
          */
          */
@@ -324,7 +324,7 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
             lambdaQueryWrapper.ge(InvAccountOperate::getCreateTime, invAccountIncoiceQueryVo.getApplyTimeStart());
             lambdaQueryWrapper.ge(InvAccountOperate::getCreateTime, invAccountIncoiceQueryVo.getApplyTimeStart());
             lambdaQueryWrapper.le(InvAccountOperate::getCreateTime, invAccountIncoiceQueryVo.getApplyTimeEnd());
             lambdaQueryWrapper.le(InvAccountOperate::getCreateTime, invAccountIncoiceQueryVo.getApplyTimeEnd());
             lambdaQueryWrapper.isNotNull(InvAccountOperate::getInvoiceId);
             lambdaQueryWrapper.isNotNull(InvAccountOperate::getInvoiceId);
-            List<InvAccountOperate> list = invAccountOperateService.list(lambdaQueryWrapper);
+            list = invAccountOperateService.list(lambdaQueryWrapper);
             List<String> collect = list.stream().map(InvAccountOperate::getInvoiceId).collect(Collectors.toList());
             List<String> collect = list.stream().map(InvAccountOperate::getInvoiceId).collect(Collectors.toList());
             //将开票id集合放入查询中
             //将开票id集合放入查询中
             if (!collect.isEmpty()) {
             if (!collect.isEmpty()) {
@@ -333,13 +333,16 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
             }
             }
 
 
         } else {
         } else {
+            list = new ArrayList<>();
             invAccountIncoices = selectExcel(lambdaQuery, invAccountIncoiceQueryVo);
             invAccountIncoices = selectExcel(lambdaQuery, invAccountIncoiceQueryVo);
         }
         }
 
 
 
 
         //解决时间格式报错问题
         //解决时间格式报错问题
         invAccountIncoices.forEach(invAccountIncoice -> {
         invAccountIncoices.forEach(invAccountIncoice -> {
-
+            if (!list.isEmpty()){
+                invAccountIncoice.setPayoutDate(list.get(0).getCreateTime().toString());
+            }
             if (invAccountIncoice.getInvoiceTime() != null) {
             if (invAccountIncoice.getInvoiceTime() != null) {
                 invAccountIncoice.setInvoiceDate(invAccountIncoice.getInvoiceTime().toString());
                 invAccountIncoice.setInvoiceDate(invAccountIncoice.getInvoiceTime().toString());
             }
             }