活动报名

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

@@ -8,7 +8,6 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;

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

@@ -16,7 +16,6 @@ import com.xjrsoft.module.activity.dto.ActivityInfoPageDto;
 import com.xjrsoft.module.activity.dto.AddActivityInfoDto;
 import com.xjrsoft.module.activity.dto.ChangeStatusDto;
 import com.xjrsoft.module.activity.dto.UpdateActivityInfoDto;
-import com.xjrsoft.module.activity.dto.UserEnrollDto;
 import com.xjrsoft.module.activity.entity.ActivityEnroll;
 import com.xjrsoft.module.activity.entity.ActivityInfo;
 import com.xjrsoft.module.activity.service.IActivityEnrollService;
@@ -229,6 +228,14 @@ public class ActivityInfoController {
     public RT<PageOutput<ActivityInfoPageVo>> myEnrollList(@Valid ActivityInfoPageDto dto){
         dto.setLoginUserId(StpUtil.getLoginIdAsLong());
         Page<ActivityInfoPageVo> page = activityInfoService.getMyPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        for (ActivityInfoPageVo record : page.getRecords()) {
+            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);
         return RT.ok(pageOutput);

src/main/java/com/xjrsoft/module/activity/service/impl/ActivityEnrollServiceImpl.java

@@ -25,7 +25,6 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 

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

@@ -111,4 +111,7 @@ public class ActivityInfoPageVo {
     @ApiModelProperty("是否已报名(1:是 0:否)")
     private Integer isEnroll;
 
+    @ApiModelProperty("参与状态(0:待确认 1:未参与 2:已参与)")
+    private Integer enrollStatus;
+
 }

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

@@ -19,7 +19,7 @@
     <select id="getMyPage" parameterType="com.xjrsoft.module.activity.dto.ActivityInfoPageDto" resultType="com.xjrsoft.module.activity.vo.ActivityInfoPageVo">
         SELECT t1.id,t2.name AS type_cn,t3.company_name AS enterprise_name,t1.name,t1.place,t1.start_date,t1.end_date,
         t1.type, t4.name AS org_name, t1.enroll_end_time, t1.duty_person,t1.duty_person_mobile, t1.cover_file_id,
-        t1.enroll_range, t1.status,t1.content,t1.category,
+        t1.enroll_range, t1.status,t1.content,t1.category,t5.status as enroll_status
         (SELECT COUNT(*) FROM activity_enroll WHERE delete_mark = 0 AND activity_info_id = t1.id) as enroll_count FROM activity_info t1
         LEFT JOIN xjr_dictionary_detail t2 ON t1.type = t2.code
         LEFT JOIN company_coop t3 ON t1.enterprise_id = t3.id