12/29

src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java

@@ -813,6 +813,9 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
             sunday = sunday.plus(Period.ofDays(7));
 //            System.out.println(sunday.compareTo(endD));
         } while (sunday.compareTo(endD) < 1);
+        String nextYear = DateUtil.offsetMonth(new Date(), 12).toString();
+        int y = DateUtil.year(DateUtil.parse(nextYear));
+        weekMap.add(String.valueOf(y) + "-01-01");
         Object[] array = weekMap.stream().sorted().toArray();
         return rb.success().setData(array);
     }

src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java

@@ -448,29 +448,6 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
     }
 
     public void exportExcel(LpkReserveOrderQuery query) {
-//        QueryWrapper<LpkReserveOrderQuery> qw = new QueryWrapper<>();
-//        qw.eq("1", "1");
-//        if (StringUtils.isNotBlank(query.getStore())) {
-//            qw.like("s.name", query.getStore());
-//        }
-//        if (StringUtils.isNotBlank(query.getBankSid())) {
-//            qw.eq("s.bankSid", query.getBankSid());
-//        }
-//        if (StringUtils.isNotBlank(query.getUserName())) {
-//            qw.like("o.userName", query.getUserName());
-//        }
-//        if (StringUtils.isNotBlank(query.getStartDate())) {
-//            String startDate = query.getStartDate();
-//            qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')");
-//        }
-//        if (StringUtils.isNotBlank(query.getEndDate())) {
-//            String endDate = query.getEndDate();
-//            qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')");
-//        }
-//        qw.orderByAsc("o.reserveDate");
-//        qw.orderByDesc("d.sid");
-//        qw.orderByDesc("s.sid");
-//        qw.orderByAsc("c.serialNumber");
         //得到所有要导出的数据
         List<ReserveOrderExport> exportList = baseMapper.exportExcel(query);
         List<ReserveOrderExport> exportList1 = new ArrayList<>();