活动报名

src/main/java/com/xjrsoft/module/activity/controller/ActivityEnrollController.java

@@ -3,6 +3,7 @@ package com.xjrsoft.module.activity.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -21,6 +22,8 @@ import com.xjrsoft.module.activity.service.IActivityEnrollService;
 import com.xjrsoft.module.activity.vo.ActivityEnrollExcelVo;
 import com.xjrsoft.module.activity.vo.ActivityEnrollPageVo;
 import com.xjrsoft.module.banding.vo.BandingTaskClassExcelVo;
+import com.xjrsoft.module.concat.service.IXjrUserService;
+import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -51,7 +54,7 @@ import java.util.List;
 @AllArgsConstructor
 public class ActivityEnrollController {
 
-
+    private final IXjrUserService xjrUserService;
     private final IActivityEnrollService activityEnrollService;
 
 
@@ -160,6 +163,13 @@ public class ActivityEnrollController {
             setActivityInfoId(dto.getActivityInfoId());
         }};
         boolean save = activityEnrollService.save(activityEnroll);
+
+        XjrUser xjrUser = xjrUserService.getById(StpUtil.getLoginIdAsLong());
+        if(StrUtil.isNotEmpty(dto.getMobile()) && !dto.getMobile().equals(xjrUser.getMobile())){
+            xjrUser.setMobile(dto.getMobile());
+            xjrUserService.updateById(xjrUser);
+        }
+
         return RT.ok(save);
     }
 

src/main/java/com/xjrsoft/module/activity/controller/ActivityInfoController.java

@@ -30,6 +30,8 @@ import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.concat.service.IXjrUserService;
 import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.organization.service.IDepartmentService;
+import com.xjrsoft.module.system.entity.File;
+import com.xjrsoft.module.system.service.IFileService;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -67,7 +69,7 @@ public class ActivityInfoController {
     private final IBaseClassService classService;
     private final IDepartmentService departmentService;
     private final IXjrUserService xjrUserService;
-
+    private final IFileService fileService;
     private final IActivityEnrollService enrollService;
 
 
@@ -209,6 +211,12 @@ public class ActivityInfoController {
             if(collect.contains(Long.parseLong(record.getId()))){
                 record.setIsEnroll(1);
             }
+            if(record.getCoverFileId() != null){
+                File file = fileService.getOne(new QueryWrapper<File>().lambda().eq(File::getFolderId, record.getCoverFileId()));
+                if(file != null){
+                    record.setCoverFileUrl(file.getFileUrl());
+                }
+            }
         }
 
         PageOutput<ActivityInfoPageVo> pageOutput = ConventPage.getPageOutput(page, ActivityInfoPageVo.class);

src/main/java/com/xjrsoft/module/activity/vo/ActivityInfoPageVo.java

@@ -72,6 +72,9 @@ public class ActivityInfoPageVo {
     */
     @ApiModelProperty("封面图片")
     private String coverFileId;
+
+    @ApiModelProperty("封面图片地址")
+    private String coverFileUrl;
     /**
     * 报名范围
     */

src/main/resources/mapper/activity/ActivityInfoMapper.xml

@@ -13,7 +13,7 @@
         LEFT JOIN xjr_department t4 ON t1.org_id = t4.id
         WHERE t1.delete_mark = 0 and t1.category = #{dto.category}
         <if test="dto.isEffective != null and dto.isEffective == 1">
-            and (t1.status = 1 or t1.status = 2) and now() between t1.start_date and t1.end_date
+            and (t1.status = 1 or t1.status = 2) and NOW() between t1.start_date and t1.end_date
         </if>
     </select>
     <select id="getMyPage" parameterType="com.xjrsoft.module.activity.dto.ActivityInfoPageDto" resultType="com.xjrsoft.module.activity.vo.ActivityInfoPageVo">
@@ -27,7 +27,7 @@
         LEFT JOIN activity_enroll t5 ON t1.id = t5.activity_info_id
         WHERE t1.delete_mark = 0 and t1.category = #{dto.category} and t5.user_id = #{dto.loginUserId}
         <if test="dto.isEffective != null and dto.isEffective == 1">
-            and (t1.status = 1 or t1.status = 2) and now() between t1.start_date and t1.end_date
+            and (t1.status = 1 or t1.status = 2) and NOW() between t1.start_date and t1.end_date
         </if>
     </select>
 </mapper>