c-hongqw1/zhgh_hhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
JyuHsin
2025-05-14 11:45:13 +08:00
parent 29f48ebb1a
commit ee2515e1d7
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/activity/controller/site/SiteReserveController.java
+2
View File
@@ -29,6 +29,7 @@ import org.nutz.dao.Sqls;
import org.nutz.dao.entity.Record;
import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.dao.util.cri.Static;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.json.Json;
@@ -244,6 +245,7 @@ public class SiteReserveController {
if (StrUtil.isNotBlank(siteType)) {
cnd.and("typeId", "=", siteType);
}
cnd.and(new Static(" 1=1 order by field(asi.reserveTarget, 2, 1, 3)"));
sql.setCondition(cnd);
return siteInfoService.list(sql);
}
src/main/java/io/v/nutz/mobile/activity/site/SiteInfoMobileController.java
+1 -1
View File
@@ -110,7 +110,7 @@ public class SiteInfoMobileController {
if (StrUtil.isNotBlank(typeId)) {
cnd.andEX("info.typeId", "=", typeId);
}
cnd.groupBy("info.id");
cnd.and(new Static(" 1=1 group by info.id order by field(info.reserveTarget, 2, 1, 3)"));
sql.setCondition(cnd);
src/main/resources/views/mobile/activity/site/info.html
+4 -4
View File
@@ -243,9 +243,9 @@ layout("/mobile/platform.html"){
</div>
<div>
<span>面向对象：</span>
<span v-if="o.reservetarget == 1">面向分工会</span>
<span v-if="o.reservetarget == 2">面向个人</span>
<span v-if="o.reservetarget == 3">面向集体</span>
<span v-if="o.reservetarget == 1">分工会</span>
<span v-if="o.reservetarget == 2">个人</span>
<span v-if="o.reservetarget == 3">集体</span>
</div>
<div>
<span>场地介绍：</span>
@@ -291,7 +291,7 @@ layout("/mobile/platform.html"){
this.show = true
},
openView(o) {
if(o.reservetarget === 1 && "${@shiro.hasRole('H04')}" === 'false' && "${@shiro.hasRole('sysadmin')}" === 'false') {
if(o.reservetarget === 1 && "${@shiro.hasRole('gh01')}" === 'false' && "${@shiro.hasRole('sysadmin')}" === 'false') {
vant.Toast('该场地只能分工会主席预约')
return
}
src/main/resources/views/platform/activity/site/SiteReserve.html
+4 -4
View File
@@ -134,9 +134,9 @@ layout("/layouts/platform.html"){
</div>
<div class="text e-item">
<span style="color: gray">面向对象：</span>
<span v-if="item.reservetarget == 1">面向分工会</span>
<span v-if="item.reservetarget == 2">面向个人</span>
<span v-if="item.reservetarget == 3">面向集体</span>
<span v-if="item.reservetarget == 1">分工会</span>
<span v-if="item.reservetarget == 2">个人</span>
<span v-if="item.reservetarget == 3">集体</span>
</div>
<div class="text e-item">
<span style="color: gray">场地介绍：</span>
@@ -506,7 +506,7 @@ layout("/layouts/platform.html"){
this.formData.end_time = ''
},
onReserve(data) {
if(data.reservetarget === 1 && "${@shiro.hasRole('H04')}" === 'false' && "${@shiro.hasRole('sysadmin')}" === 'false') {
if(data.reservetarget === 1 && "${@shiro.hasRole('gh01')}" === 'false' && "${@shiro.hasRole('sysadmin')}" === 'false') {
this.$message.warning('该场地只能分工会主席预约')
return
}