From 2e808c6b42574b63ded742e144c633a3e170f22f Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Wed, 30 Apr 2025 17:02:08 +0800 Subject: [PATCH] commit --- .../controller/ActivitySignInQueryController.java | 4 ++-- .../src/pages/activity/registration-form/index.vue | 12 +----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/backend/src/main/java/com/budwk/app/module/activity/controller/ActivitySignInQueryController.java b/backend/src/main/java/com/budwk/app/module/activity/controller/ActivitySignInQueryController.java index 5224d63..c8bd55f 100644 --- a/backend/src/main/java/com/budwk/app/module/activity/controller/ActivitySignInQueryController.java +++ b/backend/src/main/java/com/budwk/app/module/activity/controller/ActivitySignInQueryController.java @@ -80,7 +80,7 @@ public class ActivitySignInQueryController { } cnd.and("au.activityId", "=", pageForm.getActivityId()); cnd.and("au.isSignIn", "=", 1); - cnd.asc("au.actUserNo"); + cnd.desc("au.signInTime"); sql.setCondition(cnd); Pagination pagination = activitySignInQueryService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); return Result.success(pagination); @@ -110,7 +110,7 @@ public class ActivitySignInQueryController { } cnd.and("au.activityId", "=", pageForm.getActivityId()); cnd.and("au.isSignIn", "=", 1); - cnd.asc("au.actUserNo"); + cnd.desc("au.signInTime"); sql.setCondition(cnd); List nutMaps = activitySignInQueryService.listMap(sql); List entityList = new ArrayList<>() {{ diff --git a/frontend/src/pages/activity/registration-form/index.vue b/frontend/src/pages/activity/registration-form/index.vue index 7a611ce..6d4dc58 100644 --- a/frontend/src/pages/activity/registration-form/index.vue +++ b/frontend/src/pages/activity/registration-form/index.vue @@ -119,17 +119,7 @@ const isSignUp = ref(null) const agreementChecked = ref(false) const formRef = ref(null) const formData = ref({ - unitName: "测试", - contactName: "测试", - contactPhone: "18899998888", - userList: [{ - userName: "测试", - sex: "男", - position: "测试", - idCard: "421087200004040010", - phone: "18899998888", - isStay: true - }] + userList: [{}] }) onLoad((option) => {