From 6ed1b7488cf62d9c35f5fd5fa09cacc896eb520f Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 22 十一月 2023 13:33:48 +0800
Subject: [PATCH] 备忘录1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/StjMemoController.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/StjMemoController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/StjMemoController.java
index 28759f8..6a41b54 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/StjMemoController.java
+++ b/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);
}
}
--
Gitblit v1.8.0