From 3180d0cb9554f5f9ebb71f84e75533c48ba97123 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Fri, 30 May 2025 11:06:16 +0800 Subject: [PATCH] commit --- ...RapyRecuperationBaseManagerController.java | 25 +- .../TheRapyRecuperationEnrollController.java | 14 +- .../TheRapyRecuperationBaseManagement.java | 5 + .../model/TheRapyRecuperationConfig.java | 47 ++++ .../model/TheRapyRecuperationEnroll.java | 5 + .../TheRapyRecuperationEnrollServiceImpl.java | 187 ++++++------- src/main/resources/views/mobile/platform.html | 2 +- .../therapyRecuperation/baseManagement.html | 246 ++++++------------ .../mobile/therapyRecuperation/lineInfo.html | 23 +- .../mobile/therapyRecuperation/lineList.html | 2 +- .../therapyRecuperation/myRecuperation.html | 23 +- .../baseManage/baseManagement.html | 51 ++-- .../theRapyConfig/TheRapyConfig.html | 153 +++++++---- 13 files changed, 387 insertions(+), 396 deletions(-) diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/baseManage/TheRapyRecuperationBaseManagerController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/baseManage/TheRapyRecuperationBaseManagerController.java index 3df3048..118f3ea 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/baseManage/TheRapyRecuperationBaseManagerController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/baseManage/TheRapyRecuperationBaseManagerController.java @@ -21,10 +21,7 @@ import io.v.nutz.base.utils.ViTool; import io.v.nutz.sys.models.SysHoliday; import io.v.nutz.sys.models.User; import io.v.nutz.web.commons.utils.ShiroUtil; -import io.v.nutz.zhgh.therapyRecuperation.model.TheRapyRecuperationBaseManagement; -import io.v.nutz.zhgh.therapyRecuperation.model.TheRapyRecuperationEnroll; -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.baseManage.TheRapyRecuperationBaseManagerService; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.Logical; @@ -286,9 +283,11 @@ public class TheRapyRecuperationBaseManagerController { if (StrUtil.isBlank(id)) { return Result.error("参数错误"); } + + TheRapyRecuperationConfig config = dao.fetch(TheRapyRecuperationConfig.class, Cnd.NEW()); //获取线路对应的标段 TheRapyRecuperationBaseManagement management = dao.fetch(TheRapyRecuperationBaseManagement.class, id); - TheRapyRecuperationLot lot = dao.fetch(TheRapyRecuperationLot.class, management.getLotId()); + //TheRapyRecuperationLot lot = dao.fetch(TheRapyRecuperationLot.class, management.getLotId()); //获取当年的节假日 List holidayList = dao.query(SysHoliday.class, Cnd.where("year(day)", "=", DateUtil.thisYear()).asc("day")); @@ -307,8 +306,8 @@ public class TheRapyRecuperationBaseManagerController { // 解析日期 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - LocalDate startDate = LocalDate.parse(DateUtil.formatDate(management.getActivityStartTime()), formatter); - LocalDate endDate = LocalDate.parse(DateUtil.formatDate(management.getActivityEndTime()), formatter); + LocalDate startDate = LocalDate.parse(DateUtil.formatDate(config.getFragmentPlayStartTime()), formatter); + LocalDate endDate = LocalDate.parse(DateUtil.formatDate(config.getFragmentPlayEndTime()), formatter); //现在的日期 LocalDate now = LocalDate.parse(DateUtil.today(), formatter); @@ -324,10 +323,10 @@ public class TheRapyRecuperationBaseManagerController { while (!currentDate.isAfter(endDate)) { // 检查是否为节假日 String currentDateString = currentDate.format(formatter); - if (holidays.contains(currentDateString) && lot.getFilterHolidays()) { + /*if (holidays.contains(currentDateString) && lot.getFilterHolidays()) { currentDate = currentDate.plusDays(1); continue; - } + }*/ // 检查是否为需要排除的周几 int dayOfWeek = currentDate.getDayOfWeek().getValue() % 7; // 1是周一，7是周日 if (Lang.isNotEmpty(weeks) && !weeks.contains(dayOfWeek)) { @@ -341,12 +340,12 @@ public class TheRapyRecuperationBaseManagerController { Sql schoolTimeSql = Sqls.create("select schoolTime from sys_user where id=@id").setParam("id", ShiroUtil.getPlatformUid()); String schoolTime = (String) Daos.query(dao, schoolTimeSql.toString(), Sqls.callback.str()); - String minDate = DateUtil.formatDate(management.getActivityStartTime()); + String minDate = DateUtil.formatDate(config.getFragmentPlayStartTime()); //如果入职日期在活动开始时间之后的 try { if (StrUtil.isNotBlank(schoolTime) && String.valueOf(DateUtil.thisYear() - 1).equals(DateUtil.format(DateUtil.parse(schoolTime), "yyyy")) - && DateUtil.compare(DateUtil.parse(schoolTime), management.getActivityStartTime(), "MM") > 0) { + && DateUtil.compare(DateUtil.parse(schoolTime), config.getFragmentPlayStartTime(), "MM") > 0) { minDate = DateUtil.format(DateUtil.offset(DateUtil.parse(schoolTime), DateField.YEAR, 1), "yyyy-MM-dd"); } } catch (Exception e) { @@ -355,9 +354,9 @@ public class TheRapyRecuperationBaseManagerController { return Map.of("days", resultDates, "holidays", holidays, - "lotValue", lot.getLotValue(), + "lotValue", 0, "minDate", minDate, - "maxDate", DateUtil.formatDate(management.getActivityEndTime())); + "maxDate", DateUtil.formatDate(config.getFragmentPlayEndTime())); } diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationEnrollController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationEnrollController.java index 9771891..391832e 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationEnrollController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationEnrollController.java @@ -329,22 +329,24 @@ public class TheRapyRecuperationEnrollController { public Object canDelete(String id) { TheRapyRecuperationEnroll enroll = dao.fetch(TheRapyRecuperationEnroll.class, id); + //如果成团了，不能取消 + if(enroll.getHasLocked()) { + return Result.error("当前报名已经成团不能取消"); + } + + TheRapyRecuperationConfig config = dao.fetch(TheRapyRecuperationConfig.class, Cnd.NEW()); Date changeEndTime = null; if (StrUtil.isNotBlank(enroll.getTakePartInLineId())) { - TheRapyRecuperationLineUnionSelect lineUnionSelect = dao.fetch(TheRapyRecuperationLineUnionSelect.class, enroll.getTakePartInLineId()); - changeEndTime = lineUnionSelect.getChangeEndTime(); + changeEndTime = config.getImplodeEndTime(); } else if (StrUtil.isNotBlank(enroll.getTakePartInTravelAgencyId())) { return null; } else if (StrUtil.isNotBlank(enroll.getTakePartInBaseManagementId())) { - TheRapyRecuperationBaseManagement baseManagement = dao.fetch(TheRapyRecuperationBaseManagement.class, enroll.getTakePartInBaseManagementId()); - changeEndTime = baseManagement.getChangeEndTime(); + changeEndTime = config.getFragmentEndTime(); } - if (DateUtil.compare(new Date(), changeEndTime) > 0) { return Result.error("抱歉，当前时间已经不能取消"); } - return null; } diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationBaseManagement.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationBaseManagement.java index 6e50962..223eb63 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationBaseManagement.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationBaseManagement.java @@ -159,4 +159,9 @@ public class TheRapyRecuperationBaseManagement { @One(field = "travelAgencyId") private TheRapyRecuperationTravelAgency travelAgency; + + @Column + @ColDefine(type = ColType.MYSQL_JSON) + @Comment("天数") + private List allowDay; } diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationConfig.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationConfig.java index cbdf9fa..2bc8e13 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationConfig.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationConfig.java @@ -1,5 +1,6 @@ package io.v.nutz.zhgh.therapyRecuperation.model; +import cn.hutool.core.date.DateTime; import io.v.nutz.sys.models.Sys_file; import lombok.Data; import lombok.experimental.Accessors; @@ -113,4 +114,50 @@ public class TheRapyRecuperationConfig { @ColDefine(type = ColType.MYSQL_JSON) @Comment("承诺书") private List files; + + @Column + @ColDefine(type = ColType.INT) + @Comment("常规团最少成团人数") + private Integer conventionalCount; + + @Column + @ColDefine(type = ColType.INT) + @Comment("精品团最少成团人数") + private Integer boutiqueCount; + + @Column + @ColDefine(type = ColType.INT) + @Comment("分段式最少成团人数") + private Integer fragmentCount; + + @Column + @ColDefine(type = ColType.DATETIME) + @Comment("集中疗休养报名开始时间") + private DateTime implodeStartTime; + + @Column + @ColDefine(type = ColType.DATETIME) + @Comment("集中疗休养报名结束时间") + private DateTime implodeEndTime; + + @Column + @ColDefine(type = ColType.DATETIME) + @Comment("分段疗休养报名开始时间") + private DateTime fragmentStartTime; + + @Column + @ColDefine(type = ColType.DATETIME) + @Comment("分段疗休养报名结束时间") + private DateTime fragmentEndTime; + + @Column + @ColDefine(type = ColType.DATETIME) + @Comment("分段疗休养活动开始时间") + private DateTime fragmentPlayStartTime; + + @Column + @ColDefine(type = ColType.DATETIME) + @Comment("分段疗休养活动结束时间") + private DateTime fragmentPlayEndTime; + } 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 7277cb0..cffd410 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 @@ -218,5 +218,10 @@ public class TheRapyRecuperationEnroll extends BaseModel { @Comment("是否被锁定了，如果被锁定了就不能取消报名了") private Boolean hasLocked; + @Column + @ColDefine(type = ColType.INT) + @Comment("报酒店时选择的出行天数") + private Double playDay; + private String firstLetter; } 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 2d8896a..c71bf5b 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 @@ -1,5 +1,6 @@ package io.v.nutz.zhgh.therapyRecuperation.service.impl; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.pinyin.PinyinUtil; @@ -517,50 +518,40 @@ public class TheRapyRecuperationEnrollServiceImpl extends ViServiceImpl validTime = this.validSignTime(enrollInfo); + if (validTime != null && validTime.containsKey(false)) { + return validTime; + } + //每年旅行频率 Integer travelFrequency = config.getTravelFrequency(); //省外几年去一次 Integer outsideNumber = config.getOutsideNumber(); - //可以修改几次 - Integer modifyNumber = config.getModifyNumber(); - //省外最多报名人数 - Integer allLineSignUpNumber = config.getAllLineSignUpNumber(); //省内起始年份 Integer provinceStartYear = config.getProvinceStartYear(); - //活动范围 - Integer activityGroupId = config.getActivityGroupId(); - //如果报酒店 - if (StrUtil.isNotBlank(enrollInfo.getTakePartInBaseManagementId()) && StrUtil.isBlank(enrollInfo.getId()) && enrollInfo.isNormal()) { - Map oneYear = this.validCountOneYear(loginName, travelFrequency); - if (oneYear != null) { - return oneYear; - } + //先判断有没有报过 + Map thisYearCount = this.validCountThisYear(loginName, travelFrequency); + if (thisYearCount != null && thisYearCount.containsKey(false)) { + return thisYearCount; } - Date signUpStartTime = null; - Date signUpEndTime = null; - Date changeEndTime = null; + //如果报酒店，酒店可以一年报2次 + if (StrUtil.isNotBlank(enrollInfo.getTakePartInBaseManagementId()) && StrUtil.isBlank(enrollInfo.getId())) { + Map validResult = this.validBaseManagementCount(loginName, enrollInfo); + if(validResult != null && validResult.containsKey(false)) { + return validResult; + } + } if (StrUtil.isNotBlank(enrollInfo.getTakePartInLineId())) { //线路信息 TheRapyRecuperationLineUnionSelect lineUnionSelect = dao().fetch(TheRapyRecuperationLineUnionSelect.class, enrollInfo.getTakePartInLineId()); TheRapyRecuperationLine lineInfo = dao().fetch(TheRapyRecuperationLine.class, lineUnionSelect.getLineId()); - signUpStartTime = lineUnionSelect.getSignUpStartTime(); - signUpEndTime = lineUnionSelect.getSignUpEndTime(); - changeEndTime = lineUnionSelect.getChangeEndTime(); - - if (DateUtil.compare(new Date(), signUpStartTime) < 0) { - return Map.of(false, "报名未开始，请耐心等待"); - } - if (DateUtil.compare(new Date(), changeEndTime) > 0 && enrollInfo.isNormal()) { - return Map.of(false, "报名时间已过，抱歉不能报名"); - } - TheRapyRecuperationType trrt = regionTypeLineMap.get(lineInfo.getRegionalNature()); if (StrUtil.isBlank(enrollInfo.getId()) && StrUtil.isNotBlank(enrollInfo.getTakePartInLineId())) { - //获取标段中的最大费用 List lotList = dao().query(TheRapyRecuperationLot.class, Cnd.NEW()); //最大费用 @@ -569,11 +560,6 @@ public class TheRapyRecuperationEnrollServiceImpl extends ViServiceImpl oneYear = this.validCountOneYear(loginName, travelFrequency); - if (oneYear != null && oneYear.containsKey(false)) { - return oneYear; - } - //获取起始年份到当前时间，是否报名 Sql sql = Sqls.create(""" SELECT @@ -653,60 +639,70 @@ public class TheRapyRecuperationEnrollServiceImpl extends ViServiceImpl 0) { - return Map.of(false, "超过变更截至时间，无法变更！"); - } else { - return Map.of(true, "验证成功"); - } - } return Map.of(true, "验证成功"); } - public Map validSignCount(TheRapyRecuperationEnroll enrollInfo, TheRapyRecuperationConfig config, int estimatedFamilyNumbers, String type) { - int hasSignNumber = 0;//已经报名的人数 - int currentSignNumber = 1;//当前报名人数，1表示自己，下面的if是加家属人数 - Cnd cnd = Cnd.where("takePartInLineId", "=", enrollInfo.getTakePartInLineId()) - .and("stateId", "in", Lang.array(TheRapyRecuperationState.UNIT, TheRapyRecuperationState.LINEUNIT, TheRapyRecuperationState.SCHOOL, TheRapyRecuperationState.PASS)) - .and("isNormal", "=", true); - //如果是修改，排除自己的报名记录 - if("edit".equals(type)) { - cnd.and("loginName", "!=", ShiroUtil.getPlatformLoginname()); + public Map validSignTime(TheRapyRecuperationEnroll currentEnroll) { + TheRapyRecuperationConfig config = dao().fetch(TheRapyRecuperationConfig.class, Cnd.NEW()); + DateTime signUpStartTime = null; + DateTime signUpEndTime = null; + if(StrUtil.isNotBlank(currentEnroll.getTakePartInLineId())) { + signUpStartTime = config.getImplodeStartTime(); + signUpEndTime = config.getImplodeEndTime(); + } else if(StrUtil.isNotBlank(currentEnroll.getTakePartInBaseManagementId())) { + signUpStartTime = config.getFragmentStartTime(); + signUpEndTime = config.getFragmentEndTime(); } - List enrolls = dao().query(TheRapyRecuperationEnroll.class, cnd); + if (DateUtil.compare(new Date(), signUpStartTime) < 0) { + return Map.of(false, "报名未开始，请耐心等待"); + } + if (DateUtil.compare(new Date(), signUpEndTime) > 0) { + return Map.of(false, "报名时间已过，抱歉不能报名"); + } + return null; + } - //1表示在配置页面的家属配置的是数量，2是家属的List - /*if (config.getFamilyInfo() == 1) { - currentSignNumber += enrollInfo.getFamilyNumber() != null ? enrollInfo.getFamilyNumber() : 0; - int sum = enrolls.stream().mapToInt(TheRapyRecuperationEnroll::getFamilyNumber).sum(); - hasSignNumber = enrolls.size() + sum; - } else { - currentSignNumber += enrollInfo.getCompanionList() != null ? enrollInfo.getCompanionList().size() : 0; - List list = enrolls.stream().map(TheRapyRecuperationEnroll::getId).collect(Collectors.toList()); - List companions = dao().query(TheRapyRecuperationEnrollCompanion.class, Cnd.where("trreId", "=", list)); - hasSignNumber = enrolls.size() + companions.size(); - }*/ - //省外报名限制，不包含家属 -// hasSignNumber += currentSignNumber + enrolls.size(); - if (( currentSignNumber + enrolls.size()) > estimatedFamilyNumbers) { - return Map.of(false, "报名人数已满"); - } else { - return null; + public Map validBaseManagementCount(String loginName, TheRapyRecuperationEnroll currentEnroll) { + //酒店可以一年报2次，查询是否有报第一次 + List enrollList = dao().query( + TheRapyRecuperationEnroll.class, + Cnd.where("loginName", "=", loginName) + .and("isNormal", "=", true) + .and("takePartInBaseManagementId", "is not", null) + .and("YEAR(signingUptime)", "=", DateUtil.thisYear()) + ); + if(enrollList.size() >= 2) { + return Map.of(false, "您已经报名了%s次分段疗休养".formatted(enrollList.size())); } + //如果报过第一次就要判断 + if(Lang.isNotEmpty(enrollList)) { + TheRapyRecuperationEnroll lastEnroll = enrollList.get(0); + //判断这次报名的旅行社和上次的旅行社是否是一个 + TheRapyRecuperationBaseManagement currentManagement = dao().fetch(TheRapyRecuperationBaseManagement.class, currentEnroll.getTakePartInBaseManagementId()); + TheRapyRecuperationTravelAgency currentTravelAgency = dao().fetch(TheRapyRecuperationTravelAgency.class, currentManagement.getTravelAgencyId()); + + TheRapyRecuperationBaseManagement lastManagement = dao().fetch(TheRapyRecuperationBaseManagement.class, lastEnroll.getTakePartInBaseManagementId()); + TheRapyRecuperationTravelAgency lastTravelAgency = dao().fetch(TheRapyRecuperationTravelAgency.class, lastManagement.getTravelAgencyId()); + if(!Objects.equals(currentTravelAgency.getId(), lastTravelAgency.getId())) { + return Map.of(false, "当前报名酒店的旅行社与上次出行不一致"); + } + //如果是一个，再判断天数 + if(currentEnroll.getPlayDay() != null) { + if((currentEnroll.getPlayDay() + lastEnroll.getPlayDay()) != 5) { + return Map.of(false, "您选择的出行天数有误"); + } + } + } + return null; } //判断一年报几次 - public Map validCountOneYear(String loginName, int travelFrequency) { + public Map validCountThisYear(String loginName, int travelFrequency) { Cnd cnd = Cnd.NEW(); cnd.and("loginName", "=", loginName); cnd.and("isNormal", "=", true); - cnd.and("YEAR(signingUptime)", "=", io.v.nutz.base.utils.DateUtil.getYear()); + cnd.and("takePartInBaseManagementId", "is", null); + cnd.and("YEAR(signingUptime)", "=", DateUtil.thisYear()); int joinCount = dao().count(TheRapyRecuperationEnroll.class, cnd); if (joinCount >= travelFrequency) { @@ -718,23 +714,18 @@ public class TheRapyRecuperationEnrollServiceImpl extends ViServiceImpl 0) { str = "省内线路"; @@ -742,40 +733,10 @@ public class TheRapyRecuperationEnrollServiceImpl extends ViServiceImpl 0) { str = "旅行社"; - } else if (hotelCount > 0) { - str = "酒店"; } return Map.of(false, "一年只能报" + travelFrequency + "次，您已报" + str + "，请先在我的疗休养中删除，方可报名！"); } - return Map.of(true, "成功"); - } - - public int getCountByOutLine(TheRapyRecuperationType trrt, String loginName, int outsideNumber) { - //省外 outsideNumber 年内是否去过 - if (trrt.getValue() == TheRapyRecuperationType.provinceOutLine.getValue()) { - Sql lineJoinSql = Sqls.create(""" - SELECT - count(*) - FROM - the_rapy_recuperation_enroll ren - LEFT JOIN the_rapy_recuperation_line rl on ren.takePartInLineId = rl.id - $condition - """); - - Cnd lineCnd = Cnd.NEW(); - lineCnd.and("loginName", "=", loginName); - lineCnd.and("isNormal", "=", true); - lineCnd.and("takePartInLineId", "IS NOT", null); - lineCnd.and("YEAR ( signingUptime )", ">=", io.v.nutz.base.utils.DateUtil.getYear() - outsideNumber); - lineCnd.and("YEAR ( signingUptime )", "<=", io.v.nutz.base.utils.DateUtil.getYear() - 1); - lineCnd.and("regionalNature", "=", TheRapyRecuperationType.provinceOutLine.getValue()); - - lineJoinSql.setCondition(lineCnd); - - //lineCnd.and(new SqlExpressionGroup().andBetween("YEAR(signingUptime)", io.v.nutz.base.utils.DateUtil.getYear() - 1, io.v.nutz.base.utils.DateUtil.getYear() - outsideNumber)); - return baseService.count(lineJoinSql); - } - return 0; + return null; } /** diff --git a/src/main/resources/views/mobile/platform.html b/src/main/resources/views/mobile/platform.html index 9f42cf1..721bacc 100644 --- a/src/main/resources/views/mobile/platform.html +++ b/src/main/resources/views/mobile/platform.html @@ -95,7 +95,7 @@ url: url, container: "#container", maxCacheLength: 0, - push: false, + push: true, replace: true, fragment: "#container", timeout: 8000, diff --git a/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html b/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html index c9e3893..4350420 100644 --- a/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html +++ b/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html @@ -263,9 +263,9 @@ layout("/mobile/platform.html"){
- - {{baseData.lotName}} - + {{baseData.baseName}}
@@ -279,13 +279,13 @@ layout("/mobile/platform.html"){
报名时间： - {{moment(baseData.signUpStartTime).format('YYYY-MM-DD HH:mm') + ' ~ ' + - moment(baseData.signUpEndTime).format('YYYY-MM-DD HH:mm')}} + {{moment(configData.fragmentStartTime).format('YYYY-MM-DD HH:mm') + ' ~ ' + + moment(configData.fragmentEndTime).format('YYYY-MM-DD HH:mm')}}
活动时间： - {{moment(baseData.activityStartTime).format('YYYY-MM-DD HH:mm') + ' ~ ' + - moment(baseData.activityEndTime).format('YYYY-MM-DD HH:mm')}} + {{moment(configData.fragmentPlayStartTime).format('YYYY-MM-DD HH:mm') + ' ~ ' + + moment(configData.fragmentPlayEndTime).format('YYYY-MM-DD HH:mm')}}
@@ -307,17 +307,13 @@ layout("/mobile/platform.html"){
-