From 9576bebcacea938771f6f5b51d958e6a4ac59df6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 09 十二月 2021 16:59:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
index d4e8c12..e043486 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
@@ -215,11 +215,11 @@
}
@Override
- public R getRotaPersonByDate(String rotaDate) {
+ public R getRotaPersonByDate(String rotaDate,Long communityId) {
ComSwRotaDO comSwRotaDO = new ComSwRotaDO();
try {
comSwRotaDO = comSwRotaDAO.selectOne(new QueryWrapper<ComSwRotaDO>().lambda().eq(ComSwRotaDO::getRotaDate,
- new SimpleDateFormat("yyyy-MM-dd").parse(rotaDate)));
+ new SimpleDateFormat("yyyy-MM-dd").parse(rotaDate)).eq(ComSwRotaDO::getCommunityId,communityId));
} catch (ParseException e) {
e.printStackTrace();
}
@@ -246,11 +246,11 @@
}
@Override
- public R getRotaLeaderByDate(String rotaDate) {
+ public R getRotaLeaderByDate(String rotaDate,Long communityId) {
ComSwRotaDO comSwRotaDO = new ComSwRotaDO();
try {
comSwRotaDO = comSwRotaDAO.selectOne(new QueryWrapper<ComSwRotaDO>().lambda().eq(ComSwRotaDO::getRotaDate,
- new SimpleDateFormat("yyyy-MM-dd").parse(rotaDate)));
+ new SimpleDateFormat("yyyy-MM-dd").parse(rotaDate)).eq(ComSwRotaDO::getCommunityId,communityId));
} catch (ParseException e) {
e.printStackTrace();
}
--
Gitblit v1.7.1