From 848fb8a9c759a477e0a856aac598a2b0e1ae1c60 Mon Sep 17 00:00:00 2001 From: JyuHsin <729757837@qq.com> Date: Thu, 12 Jun 2025 14:16:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...yRecuperationLineStatisticsController.java | 1 + .../model/TheRapyRecuperationEnroll.java | 5 ++ .../model/TheRapyRecuperationLine.java | 6 ++ .../TheRapyRecuperationTravelAgency.java | 2 +- .../TheRapyRecuperationEnrollServiceImpl.java | 3 + .../TrainSignUpActivityApplyController.java | 4 +- .../WelfareMemberMangeController.java | 2 + .../therapyRecuperation/baseManagement.html | 3 + .../mobile/therapyRecuperation/index.html | 2 +- .../mobile/therapyRecuperation/lineInfo.html | 11 ++++ .../mobile/therapyRecuperation/lineList.html | 61 ++++++++++++------- .../theRapyRecuperation/basicManage/line.html | 11 +++- 12 files changed, 85 insertions(+), 26 deletions(-) diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/statistics/TheRapyRecuperationLineStatisticsController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/statistics/TheRapyRecuperationLineStatisticsController.java index ff37399..4214101 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/statistics/TheRapyRecuperationLineStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/statistics/TheRapyRecuperationLineStatisticsController.java @@ -389,6 +389,7 @@ public class TheRapyRecuperationLineStatisticsController { exportEntities.add(new ExcelExportEntity("旅行社", "travelAgencyName", 20)); exportEntities.add(new ExcelExportEntity("费用（元）", "money", 20)); exportEntities.add(new ExcelExportEntity("使用下一年经费", "useNextMoney", 20)); + exportEntities.add(new ExcelExportEntity("才艺特长", "skill", 20)); try { ExportParams exportParams = new ExportParams(); 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 71d4a25..eedf6b2 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 @@ -229,5 +229,10 @@ public class TheRapyRecuperationEnroll extends BaseModel { @Default("0") private Integer moneyType; + @Column + @ColDefine(type = ColType.VARCHAR, width = 200) + @Comment("才艺特长") + private String skill; + private String firstLetter; } diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationLine.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationLine.java index 9b339eb..6500414 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationLine.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationLine.java @@ -174,6 +174,12 @@ public class TheRapyRecuperationLine extends BaseModel { @Default("0") private Boolean specialLine; + @Column + @ColDefine(type = ColType.BOOLEAN) + @Comment("联合疗休养") + @Default("0") + private Boolean togetherLine; + @Column @ColDefine(type = ColType.INT) @Comment("成团类型(1.常规团 2.精品团)") diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationTravelAgency.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationTravelAgency.java index decb3e9..4f5d148 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationTravelAgency.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationTravelAgency.java @@ -45,7 +45,7 @@ public class TheRapyRecuperationTravelAgency extends BaseModel { private String contact; @Column - @ColDefine(type = ColType.VARCHAR, width = 11) + @ColDefine(type = ColType.VARCHAR, width = 20) @Comment("旅行社联系人手机") private String contactMobileNumber; 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 286f3c7..e1a9fc1 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 @@ -79,6 +79,7 @@ public class TheRapyRecuperationEnrollServiceImpl extends ViServiceImpl signUpUsers = trainSignUpActivityService.dao().query(TrainSignUpUser.class, Cnd.where("courseId", "=", c.getString("id"))); signUpUsers.forEach(item -> { - hasRegisterNum.getAndIncrement(); + if(type.getSelfAddFamily()) { + hasRegisterNum.getAndIncrement(); + } if(type.getIsBringFamily() && type.getIsAddFamily()) { List mapList = item.getMobileColumnsValue(); if(Lang.isNotEmpty(mapList)) { diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMemberMangeController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMemberMangeController.java index d949887..dfb39e4 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMemberMangeController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMemberMangeController.java @@ -21,6 +21,7 @@ import io.v.nutz.sys.models.Sys_user_role; import io.v.nutz.sys.models.User; import io.v.nutz.sys.services.SysUserService; import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.activity.models.ActivityUserScope; import io.v.nutz.zhgh.staffmanage.member.MemberMode; import io.v.nutz.zhgh.staffmanage.member.WelfareMemberMode; import io.v.nutz.zhgh.staffmanage.member.model.MemberCheckTask; @@ -35,6 +36,7 @@ import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Condition; import org.nutz.dao.Sqls; +import org.nutz.dao.entity.Record; import org.nutz.dao.sql.Sql; import org.nutz.dao.util.cri.Static; import org.nutz.ioc.aop.Aop; diff --git a/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html b/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html index 5b0ebb6..316ea1a 100644 --- a/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html +++ b/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html @@ -249,6 +249,9 @@ layout("/mobile/platform.html"){ .backTop { display: none !important; } + .van-dialog__message { + font-size: 16px; + } diff --git a/src/main/resources/views/mobile/therapyRecuperation/index.html b/src/main/resources/views/mobile/therapyRecuperation/index.html index a6c87e4..80fd31a 100644 --- a/src/main/resources/views/mobile/therapyRecuperation/index.html +++ b/src/main/resources/views/mobile/therapyRecuperation/index.html @@ -65,7 +65,7 @@ layout("/mobile/platform.html"){ -
+
diff --git a/src/main/resources/views/mobile/therapyRecuperation/lineInfo.html b/src/main/resources/views/mobile/therapyRecuperation/lineInfo.html index 7d64b6e..dbc6c5c 100644 --- a/src/main/resources/views/mobile/therapyRecuperation/lineInfo.html +++ b/src/main/resources/views/mobile/therapyRecuperation/lineInfo.html @@ -236,6 +236,9 @@ layout("/mobile/platform.html"){ .van-radio--horizontal { margin-right: 8px; } + .van-dialog__message { + font-size: 16px; + } @@ -332,6 +335,13 @@ layout("/mobile/platform.html"){ left-icon="volume-o" text="温馨提醒：您选择的线路预计费用超过3000元，需要选择超出费用类型" > + + +
@@ -351,6 +361,7 @@ layout("/mobile/platform.html"){ placeholder="请填写手机号" v-model="formData.mobile"> +