From d828525b30fd9e0984a838596bcdbcf1f9c54f86 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Fri, 30 May 2025 14:42:07 +0800 Subject: [PATCH] commit --- ...RecuperationLineUnionSelectController.java | 12 ++-- .../model/TheRapyRecuperationEnroll.java | 2 +- .../TheRapyRecuperationEnrollServiceImpl.java | 3 +- ...ecuperationLineUnionSelectServiceImpl.java | 30 ++++++-- .../baseManage/baseManagement.html | 2 +- .../theRapyRecuperation/basicManage/line.html | 70 +++++++++---------- .../process/lineUnionSelect.html | 45 ++++++++---- 7 files changed, 103 insertions(+), 61 deletions(-) diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineUnionSelectController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineUnionSelectController.java index 65f00e5..a880e73 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineUnionSelectController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationLineUnionSelectController.java @@ -13,10 +13,7 @@ import io.v.nutz.sys.models.Sys_user; import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.zhgh.activity.models.ActivityUserScope; import io.v.nutz.zhgh.therapyRecuperation.constant.TheRapyRecuperationSignUpMode; -import io.v.nutz.zhgh.therapyRecuperation.model.TheRapyRecuperationConfig; -import io.v.nutz.zhgh.therapyRecuperation.model.TheRapyRecuperationLineUnionSelect; -import io.v.nutz.zhgh.therapyRecuperation.model.TheRapyRecuperationLot; -import io.v.nutz.zhgh.therapyRecuperation.model.TheRapyRecuperationTravelAgency; +import io.v.nutz.zhgh.therapyRecuperation.model.*; import io.v.nutz.zhgh.therapyRecuperation.service.TheRapyRecuperationLineUnionSelectService; import io.v.nutz.web.commons.slog.annotation.SLog; import lombok.extern.slf4j.Slf4j; @@ -256,6 +253,13 @@ public class TheRapyRecuperationLineUnionSelectController { } } + @At + @POST + @RequiresPermissions(value = {"theRapyRecuperation.lineFghSelect", "theRapyRecuperation.lineXghSelect", "theRapyRecuperation.linePersonalSelect"}, logical = Logical.OR) + public Object selectLineData(@Param("lineId") String lineId) { + return Result.success(dao.fetch(TheRapyRecuperationLine.class, lineId)); + } + /** * 查询某个分工会设置的线路时间信息 * diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationEnroll.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationEnroll.java index cffd410..8ebb33b 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationEnroll.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationEnroll.java @@ -219,7 +219,7 @@ public class TheRapyRecuperationEnroll extends BaseModel { private Boolean hasLocked; @Column - @ColDefine(type = ColType.INT) + @ColDefine(type = ColType.DOUBLE) @Comment("报酒店时选择的出行天数") private Double playDay; diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java index c71bf5b..6733c4f 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java @@ -689,7 +689,8 @@ public class TheRapyRecuperationEnrollServiceImpl extends ViServiceImpl + + + + + + + + @@ -299,16 +307,12 @@ layout("/layouts/platform.html"){ - - - + + + - + - - - - - - - - + + + + + + + + @@ -551,15 +555,11 @@ layout("/layouts/platform.html"){ lineName: [{required: true, message: '请输入线路名称', trigger: ['change', 'blur']}], travelAgencyId: [{required: true, message: '请选择旅行社', trigger: ['change', 'blur']}], regionalNature: [{required: true, message: '请选择区域性质', trigger: ['change', 'blur']}], - minimumGroupSize: [{required: true, message: '请输入最少参与教工', trigger: ['change', 'blur']}], + minimumGroupSize: [{required: true, message: '请输入最少成团人数', trigger: ['change', 'blur']}], year: [{required: true, message: '请选择年度', trigger: ['change', 'blur']}], playNumberOfDays: [{required: true, message: '请输入游玩天数', trigger: ['change', 'blur']}], //content: [{required: true, message: '请输入线路内容', trigger: ['change', 'blur']}], - signUpStartTime: [{ - required: true, - message: '请选择报名开始时间', - trigger: ['change', 'blur'] - }], + signUpStartTime: [{required: true, message: '请选择报名开始时间', trigger: ['change', 'blur']}], signUpEndTime: [{required: true, validator: validateSignUpEndTime, trigger: ['change', 'blur']}], changeEndTime: [{required: true, validator: validateChangeEndTime, trigger: ['change', 'blur']}], //files: [{required: true, message: '请上传移动端缩略图', trigger: ['change', 'blur']}], @@ -569,15 +569,11 @@ layout("/layouts/platform.html"){ playEndTime: [{required: true, validator: validatePlayEndTime, trigger: ['change', 'blur']}], trafficTools: [{required: false, message: '请输入交通工具', trigger: ['change', 'blur']}], estimatedCost: [{required: false, message: '请输入预计费用', trigger: ['change', 'blur']}], - estimatedFamilyNumbers: [{ - required: false, - message: '请输入成团人数包括家属', - trigger: ['change', 'blur'] - }], + estimatedFamilyNumbers: [{required: false, message: '请输入成团人数包括家属', trigger: ['change', 'blur']}], lotId: [{required: true, message: '请选择标段时间', trigger: ['change', 'blur']}], openChoose: [{required: true, message: '请选择开放选择', trigger: ['change', 'blur']}], - travelAgencyPlace: [{required: true, message: '请选择开放选择', trigger: ['change', 'blur']}], - + travelAgencyPlace: [{required: true, message: '请选择旅行社地点', trigger: ['change', 'blur']}], + groupType: [{required: true, message: '请选择成团类型', trigger: ['change', 'blur']}], }, viewData: {}, regionalNatureList: [], @@ -591,7 +587,7 @@ layout("/layouts/platform.html"){ travelAgencyId: null, travelAgencyPlace: null, regionalNature: null, - minimumGroupSize: 1, + minimumGroupSize: null, year: null, isDisabled: false, playNumberOfDays: 1, @@ -611,6 +607,7 @@ layout("/layouts/platform.html"){ lineContact: null, lineContactPhone: null, openChoose: false, + groupType: null, }, pageForm: { keywords: null, @@ -635,6 +632,11 @@ layout("/layouts/platform.html"){ } }, methods: { + groupTypeChange(val) { + if (this.config) { + this.formData.minimumGroupSize = val === 1 ? this.config.conventionalCount : this.config.boutiqueCount + } + }, isShow(roles) { if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')}" === 'true') { return true @@ -664,9 +666,6 @@ layout("/layouts/platform.html"){ if (createMode === 1) { this.formData.signUpMode = 1 } - if (this.config) { - this.formData.minimumGroupSize = this.config.groupNumber - } await this.getNumber() }, async openEdit(id) { @@ -749,6 +748,7 @@ layout("/layouts/platform.html"){ async initPageData() { this.regionalNatureList = await getEnumOptions('TheRapyRecuperationProvinceType') this.signUpModeList = await getEnumOptions('TheRapyRecuperationSignUpMode') + this.signUpModeList = this.signUpModeList.filter(o => o.value !== 1) this.createModeList = await getEnumOptions('TheRapyRecuperationLineCreateMode') this.unionOptions = await getUnions(null) await this.getLotList() diff --git a/src/main/resources/views/platform/theRapyRecuperation/process/lineUnionSelect.html b/src/main/resources/views/platform/theRapyRecuperation/process/lineUnionSelect.html index 6fe9ab9..b5e4e31 100644 --- a/src/main/resources/views/platform/theRapyRecuperation/process/lineUnionSelect.html +++ b/src/main/resources/views/platform/theRapyRecuperation/process/lineUnionSelect.html @@ -270,7 +270,7 @@ layout("/layouts/platform.html"){ - +