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

更改

Browse Source
This commit is contained in:
JyuHsin
2025-06-09 17:33:20 +08:00
parent 8e7c0c88a4
commit 075aacde0f
3 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java
+3
View File
@@ -793,10 +793,13 @@ public class TheRapyRecuperationEnrollServiceImpl extends ViServiceImpl<TheRapyR
TheRapyRecuperationTravelAgency currentTravelAgency = dao().fetch(TheRapyRecuperationTravelAgency.class, currentManagement.getTravelAgencyId()); TheRapyRecuperationTravelAgency currentTravelAgency = dao().fetch(TheRapyRecuperationTravelAgency.class, currentManagement.getTravelAgencyId());
TheRapyRecuperationBaseManagement lastManagement = dao().fetch(TheRapyRecuperationBaseManagement.class, lastEnroll.getTakePartInBaseManagementId()); TheRapyRecuperationBaseManagement lastManagement = dao().fetch(TheRapyRecuperationBaseManagement.class, lastEnroll.getTakePartInBaseManagementId());
if(lastManagement != null) {
TheRapyRecuperationTravelAgency lastTravelAgency = dao().fetch(TheRapyRecuperationTravelAgency.class, lastManagement.getTravelAgencyId()); TheRapyRecuperationTravelAgency lastTravelAgency = dao().fetch(TheRapyRecuperationTravelAgency.class, lastManagement.getTravelAgencyId());
if (!Objects.equals(currentTravelAgency.getId(), lastTravelAgency.getId())) { if (!Objects.equals(currentTravelAgency.getId(), lastTravelAgency.getId())) {
return Map.of(false, "当前报名酒店的旅行社与上次出行不一致"); return Map.of(false, "当前报名酒店的旅行社与上次出行不一致");
} }
}
//如果是一个，再判断天数 //如果是一个，再判断天数
if (currentEnroll.getPlayDay() != null) { if (currentEnroll.getPlayDay() != null) {
if ((currentEnroll.getPlayDay() + lastEnroll.getPlayDay()) != 5) { if ((currentEnroll.getPlayDay() + lastEnroll.getPlayDay()) != 5) {
src/main/resources/views/mobile/therapyRecuperation/baseManagement.html
+5 -8
View File
@@ -307,14 +307,11 @@ layout("/mobile/platform.html"){
</van-button> </van-button>
</div> </div>
<div class="footer" v-else> <div class="footer" v-else>
<template v-if="baseData.isNormal == 0 && baseData.isNormalFalse > 0"> <van-button v-if="moment().unix() >= moment(configData.fragmentStartTime).unix() && moment().unix() <= moment(configData.fragmentEndTime).unix()" @click="join"
<van-button @click="join" class="join">我要报名</van-button> class="join">{{ enrollId ? '修改报名' : '我要报名' }}
</template> </van-button>
<template v-else> <van-button v-if="moment().unix() > moment(configData.fragmentEndTime).unix()" class="join">报名结束
<van-button v-if="moment().unix() >= moment(configData.fragmentStartTime).unix() && moment().unix() <= moment(configData.fragmentEndTime).unix()" </van-button>
@click="join" class="join">我要报名</van-button>
<van-button v-if="moment().unix() > moment(configData.fragmentEndTime).unix()" class="join">报名结束</van-button>
</template>
</div> </div>
<!--报名弹出框--> <!--报名弹出框-->
src/main/resources/views/mobile/therapyRecuperation/lineInfo.html
+2 -8
View File
@@ -316,17 +316,11 @@ layout("/mobile/platform.html"){
<!--底部报名按钮--> <!--底部报名按钮-->
<div class="footer" v-if="fromUrlByMy != 'edit'"> <div class="footer" v-if="fromUrlByMy != 'edit'">
<template v-if="lineData.isNormal == 0 && lineData.isNormalFalse > 0"> <van-button v-if="moment().unix() >= moment(configData.implodeStartTime).unix() && moment().unix() <= moment(configData.implodeEndTime).unix()" @click="join"
<van-button @click="join" class="join">我要报名</van-button> class="join">{{ enrollId ? '修改报名' : '我要报名' }}
</template>
<template v-else>
<van-button v-if="moment().unix() >= moment(configData.implodeStartTime).unix() && moment().unix() <= moment(configData.implodeEndTime).unix()"
@click="join"
class="join">我要报名
</van-button> </van-button>
<van-button v-if="moment().unix() > moment(configData.implodeEndTime).unix()" class="join">报名结束 <van-button v-if="moment().unix() > moment(configData.implodeEndTime).unix()" class="join">报名结束
</van-button> </van-button>
</template>
</div> </div>
</template> </template>