打印待支付名单修改

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillSubsidyServiceImpl.java

@@ -697,7 +697,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
     public void printPay2(HttpServletResponse response, String startDate, String endDate) throws IOException {
 
         QueryWrapper<BillSubsidy> wrapper = new QueryWrapper<>();
-        if (StringUtils.isBlank(startDate)) {
+     /*   if (StringUtils.isBlank(startDate)) {
             Date date = new Date();
             startDate = DateUtil.format(date, "yyyy-MM-dd");
             wrapper.ge("create_time", startDate);
@@ -705,8 +705,17 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         if (StringUtils.isNotBlank(endDate)) {
             String endTime = endDate + " 23:59:59";
             wrapper.le("create_time", endTime);
+        }*/
+        if (StringUtils.isBlank(startDate) || StringUtils.isBlank(endDate)) {
+            Date date = new Date();
+            endDate = DateUtil.format(date, "yyyy-MM-dd");
+            String endTime = endDate + " 23:59:59";
+            wrapper.le("create_time", endTime);
+        } else {
+             startDate = startDate + " 00:00:00";
+             endDate = endDate + " 23:59:59";
+            wrapper.between("create_time", startDate, endDate);
         }
-
         wrapper.eq("is_pay", 1);
         wrapper.eq("subsidy_sch", 3);
         List<BillSubsidy> billSubsidies = subsidyMapper.selectList(wrapper);
@@ -734,8 +743,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
                 fileName.append(endDate);
                 fileName.append("   待支付名单");
             } else {
-                fileName.append(startDate);
-                fileName.append(" 至  待支付名单");
+                fileName.append("至今所有待支付名单");
             }
             writer.merge(6, fileName.toString());