diff --git a/src/main/java/io/v/nutz/wakershome/controller/data/WakesHomeDataRevelController.java b/src/main/java/io/v/nutz/wakershome/controller/data/WakesHomeDataRevelController.java index 42f9674..47ef943 100644 --- a/src/main/java/io/v/nutz/wakershome/controller/data/WakesHomeDataRevelController.java +++ b/src/main/java/io/v/nutz/wakershome/controller/data/WakesHomeDataRevelController.java @@ -6,6 +6,7 @@ import cn.wizzer.framework.page.Pagination; import io.v.nutz.annontation.ViReturn; import io.v.nutz.base.result.Result; import io.v.nutz.base.utils.Roles; +import io.v.nutz.base.utils.Vi; import io.v.nutz.modules.models.PageForm; import io.v.nutz.sys.models.Sys_file; import io.v.nutz.sys.models.Sys_user_role; @@ -92,11 +93,11 @@ public class WakesHomeDataRevelController { Cnd cnd = Cnd.NEW(); if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { - List data = dao.query(Sys_user_role.class, Cnd.where("userId", "=", ShiroUtil.getUserId()).and("roleId", "=", Roles.UNION_MANGER)); - List unionIds = data.stream().map(Sys_user_role::getUnionid).distinct().collect(Collectors.toList()); - cnd.and("un.id", "in", unionIds); + /* List data = dao.query(Sys_user_role.class, Cnd.where("userId", "=", ShiroUtil.getUserId()).and("roleId", "=", Roles.UNION_MANGER)); + List unionIds = data.stream().map(Sys_user_role::getUnionid).distinct().collect(Collectors.toList());*/ + cnd.and("un.id", "=", Vi.getUnionId()); } - cnd.and("un.isEnable","=",true); +// cnd.and("un.isEnable","=",true); cnd.asc("un.unioncode"); sql.setCondition(cnd); nutMap.setv("child", wakesHomeInfoService.listMap(sql)); diff --git a/src/main/java/io/v/nutz/wakershome/mobile/MWakesHomeReviewController.java b/src/main/java/io/v/nutz/wakershome/mobile/MWakesHomeReviewController.java index 5a1874a..4b22f69 100644 --- a/src/main/java/io/v/nutz/wakershome/mobile/MWakesHomeReviewController.java +++ b/src/main/java/io/v/nutz/wakershome/mobile/MWakesHomeReviewController.java @@ -146,10 +146,11 @@ public class MWakesHomeReviewController { @At + @ViReturn @Aop(TransAop.READ_COMMITTED) public Object doSubmit(WakesHomeVo wakesHomeVo) { try { - User user = baseService.dao().fetch(User.class, Cnd.where("id", "=", ShiroUtil.getUser())); + User user = baseService.dao().fetch(User.class, Cnd.where("id", "=", ShiroUtil.getUserId())); CommentPeo peo = new CommentPeo(); if (Strings.isNotBlank(wakesHomeVo.getEvaluatedPersonId())) { peo.setEvaluatedPersonId(wakesHomeVo.getEvaluatedPersonId()); @@ -181,7 +182,7 @@ public class MWakesHomeReviewController { return Result.success(); } catch (Exception e) { e.printStackTrace(); - return Result.error(); + throw new RuntimeException(); } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index debd0cf..8a34afa 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,17 +1,17 @@ nutz.application.name=union_hhu -server.port=8080 +server.port=8081 server.host=0.0.0.0 jetty.contextPath=/ jetty.threadpool.idleTimeout=100000 jetty.threadpool.minThreads=10 -jetty.threadpool.maxThreads=20000 +jetty.threadpool.maxThreads=20000 jetty.page.403=/error/403.htmla jetty.page.404=/error/404.html jetty.page.500=/error/500.html #结合ftp使用,或用nginx代理ftp路径 jetty.staticPath=D://files #开发模式静态资源 -jetty.staticPathLocal=E:/project/UNION_HHU/src/main/resources/static +jetty.staticPathLocal= nutz.mvc.ignore=^(.+[.])(jsp|png|gif|jpg|js|css|jpeg|html|mp3|mp4|ico|svg)$ nutz.mvc.exclusions=/favicon/*,/assets/*,/druid/*,/upload/* ftp.enabled=true @@ -86,7 +86,7 @@ shiro.url.login=/platform shiro.url.logout_redirect=/platform shiro.url.unauth=/platform #开发时设置本地路径,便于调试 -beetl.RESOURCE.rootLocal=E:/project/UNION_HHU/src/main/resources/views/ +beetl.RESOURCE.rootLocal= beetl.RESOURCE.root=views/ beetl.DELIMITER_STATEMENT_START= diff --git a/src/main/resources/static/components/mobile/wmhd/info.vue b/src/main/resources/static/components/mobile/wmhd/info.vue index 6c41fde..8ac4a2d 100644 --- a/src/main/resources/static/components/mobile/wmhd/info.vue +++ b/src/main/resources/static/components/mobile/wmhd/info.vue @@ -10,8 +10,8 @@ - - + +
@@ -19,88 +19,143 @@
- - + + - - + + rows="2" type="textarea" show-word-limit autosize> - - + + + + + + + + @@ -145,12 +200,30 @@ module.exports = { 'vant-file-upload': httpVueLoader('/components/plugins/VantFileUpload.vue') }, methods: { + viewFile(docList) { + if (docList && docList.length > 0) { + let pdfStreamUrl = encodeURIComponent(FILE_STREAM_PREVIEW_ADDRESS + '?id=' + docList[0].id) //将路径转码 + window.open('/assets/platform/plugins/pdfJs/web/viewer.html?file=' + pdfStreamUrl, docList[0].filename) + } else { + this.$modal.msg('没有可查阅的文件') + } + }, async getInfo(id) { + const toast = vant.Toast.loading({ + duration: 0, + forbidClick: true, + overlay: true, + message: '数据查询中...', + }) const {data, code, msg} = await $.get("/platform/hd/wmhd/findOneById", {id}) - const refs = await $.get("/mobile/wmhd/list/findOne", {id}) + const refs = await $.get("/platform/hd/wmhd/findxxById", {id}) if (refs) { - this.viewData = refs[0] + this.viewData = refs.data + this.videoList = [] + this.img2List = [] + this.docList = [] + this.audioList = [] data.forEach(val => { val.fjname = val.filename val.fjurl = val.filepath @@ -172,6 +245,7 @@ module.exports = { this.viewData = {} this.$toast.fail('获取信息失败'); } + toast.clear() }, }, async created() { @@ -193,4 +267,4 @@ module.exports = { } - \ No newline at end of file + diff --git a/src/main/resources/static/components/wakeshome/info/WakesHomeInfo.vue b/src/main/resources/static/components/wakeshome/info/WakesHomeInfo.vue index 42799b1..98cd8fe 100644 --- a/src/main/resources/static/components/wakeshome/info/WakesHomeInfo.vue +++ b/src/main/resources/static/components/wakeshome/info/WakesHomeInfo.vue @@ -96,7 +96,7 @@ {{ schoolAudit.auditOpinion }} - + diff --git a/src/main/resources/static/components/wakeshome/review/UnionCommentZb.vue b/src/main/resources/static/components/wakeshome/review/UnionCommentZb.vue index adc638b..fef300d 100644 --- a/src/main/resources/static/components/wakeshome/review/UnionCommentZb.vue +++ b/src/main/resources/static/components/wakeshome/review/UnionCommentZb.vue @@ -182,10 +182,10 @@ - + diff --git a/src/main/resources/views/platform/hd/wmhd/zpMange.html b/src/main/resources/views/platform/hd/wmhd/zpMange.html index 8bebb6e..664e57a 100644 --- a/src/main/resources/views/platform/hd/wmhd/zpMange.html +++ b/src/main/resources/views/platform/hd/wmhd/zpMange.html @@ -265,12 +265,12 @@ layout("/layouts/platform.html"){ - - + -->