开票管理导出excel表

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

@@ -335,14 +335,29 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
 
         } else {
             LambdaQueryWrapper<InvAccountOperate> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.isNotNull(InvAccountOperate::getInvoiceId);
+//            lambdaQueryWrapper.isNotNull(InvAccountOperate::getInvoiceId);
+            lambdaQuery
+                    .like(!StringUtils.isEmpty(invAccountIncoiceQueryVo.getBiller()), InvAccountIncoice::getBiller, invAccountIncoiceQueryVo.getBiller())
+                    .like(!StringUtils.isEmpty(invAccountIncoiceQueryVo.getInvoiceBy()), InvAccountIncoice::getInvoiceBy,
+                            invAccountIncoiceQueryVo.getInvoiceBy())
+                    .eq(InvAccountIncoice::getDelFlag, "0")
+                    .eq(!StringUtils.isEmpty(invAccountIncoiceQueryVo.getInvoiceType()), InvAccountIncoice::getInvoiceType,
+                            invAccountIncoiceQueryVo.getInvoiceType())
+                    .like(!StringUtils.isEmpty(invAccountIncoiceQueryVo.getOtherUnit()), InvAccountIncoice::getOtherUnit, invAccountIncoiceQueryVo.getOtherUnit())
+                    .like(!StringUtils.isEmpty(invAccountIncoiceQueryVo.getClearFlag()), InvAccountIncoice::getClearFlag, invAccountIncoiceQueryVo.getClearFlag());
+
+            if (!ObjectUtils.isEmpty(invAccountIncoiceQueryVo.getInvoiceTimeStart()) && !ObjectUtils.isEmpty(invAccountIncoiceQueryVo.getInvoiceTimeEnd())) {
+                lambdaQuery.ge(InvAccountIncoice::getInvoiceTime, invAccountIncoiceQueryVo.getInvoiceTimeStart().toString());
+                lambdaQuery.le(InvAccountIncoice::getInvoiceTime, invAccountIncoiceQueryVo.getInvoiceTimeEnd().toString());
+            }
+            lambdaQuery.orderByDesc(InvAccountIncoice::getInvoiceTime);
             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集合放入查询中
-            if (!collect.isEmpty()) {
-                lambdaQuery.in(InvAccountIncoice::getInvoiceId, collect);
+//            if (!collect.isEmpty()) {
+//                lambdaQuery.in(InvAccountIncoice::getInvoiceId, collect);
                 invAccountIncoices = selectExcel(lambdaQuery, invAccountIncoiceQueryVo);
-            }
+//            }
         }
 
 
@@ -458,20 +473,20 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
     }
 
     private List<InvAccountIncoice> selectExcel(LambdaQueryWrapper<InvAccountIncoice> lambdaQuery, InvAccountIncoiceQueryVo invAccountIncoiceQueryVo) {
-        lambdaQuery
-                .like(!StringUtils.isEmpty(invAccountIncoiceQueryVo.getBiller()), InvAccountIncoice::getBiller, invAccountIncoiceQueryVo.getBiller())
-                .like(!StringUtils.isEmpty(invAccountIncoiceQueryVo.getInvoiceBy()), InvAccountIncoice::getInvoiceBy,
-                        invAccountIncoiceQueryVo.getInvoiceBy())
-                .eq(InvAccountIncoice::getDelFlag, "0")
-                .eq(!StringUtils.isEmpty(invAccountIncoiceQueryVo.getInvoiceType()), InvAccountIncoice::getInvoiceType,
-                        invAccountIncoiceQueryVo.getInvoiceType())
-                .like(!StringUtils.isEmpty(invAccountIncoiceQueryVo.getOtherUnit()), InvAccountIncoice::getOtherUnit, invAccountIncoiceQueryVo.getOtherUnit());
-
-
-        if (!ObjectUtils.isEmpty(invAccountIncoiceQueryVo.getInvoiceTimeStart()) && !ObjectUtils.isEmpty(invAccountIncoiceQueryVo.getInvoiceTimeEnd())) {
-            lambdaQuery.ge(InvAccountIncoice::getInvoiceTime, invAccountIncoiceQueryVo.getInvoiceTimeStart().toString());
-            lambdaQuery.le(InvAccountIncoice::getInvoiceTime, invAccountIncoiceQueryVo.getInvoiceTimeEnd().toString());
-        }
+//        lambdaQuery
+//                .like(!StringUtils.isEmpty(invAccountIncoiceQueryVo.getBiller()), InvAccountIncoice::getBiller, invAccountIncoiceQueryVo.getBiller())
+//                .like(!StringUtils.isEmpty(invAccountIncoiceQueryVo.getInvoiceBy()), InvAccountIncoice::getInvoiceBy,
+//                        invAccountIncoiceQueryVo.getInvoiceBy())
+//                .eq(InvAccountIncoice::getDelFlag, "0")
+//                .eq(!StringUtils.isEmpty(invAccountIncoiceQueryVo.getInvoiceType()), InvAccountIncoice::getInvoiceType,
+//                        invAccountIncoiceQueryVo.getInvoiceType())
+//                .like(!StringUtils.isEmpty(invAccountIncoiceQueryVo.getOtherUnit()), InvAccountIncoice::getOtherUnit, invAccountIncoiceQueryVo.getOtherUnit());
+//
+//
+//        if (!ObjectUtils.isEmpty(invAccountIncoiceQueryVo.getInvoiceTimeStart()) && !ObjectUtils.isEmpty(invAccountIncoiceQueryVo.getInvoiceTimeEnd())) {
+//            lambdaQuery.ge(InvAccountIncoice::getInvoiceTime, invAccountIncoiceQueryVo.getInvoiceTimeStart().toString());
+//            lambdaQuery.le(InvAccountIncoice::getInvoiceTime, invAccountIncoiceQueryVo.getInvoiceTimeEnd().toString());
+//        }
 
         return invAccountIncoiceMapper.selectList(lambdaQuery);
     }