From ef30224867d252bcb7ee224f5b6ab895257b2233 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Wed, 19 Mar 2025 14:41:09 +0800 Subject: [PATCH] commit --- .../site/SiteReserveController.java | 1 - .../controller/site/SiteReviewController.java | 36 ++- .../activity/models/ActivitySiteInfo.java | 5 + .../components/activity/site/ReserveInfo.vue | 6 +- .../views/mobile/activity/site/reserve.html | 36 ++- .../platform/activity/site/SiteManage.html | 254 ++++++++++-------- .../platform/activity/site/SiteReserve.html | 53 ++-- 7 files changed, 217 insertions(+), 174 deletions(-) diff --git a/src/main/java/io/v/nutz/activity/controller/site/SiteReserveController.java b/src/main/java/io/v/nutz/activity/controller/site/SiteReserveController.java index 698fa12..23254c0 100644 --- a/src/main/java/io/v/nutz/activity/controller/site/SiteReserveController.java +++ b/src/main/java/io/v/nutz/activity/controller/site/SiteReserveController.java @@ -224,7 +224,6 @@ public class SiteReserveController { if (StrUtil.isNotBlank(siteType)) { cnd.and("typeId", "=", siteType); } - sql.setCondition(cnd); return siteInfoService.list(sql); } diff --git a/src/main/java/io/v/nutz/activity/controller/site/SiteReviewController.java b/src/main/java/io/v/nutz/activity/controller/site/SiteReviewController.java index 80748ee..e326164 100644 --- a/src/main/java/io/v/nutz/activity/controller/site/SiteReviewController.java +++ b/src/main/java/io/v/nutz/activity/controller/site/SiteReviewController.java @@ -90,12 +90,9 @@ public class SiteReviewController { GROUP_CONCAT(reserve_day order by reserve_day asc) concat_day FROM activity_site_reserve asr - LEFT JOIN - activity_site_info asi ON asi.id = asr.site_id - LEFT JOIN - audit_state ass ON ass.stateId = asr.reserve_state - LEFT JOIN - sys_user u on u.id = asr.reserve_person_id + LEFT JOIN activity_site_info asi ON asi.id = asr.site_id + LEFT JOIN audit_state ass ON ass.stateId = asr.reserve_state + LEFT JOIN sys_user u on u.id = asr.reserve_person_id $condition """); @@ -115,36 +112,33 @@ public class SiteReviewController { List sList = siteReserveService.list(s); List stateList = sList.stream().map(o -> o.getString("stateId")).collect(Collectors.toList()); - if (isAudit == null) { - SqlExpressionGroup group = new SqlExpressionGroup(); - group.and(new Static("JSON_CONTAINS(auditList, JSON_OBJECT('auditUser', '" + ShiroUtil.getPrincipalProperty("id") + "'))")) - .or("reserve_state", "in", stateList); - cnd.and(group); - } else if (isAudit) { - //查询已审核 - cnd.and(new Static("JSON_CONTAINS(auditList, JSON_OBJECT('auditUser', '" + ShiroUtil.getPrincipalProperty("id") + "'))")); - } else { - cnd.and("reserve_state", "in", stateList); + if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06"})) { + if (isAudit == null) { + SqlExpressionGroup group = new SqlExpressionGroup(); + group.and(new Static("JSON_CONTAINS(auditList, JSON_OBJECT('auditUser', '" + ShiroUtil.getPrincipalProperty("id") + "'))")) + .or("reserve_state", "in", stateList); + cnd.and(group); + } else if (isAudit) { + //查询已审核 + cnd.and(new Static("JSON_CONTAINS(auditList, JSON_OBJECT('auditUser', '" + ShiroUtil.getPrincipalProperty("id") + "'))")); + } else { + cnd.and("reserve_state", "in", stateList); + } } - if (Strings.isNotBlank(siteType)) { cnd.and("asi.typeId", "=", siteType); } - if (Strings.isNotBlank(month)) { cnd.and("left(reserve_day, 7)", "=", month); } - if (Strings.isNotBlank(searchName) && Strings.isNotBlank(searchKeyword)) { cnd.where().andLike(searchName, searchKeyword); } - if (Strings.isNotBlank(pageOrderName) && Strings.isNotBlank(pageOrderName)) { cnd.orderBy(pageOrderName, PageUtil.getOrder(pageOrderBy)); } else { cnd.asc("asr.reserve_state").desc("u.unitid"); } - cnd.groupBy("sqid"); sql.setCondition(cnd); diff --git a/src/main/java/io/v/nutz/activity/models/ActivitySiteInfo.java b/src/main/java/io/v/nutz/activity/models/ActivitySiteInfo.java index 976d4c5..972e4a7 100644 --- a/src/main/java/io/v/nutz/activity/models/ActivitySiteInfo.java +++ b/src/main/java/io/v/nutz/activity/models/ActivitySiteInfo.java @@ -81,4 +81,9 @@ public class ActivitySiteInfo { @Comment("限制男女，0表示不限制，1表示限制男，2表示限制女") @ColDefine(type = ColType.INT) private Integer sexLimit; + + @Column + @Comment("预约时间") + @ColDefine(type = ColType.MYSQL_JSON) + private List openWeekTime; } diff --git a/src/main/resources/static/components/activity/site/ReserveInfo.vue b/src/main/resources/static/components/activity/site/ReserveInfo.vue index e41a723..a9b500e 100644 --- a/src/main/resources/static/components/activity/site/ReserveInfo.vue +++ b/src/main/resources/static/components/activity/site/ReserveInfo.vue @@ -97,9 +97,9 @@ - +
@@ -252,4 +252,4 @@ module.exports = { .el-descriptions-item__cell { text-align: center !important; } - \ No newline at end of file + diff --git a/src/main/resources/views/mobile/activity/site/reserve.html b/src/main/resources/views/mobile/activity/site/reserve.html index f688fde..00450d8 100644 --- a/src/main/resources/views/mobile/activity/site/reserve.html +++ b/src/main/resources/views/mobile/activity/site/reserve.html @@ -204,7 +204,7 @@ layout("/mobile/platform.html"){ {{site.name}} - + >--> { // 休息日不能选择 - let week = day.date.getDay() + /*let week = day.date.getDay() if (week === 0 || week === 6) { day.type = 'disabled' - } + }*/ return day } } @@ -320,12 +320,23 @@ layout("/mobile/platform.html"){ //这里要排除掉休息日 setWeekList(startDate) { const wk = [] + let d = null + do { + d = moment(startDate).day() + if(!this.site.openWeekTime.includes(d)) { + startDate = moment(startDate).add(1, 'd') + } + } while (!this.site.openWeekTime.includes(d)) wk.push(moment(startDate)) let count = 1 while (wk.length < 7) { const addDate = moment(startDate).add(count, 'd') + const nextDay = addDate.day() //这里不是休息日才能加到数组里 - if (addDate.day() !== 0 && addDate.day() !== 6 && !this.holidays.includes(moment(addDate).format('YYYY-MM-DD'))) { + /*if (addDate.day() !== 0 && addDate.day() !== 6 && !this.holidays.includes(moment(addDate).format('YYYY-MM-DD'))) { + wk.push(addDate) + }*/ + if(this.site.openWeekTime.includes(nextDay)) { wk.push(addDate) } count++ @@ -399,12 +410,11 @@ layout("/mobile/platform.html"){ async onLoad() { this.loading = true - $.post('/mobile/activity/site/info/getDetail', {id: this.site_id}).then(res => { - if (res.code === 0) { - this.site = res.data - } - this.loading = false - }) + const resp = await $.post('/mobile/activity/site/info/getDetail', {id: this.site_id}) + if (resp.code === 0) { + this.site = resp.data + } + this.loading = false }, async getReserve() { const resp = await $.post('/mobile/activity/site/info/getReserve', { @@ -446,9 +456,9 @@ layout("/mobile/platform.html"){ async created() { this.site_id = getQueryString('id') this.selectDate = this.getLatestWorkDay() - this.setWeekList(this.selectDate) await this.getReserve() await this.onLoad() + this.setWeekList(this.selectDate) await this.getMyReservation() } @@ -457,4 +467,4 @@ layout("/mobile/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/activity/site/SiteManage.html b/src/main/resources/views/platform/activity/site/SiteManage.html index 4f22a16..d6263b4 100644 --- a/src/main/resources/views/platform/activity/site/SiteManage.html +++ b/src/main/resources/views/platform/activity/site/SiteManage.html @@ -91,13 +91,13 @@ layout("/layouts/platform.html"){ - - + -->