From 04ed78e4d989e172190bc066ba4db1d4a1fcf09f Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Sat, 12 Oct 2024 14:01:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scale/controller/wx/WxActivityController.java   | 13 ++++++++++++-
 .../service/impl/ActivityEnterServiceImpl.java      |  9 +++++++++
 .../scale/service/impl/EvaluationServiceImpl.java   |  5 +----
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java
index 6c2e28c..1a9e876 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java
@@ -41,7 +41,7 @@ public class WxActivityController extends BaseController {
     @Log(title = "活动报名", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/enter")
-    public R<Void> addReservation(@Validated(AddGroup.class) @RequestBody ActivityEnterBo bo) {
+    public R<Void> addEnter(@Validated(AddGroup.class) @RequestBody ActivityEnterBo bo) {
         return toAjax(activityEnterService.insertByBo(bo));
     }
 
@@ -62,4 +62,15 @@ public class WxActivityController extends BaseController {
     public R<ActivityVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
         return R.ok(activityService.queryById(id));
     }
+
+    /**
+     * 活动签到
+     */
+    @Log(title = "活动签到", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/sign")
+    public R<Void> addSign(@Validated(AddGroup.class) @RequestBody ActivityEnterBo bo) {
+        return toAjax(activityEnterService.updateByBo(bo));
+    }
+
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityEnterServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityEnterServiceImpl.java
index fef9bbb..a8fa634 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityEnterServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityEnterServiceImpl.java
@@ -92,6 +92,7 @@ public class ActivityEnterServiceImpl implements IActivityEnterService {
             throw new ServiceException("你已报名，请勿重复报名");
         }
         ActivityEnter add = MapstructUtils.convert(bo, ActivityEnter.class);
+        add.setStatus(0);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
@@ -109,7 +110,15 @@ public class ActivityEnterServiceImpl implements IActivityEnterService {
      */
     @Override
     public Boolean updateByBo(ActivityEnterBo bo) {
+        Long userId = LoginHelper.getUserId();
+        boolean exists = baseMapper.exists(new LambdaQueryWrapper<ActivityEnter>()
+            .eq(ActivityEnter::getActivityId, bo.getActivityId())
+            .eq(ActivityEnter::getCreateBy, userId));
+        if (!exists) {
+            throw new ServiceException("签到失败，请先报名活动");
+        }
         ActivityEnter update = MapstructUtils.convert(bo, ActivityEnter.class);
+        update.setStatus(1);
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/EvaluationServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/EvaluationServiceImpl.java
index 91b106e..5876644 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/EvaluationServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/EvaluationServiceImpl.java
@@ -70,10 +70,7 @@ public class EvaluationServiceImpl implements IEvaluationService {
         LoginUser loginUser = getLoginUser();
         Long userId = loginUser.getUserId();
         Long deptId = loginUser.getDeptId();
-        String userType = loginUser.getUserType();
-//        if (!UserType.STUDENT.getName().equals(userType)) {
-//            throw new ServiceException("只有学生账户才能测评");
-//        }
+
         String deptBatchNo = publishMapper.selectUseBatchNoByDeptId(deptId);
         String userBatchNo = publishMapper.selectUseBatchNoByUserId(userId);
         List<String> batchList = new ArrayList<>();