From 875a84cfb25eff04bec773fa8207eaa7801d8cbc Mon Sep 17 00:00:00 2001 From: zhaoxinyu Date: Mon, 23 Sep 2024 16:41:19 +0800 Subject: [PATCH] server_commit --- .../controller/pc/MeetingManageController.java | 10 +++++----- src/main/resources/views/layouts/platform.html | 8 +++++++- src/main/resources/views/mobile/home.html | 6 +++--- src/main/resources/views/mobile/newHome.html | 4 ++-- src/main/resources/views/mobile/platform.html | 8 +++++++- .../platform/wakeshome/review/statistics.html | 16 +++++++--------- 6 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/main/java/io/v/nutz/meeting/controller/pc/MeetingManageController.java b/src/main/java/io/v/nutz/meeting/controller/pc/MeetingManageController.java index f52c677..c2b17f8 100644 --- a/src/main/java/io/v/nutz/meeting/controller/pc/MeetingManageController.java +++ b/src/main/java/io/v/nutz/meeting/controller/pc/MeetingManageController.java @@ -188,7 +188,8 @@ public class MeetingManageController { Sql sql = Sqls.create(""" SELECT u.username, - u.loginname + u.loginname, + u.mobile FROM `meeting_user` mu LEFT JOIN USER u ON mu.userid = u.id @@ -198,7 +199,7 @@ public class MeetingManageController { cnd.and("mu.meetingId", "=", id); sql.setCondition(cnd); List list = meetingManageService.listMap(sql); - List loginnameList = list.stream().map(o -> o.getString("loginname")).collect(Collectors.toList()); + List sendUserList = list.stream().map(o -> o.getString("mobile")).collect(Collectors.toList()); //生成短链 String shortUrl; @@ -214,15 +215,14 @@ public class MeetingManageController { } else { content += "，"; } - content += "请点击" + Globals.AppDomain + shortUrl + "，确认是否参加。"; - System.out.println(content); + content += "请点击" + Globals.AppDomain + "/s/" + shortUrl + "，确认是否参加。"; ShortUrl sUrl = new ShortUrl(); sUrl.setShortUrl(shortUrl); sUrl.setRealUrl("/mobile/meeting/notify?meetingId=" + id); dao.insert(sUrl); - msgNotifyService.sendMsg(List.of("msg"), loginnameList, content); + msgNotifyService.sendMsg(List.of("msg"), sendUserList, content); return null; } diff --git a/src/main/resources/views/layouts/platform.html b/src/main/resources/views/layouts/platform.html index ce7eca8..1202590 100644 --- a/src/main/resources/views/layouts/platform.html +++ b/src/main/resources/views/layouts/platform.html @@ -24,6 +24,12 @@ + + @@ -70,7 +76,7 @@ + src="https://webapi.amap.com/maps?v=1.4.15&key=57f0d098ba1b881ecc436c4cfd23bbbf&plugin=AMap.PolyEditor,AMap.PlaceSearch"> diff --git a/src/main/resources/views/mobile/home.html b/src/main/resources/views/mobile/home.html index 9f62c4e..102b4cf 100644 --- a/src/main/resources/views/mobile/home.html +++ b/src/main/resources/views/mobile/home.html @@ -346,8 +346,8 @@ layout("/mobile/platform.html"){
-
-
+
+
diff --git a/src/main/resources/views/mobile/newHome.html b/src/main/resources/views/mobile/newHome.html index b357bb9..9f60bb6 100644 --- a/src/main/resources/views/mobile/newHome.html +++ b/src/main/resources/views/mobile/newHome.html @@ -115,13 +115,13 @@ layout("/mobile/platform.html"){ { src: '/assets/platform/img/quickentry/db.png', text: '大病互助', - isOpen: true, + isOpen: false, backGroundColor: '#dd5858' }, { src: '/assets/platform/img/quickentry/jy.png', text: '建言献策', - isOpen: true, + isOpen: false, backGroundColor: '#2fbabf' } ] diff --git a/src/main/resources/views/mobile/platform.html b/src/main/resources/views/mobile/platform.html index b1cb5b0..48a13f0 100644 --- a/src/main/resources/views/mobile/platform.html +++ b/src/main/resources/views/mobile/platform.html @@ -14,6 +14,12 @@ + + @@ -46,7 +52,7 @@ + src="https://webapi.amap.com/maps?v=2.0&key=57f0d098ba1b881ecc436c4cfd23bbbf&plugin=AMap.PolyEditor,AMap.Geolocation"> diff --git a/src/main/resources/views/platform/wakeshome/review/statistics.html b/src/main/resources/views/platform/wakeshome/review/statistics.html index 814df94..d07d272 100644 --- a/src/main/resources/views/platform/wakeshome/review/statistics.html +++ b/src/main/resources/views/platform/wakeshome/review/statistics.html @@ -329,22 +329,20 @@ layout("/layouts/platform.html"){ window.open(loc() + '/doDownLoadZipByUnionId?zbId=' + this.pageForm.zbId + '&unionId=' + row.id) } }, - downloadFilesByUnion(row) { - const result = this.validateHasFiles({unionId: row.id, zbId: this.pageForm.zbId}) - if (!result) { - return + async downloadFilesByUnion(row) { + const result = await this.validateHasFiles({unionId: row.id, zbId: this.pageForm.zbId}) + if (result) { + window.open(loc() + '/exportFilesByUnionId?zbId=' + this.pageForm.zbId + '&unionId=' + row.id) } - window.open(loc() + '/exportFilesByUnionId?zbId=' + this.pageForm.zbId + '&unionId=' + row.id) }, downloadByPeoId(row) { window.open(loc() + '/exportByPeoId?peoId=' + row.id) }, async downloadFilesByPeoId(row) { - const result = this.validateHasFiles({peoId: row.id}) - if (!result) { - return + const result = await this.validateHasFiles({peoId: row.id}) + if (result) { + window.open(loc() + '/exportFilesByPeoId?peoId=' + row.id) } - window.open(loc() + '/exportFilesByPeoId?peoId=' + row.id) }, async validateHasFiles(data) { const res = await $.post('/platform/wakeshome/review/statistics/validateHasFiles', {