diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/enums/DayOfWeekEnum.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/enums/DayOfWeekEnum.java index d50b95e0..048182c7 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/enums/DayOfWeekEnum.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/enums/DayOfWeekEnum.java @@ -35,9 +35,9 @@ public enum DayOfWeekEnum { */ SIX(NumConstant.SIX_STR, "周六"), /** - * 7-周天 + * 7-周日 */ - SEVEN(NumConstant.SEVEN_STR, "周天"); + SEVEN(NumConstant.SEVEN_STR, "周日"); private String key; private String value; diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupGuideDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupGuideDao.xml index f02570b4..dbbb24a8 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupGuideDao.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupGuideDao.xml @@ -53,7 +53,7 @@ FROM epdc_party_group_guide g LEFT JOIN epdc_party_group_guide_relation gr ON g.id = gr.PARTY_GROUP_GUIDE_ID WHERE g.DEL_FLAG = '0' AND gr.DEL_FLAG = '0' - AND g.DAY_OF_WEEK = dayofweek(curdate())-1 + AND g.DAY_OF_WEEK = WEEKDAY(curdate())+1 AND gr.PARTY_GROUP_ID = #{partyGroupId}