2025-07-03

zhaowenxuan

昨天 dedacd79c93f8ef95e0cb986f5e7fbd27ddbd907

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/StjMemoController.java

@@ -120,24 +120,34 @@
    @GetMapping("/listByDate")
    public AjaxResult listByDate(@RequestParam String userId,
                                 @RequestParam Date mDate) {
        Map<String,List<StjMemo>> res=new HashMap<>();
        List<Date> dateList = mallSchedulingTimeService.getDateListByBetweenTime(DateUtil.format(DateUtil.beginOfMonth(mDate),"yyyy-MM-dd HH:mm:ss"),
                DateUtil.format(DateUtil.endOfMonth(mDate),"yyyy-MM-dd HH:mm:ss"));
//        Map<String,List<StjMemo>> res=new HashMap<>();
//        List<Date> dateList = mallSchedulingTimeService.getDateListByBetweenTime(DateUtil.format(DateUtil.beginOfMonth(mDate),"yyyy-MM-dd HH:mm:ss"),
//                DateUtil.format(DateUtil.endOfMonth(mDate),"yyyy-MM-dd HH:mm:ss"));
//
//        for (Date date : dateList) {
//            LambdaQueryWrapper<StjMemo> wq=new LambdaQueryWrapper<>();
//            wq.eq(StjMemo::getUserId,userId);
//            wq.eq(StjMemo::getMDate,date);
//            List<StjMemo> list = stjMemoService.list(wq);
//            String format = DateUtil.format(date, "yyyy-MM-dd");
//            if (list.size()==0){
//                StjMemo stjMemo=new StjMemo();
//                stjMemo.setTitle("无");
//                stjMemo.setMFlag("0");
//                list.add(stjMemo);
//            }
//            res.put(format,list);
//        }
//        return AjaxResult.success(res);

        for (Date date : dateList) {
            LambdaQueryWrapper<StjMemo> wq=new LambdaQueryWrapper<>();
            wq.eq(StjMemo::getUserId,userId);
            wq.eq(StjMemo::getMDate,date);
            List<StjMemo> list = stjMemoService.list(wq);
            String format = DateUtil.format(date, "yyyy-MM-dd");
            if (list.size()==0){
                StjMemo stjMemo=new StjMemo();
                stjMemo.setTitle("无");
                stjMemo.setMFlag("0");
                list.add(stjMemo);
            }
            res.put(format,list);
        LambdaQueryWrapper<StjMemo> wq=new LambdaQueryWrapper<>();
        wq.eq(StjMemo::getUserId,userId);
        wq.between(StjMemo::getMDate,(DateUtil.format(DateUtil.beginOfMonth(mDate),"yyyy-MM-dd")),(DateUtil.format(DateUtil.endOfMonth(mDate),"yyyy-MM-dd")));
        List<StjMemo> list = stjMemoService.list(wq);
        for (StjMemo stjMemo : list) {
            String formatDate = DateUtil.format(stjMemo.getMDate(),"yyyy-MM");
            stjMemo.setFormat(formatDate);
        }
        return AjaxResult.success(res);
        return AjaxResult.success(list);
    }
}