From c43b68424a114d9670eaba4937ae8595bc737d22 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Thu, 28 Dec 2023 09:07:51 +0800 Subject: [PATCH] 12/28 --- .../com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java index efdedf4..18e3957 100644 --- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java +++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java @@ -772,8 +772,9 @@ public class EmpCardGiftService extends MybatisBaseService isSaturAndSun(String cardSid) { ResultBean rb = new ResultBean().fail(); EmpCardGift empCardGift=baseMapper.selectOne(new QueryWrapper().eq("sid",cardSid)); - LocalDate now = DateUtil.parse(empCardGift.getStartDate().toString()).toSqlDate().toLocalDate(); - LocalDate endD = DateUtil.parse(empCardGift.getEndDate().toString()).toSqlDate().toLocalDate(); + SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + LocalDate now = DateUtil.parse(sdf1.format(empCardGift.getStartDate())).toSqlDate().toLocalDate(); + LocalDate endD = DateUtil.parse(sdf1.format(empCardGift.getEndDate())).toSqlDate().toLocalDate(); List weekMap = new ArrayList<>(); // 第一个星期六 // LocalDate saturday = now.with(firstInMonth(DayOfWeek.SATURDAY));