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-15 14:48:19 +08:00
parent 2980cc91d0
commit 50b072b1e5
5 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/activity/controller/site/SiteManageController.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class SiteManageController {
if (Strings.isNotBlank(pageOrderName) && Strings.isNotBlank(pageOrderName)) { if (Strings.isNotBlank(pageOrderName) && Strings.isNotBlank(pageOrderName)) {
cnd.orderBy(pageOrderName, PageUtil.getOrder(pageOrderBy)); cnd.orderBy(pageOrderName, PageUtil.getOrder(pageOrderBy));
} else { } else {
cnd.desc("create_time"); cnd.asc("sortNum");
} }
return siteInfoService.listPage(pageNumber, pageSize, cnd); return siteInfoService.listPage(pageNumber, pageSize, cnd);
src/main/java/io/v/nutz/activity/controller/site/SiteReserveController.java
+1 -1
View File
@@ -245,7 +245,7 @@ public class SiteReserveController {
if (StrUtil.isNotBlank(siteType)) { if (StrUtil.isNotBlank(siteType)) {
cnd.and("typeId", "=", siteType); cnd.and("typeId", "=", siteType);
} }
cnd.and(new Static(" 1=1 order by left(address, 5) desc, field(asi.reserveTarget, 2, 1, 3)")); cnd.asc("asi.sortNum");
sql.setCondition(cnd); sql.setCondition(cnd);
return siteInfoService.list(sql); return siteInfoService.list(sql);
} }
src/main/java/io/v/nutz/activity/models/ActivitySiteInfo.java
+5
View File
@@ -92,4 +92,9 @@ public class ActivitySiteInfo {
@Comment("面向预约对象(1.面向分工会，2.面向个人，3.面向集体)") @Comment("面向预约对象(1.面向分工会，2.面向个人，3.面向集体)")
@ColDefine(type = ColType.INT) @ColDefine(type = ColType.INT)
private Integer reserveTarget; private Integer reserveTarget;
@Column
@Comment("排序编号")
@ColDefine(type = ColType.INT)
private Integer sortNum;
} }
src/main/java/io/v/nutz/mobile/activity/site/SiteInfoMobileController.java
+2 -2
View File
@@ -110,8 +110,8 @@ public class SiteInfoMobileController {
if (StrUtil.isNotBlank(typeId)) { if (StrUtil.isNotBlank(typeId)) {
cnd.andEX("info.typeId", "=", typeId); cnd.andEX("info.typeId", "=", typeId);
} }
cnd.and(new Static(" 1=1 group by info.id order by left(address, 5) desc, field(info.reserveTarget, 2, 1, 3)")); cnd.asc("info.sortNum");
cnd.groupBy("info.id");
sql.setCondition(cnd); sql.setCondition(cnd);
Pagination pagination = siteInfoService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), sql); Pagination pagination = siteInfoService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
src/main/resources/views/platform/activity/site/SiteManage.html
+24 -16
View File
@@ -48,6 +48,8 @@ layout("/layouts/platform.html"){
</el-table-column> </el-table-column>
<el-table-column align="center" show-overflow-tooltip header-align="center" label="场地名称" <el-table-column align="center" show-overflow-tooltip header-align="center" label="场地名称"
prop="name"></el-table-column> prop="name"></el-table-column>
<el-table-column align="center" show-overflow-tooltip header-align="center" label="排序编号"
prop="sortNum"></el-table-column>
<el-table-column align="center" show-overflow-tooltip header-align="center" label="场地地址" <el-table-column align="center" show-overflow-tooltip header-align="center" label="场地地址"
prop="address"></el-table-column> prop="address"></el-table-column>
<el-table-column align="center" show-overflow-tooltip header-align="center" label="联系人" <el-table-column align="center" show-overflow-tooltip header-align="center" label="联系人"
@@ -144,28 +146,34 @@ layout("/layouts/platform.html"){
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="sexLimit" label="性别限制"> <el-row :gutter="20">
<el-radio-group v-model="formData.sexLimit" size="medium"> <el-col :span="12">
<el-radio-button :label="0">不限制</el-radio-button> <el-form-item prop="sexLimit" label="性别限制">
<el-radio-button :label="1">男</el-radio-button> <el-radio-group v-model="formData.sexLimit" size="medium">
<el-radio-button :label="2">女</el-radio-button> <el-radio-button :label="0">不限制</el-radio-button>
</el-radio-group> <el-radio-button :label="1">男</el-radio-button>
</el-form-item> <el-radio-button :label="2">女</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="state" label="开启状态">
<el-radio-group v-model="formData.state" size="medium">
<el-radio-button :label="true">开启</el-radio-button>
<el-radio-button :label="false">禁用</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="state" label="开启状态"> <el-form-item prop="sortNum" label="排序编号">
<el-radio-group v-model="formData.state" size="medium"> <el-input v-model="formData.sortNum" placeholder="请输入排序编号" type="number"></el-input>
<el-radio-button :label="true">开启</el-radio-button>
<el-radio-button :label="false">禁用</el-radio-button>
</el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20">
</el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="容纳人数" prop="maxNum"> <el-form-item label="容纳人数" prop="maxNum">