From 607204910fecd471f9c12055d7a7bee5cfa24590 Mon Sep 17 00:00:00 2001 From: zhangrui Date: Mon, 13 Apr 2026 18:00:38 +0800 Subject: [PATCH] =?UTF-8?q?bug=E8=B0=83=E6=95=B4=EF=BC=9A=E6=99=BA?= =?UTF-8?q?=E4=BA=AB=E6=83=A0=E7=94=9F=E6=B4=BB=E3=80=81=E4=BD=93=E6=A3=80?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/SmartBenefitsAdjustController.java | 7 ++++++- .../manage/SmartBenefitsApplyController.java | 12 +++++++----- .../SmartBenefitsActivityStatisticsController.java | 2 +- .../service/SmartBenefitsActivityService.java | 2 +- .../impl/SmartBenefitsActivityServiceImpl.java | 8 +++++--- .../TrainSignUpActivityStatisticsController.java | 2 +- .../h5controller/H5HealthCheckupController.java | 13 +++++++++++++ .../activity/smartbenefits/userAdjust/applyForm.js | 3 ++- .../zhgh/activity/trainSignUp/userAdjust/index.html | 4 ++-- .../healthCheckup/listMange/index.html | 2 +- .../zhghh5/activity/smartbenefits/list/applyForm.js | 2 +- .../healthCheckup/projectManageForm/index.html | 4 +++- 12 files changed, 43 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/smartbenefits/controller/manage/SmartBenefitsAdjustController.java b/src/main/java/com/budwk/app/zhgh/activity/smartbenefits/controller/manage/SmartBenefitsAdjustController.java index a94ecdfd..7eadc2ba 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/smartbenefits/controller/manage/SmartBenefitsAdjustController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/smartbenefits/controller/manage/SmartBenefitsAdjustController.java @@ -16,6 +16,7 @@ import com.budwk.app.zhgh.activity.smartbenefits.service.SmartBenefitsActivitySt import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; @@ -137,7 +138,11 @@ public class SmartBenefitsAdjustController { SmartBenefitsUser oldSmartBenefitsUser = dao.fetch(SmartBenefitsUser.class, oldCnd); oldSmartBenefitsUser.setCourseId(newCourseId); oldSmartBenefitsUser.setSignUpTime(DateUtil.date()); - dao.update(oldSmartBenefitsUser); + dao.update( + SmartBenefitsUser.class, + Chain.make("courseId", newCourseId).add("signUpTime", DateUtil.date()), + Cnd.NEW().and("id","=",oldSmartBenefitsUser.getId()) + ); //新的课程的信息，上课时间 List activityCourseList = dao.query(SmartBenefitsActivityCourse.class, Cnd.where("activityId", "=", activityId) diff --git a/src/main/java/com/budwk/app/zhgh/activity/smartbenefits/controller/manage/SmartBenefitsApplyController.java b/src/main/java/com/budwk/app/zhgh/activity/smartbenefits/controller/manage/SmartBenefitsApplyController.java index 387c9d4c..44b8ee70 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/smartbenefits/controller/manage/SmartBenefitsApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/smartbenefits/controller/manage/SmartBenefitsApplyController.java @@ -217,13 +217,15 @@ public class SmartBenefitsApplyController { @ApiOperation("验证是否能报名") @SaCheckPermission(value = {"smartbenefits.apply", "h5.smartbenefits.apply"}, mode = SaMode.OR) public Result validateSignUp(String courseId, - @Param(value = "currentFamilyNumber") Integer currentFamilyNumber,String IsVerifyUserApply) { + @Param(value = "currentFamilyNumber") Integer currentFamilyNumber, + String IsVerifyUserApply, + String userId) { try { lock.lock(); if (StrUtil.isBlank(courseId)) { return Result.error("报名信息为空"); } - + userId = StringUtils.defaultIfBlank(userId, SecurityUtil.getUserId()); currentFamilyNumber = currentFamilyNumber != null ? currentFamilyNumber : 0; SmartBenefitsCourse course = dao.fetch(SmartBenefitsCourse.class, courseId); SmartBenefitsActivity activity = dao.fetch(SmartBenefitsActivity.class, course.getActivityId()); @@ -237,14 +239,14 @@ public class SmartBenefitsApplyController { } //判断活动组别 - int count = dao.count(ActivityUserScope.class, Cnd.where("groupId", "=", activity.getActivityGroupId()).and("userId", "=", SecurityUtil.getUserId())); + int count = dao.count(ActivityUserScope.class, Cnd.where("groupId", "=", activity.getActivityGroupId()).and("userId", "=", userId)); if (count == 0) { return Result.error("抱歉，您没有此次活动的权限"); } //判断是否报名 if(StringUtils.defaultString(IsVerifyUserApply,"0").equals("0")){ - boolean courseByUser = smartBenefitsActivityService.isSignCourseByUser(courseId, SecurityUtil.getUserId()); + boolean courseByUser = smartBenefitsActivityService.isSignCourseByUser(courseId, userId); if (courseByUser) { return Result.error("抱歉，您已经报名"); } @@ -257,7 +259,7 @@ public class SmartBenefitsApplyController { } //判断活动限制 - boolean signCourse = smartBenefitsActivityService.isSignCourse(course, activity); + boolean signCourse = smartBenefitsActivityService.isSignCourse(course, activity, userId); if (!signCourse) { if (activity.getRestrictLimit() != 3) { return Result.error("您选择的类型已达上限，不能再报该类型的了"); diff --git a/src/main/java/com/budwk/app/zhgh/activity/smartbenefits/controller/statistics/SmartBenefitsActivityStatisticsController.java b/src/main/java/com/budwk/app/zhgh/activity/smartbenefits/controller/statistics/SmartBenefitsActivityStatisticsController.java index d4f2314e..40b3aaaa 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/smartbenefits/controller/statistics/SmartBenefitsActivityStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/smartbenefits/controller/statistics/SmartBenefitsActivityStatisticsController.java @@ -233,7 +233,7 @@ public class SmartBenefitsActivityStatisticsController { excelCommonExportEntity.add(new ExcelExportEntity("性别", "sex", 20)); excelCommonExportEntity.add(new ExcelExportEntity("手机号", "mobile", 20)); excelCommonExportEntity.add(new ExcelExportEntity("生日", "birthday", 20)); - excelCommonExportEntity.add(new ExcelExportEntity("报名时段", "courseTime", 20)); + excelCommonExportEntity.add(new ExcelExportEntity("报名时间", "signUpTime", 20)); for (SmartBenefitsCourse c : courseList) { String k = c.getCourseName(); diff --git a/src/main/java/com/budwk/app/zhgh/activity/smartbenefits/service/SmartBenefitsActivityService.java b/src/main/java/com/budwk/app/zhgh/activity/smartbenefits/service/SmartBenefitsActivityService.java index bed73cb6..53e50609 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/smartbenefits/service/SmartBenefitsActivityService.java +++ b/src/main/java/com/budwk/app/zhgh/activity/smartbenefits/service/SmartBenefitsActivityService.java @@ -99,7 +99,7 @@ public interface SmartBenefitsActivityService extends BaseService diff --git a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html index 230a8c68..818d25dc 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html @@ -145,7 +145,7 @@ layout("/layouts/platform.html"){ 编辑备注 编辑 diff --git a/src/main/resources/views/platform/zhghh5/activity/smartbenefits/list/applyForm.js b/src/main/resources/views/platform/zhghh5/activity/smartbenefits/list/applyForm.js index cb6466b3..0e8c1ea6 100644 --- a/src/main/resources/views/platform/zhghh5/activity/smartbenefits/list/applyForm.js +++ b/src/main/resources/views/platform/zhghh5/activity/smartbenefits/list/applyForm.js @@ -57,7 +57,7 @@ const applyForm = { } }, components: { - "train-dynamic-form": httpVueLoader("/components/module/smartBenefits/TrainDynamicForm.vue") + "train-dynamic-form": httpVueLoader("/components/module/trainSignUp/TrainDynamicForm.vue") }, methods: { async onOpen(row, courseType) { diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/healthCheckup/projectManageForm/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/healthCheckup/projectManageForm/index.html index 2241d22c..bfb73806 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/healthCheckup/projectManageForm/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/healthCheckup/projectManageForm/index.html @@ -436,10 +436,12 @@ layout("/layouts/platform_h5.html"){ userSelection: JSON.stringify(formData), }).then(resp => { if (resp.code === 0) { - toast.clear(); + toast.clear(); this.$toast.success(resp.msg) this.historyBack() } + }).catch(() => { + toast.clear(); }) }).catch(() => { });