活动信息调整

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

@@ -13,6 +13,9 @@ import com.xjrsoft.module.activity.entity.ActivityInfo;
 import com.xjrsoft.module.activity.service.IActivityInfoService;
 import com.xjrsoft.module.activity.vo.ActivityInfoPageVo;
 import com.xjrsoft.module.activity.vo.ActivityInfoVo;
+import com.xjrsoft.module.base.service.IBaseClassService;
+import com.xjrsoft.module.concat.service.IXjrUserService;
+import com.xjrsoft.module.organization.service.IDepartmentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -42,6 +45,10 @@ public class ActivityInfoController {
 
 
     private final IActivityInfoService activityInfoService;
+    private final IBaseClassService classService;
+    private final IDepartmentService departmentService;
+    private final IXjrUserService xjrUserService;
+
 
     @GetMapping(value = "/page")
     @ApiOperation(value="活动信息列表(分页)")
@@ -50,6 +57,8 @@ public class ActivityInfoController {
 
         Page<ActivityInfoPageVo> page = activityInfoService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<ActivityInfoPageVo> pageOutput = ConventPage.getPageOutput(page, ActivityInfoPageVo.class);
+        for (ActivityInfoPageVo item : pageOutput.getList()) {
+        }
         return RT.ok(pageOutput);
     }
 
@@ -69,8 +78,8 @@ public class ActivityInfoController {
     @ApiOperation(value = "新增活动信息")
     @SaCheckPermission("activityinfo:add")
     public RT<Boolean> add(@Valid @RequestBody AddActivityInfoDto dto){
-        ActivityInfo activityInfo = BeanUtil.toBean(dto, ActivityInfo.class);
-        boolean isSuccess = activityInfoService.add(activityInfo);
+
+        boolean isSuccess = activityInfoService.add(dto);
         return RT.ok(isSuccess);
     }
 
@@ -89,7 +98,6 @@ public class ActivityInfoController {
     @SaCheckPermission("activityinfo:delete")
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
         return RT.ok(activityInfoService.delete(ids));
-
     }
 
 }

src/main/java/com/xjrsoft/module/activity/dto/AddActivityInfoDto.java

@@ -71,11 +71,6 @@ public class AddActivityInfoDto implements Serializable {
     @ApiModelProperty("封面图片")
     private String coverFileId;
     /**
-    * 报名范围
-    */
-    @ApiModelProperty("报名范围")
-    private String enrollRange;
-    /**
     * 状态(0:未发布 1:报名中 2:报名结束 3:活动结束)
     */
     @ApiModelProperty("状态(0:未发布 1:报名中 2:报名结束 3:活动结束)")
@@ -88,7 +83,7 @@ public class AddActivityInfoDto implements Serializable {
     /**
     * 合作企业
     */
-    @ApiModelProperty("合作企业")
+    @ApiModelProperty("合作企业(校企活动时填写)")
     private Long enterpriseId;
     /**
     * 1:校企合作活动 2:赛事活动
@@ -101,9 +96,4 @@ public class AddActivityInfoDto implements Serializable {
     */
     @ApiModelProperty("activityEnrollRange子表")
     private List<AddActivityEnrollRangeDto> activityEnrollRangeList;
-    /**
-    * activityEnroll
-    */
-    @ApiModelProperty("activityEnroll子表")
-    private List<AddActivityEnrollDto> activityEnrollList;
 }

src/main/java/com/xjrsoft/module/activity/service/IActivityInfoService.java

@@ -3,6 +3,7 @@ package com.xjrsoft.module.activity.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.activity.dto.ActivityInfoPageDto;
+import com.xjrsoft.module.activity.dto.AddActivityInfoDto;
 import com.xjrsoft.module.activity.entity.ActivityInfo;
 import com.xjrsoft.module.activity.vo.ActivityInfoPageVo;
 import org.apache.ibatis.annotations.Param;
@@ -20,10 +21,9 @@ public interface IActivityInfoService extends MPJBaseService<ActivityInfo> {
     /**
     * 新增
     *
-    * @param activityInfo
     * @return
     */
-    Boolean add(ActivityInfo activityInfo);
+    Boolean add(AddActivityInfoDto dto);
 
     /**
     * 更新

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

@@ -1,9 +1,11 @@
 package com.xjrsoft.module.activity.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.module.activity.dto.ActivityInfoPageDto;
+import com.xjrsoft.module.activity.dto.AddActivityInfoDto;
 import com.xjrsoft.module.activity.entity.ActivityEnroll;
 import com.xjrsoft.module.activity.entity.ActivityEnrollRange;
 import com.xjrsoft.module.activity.entity.ActivityInfo;
@@ -37,15 +39,14 @@ public class ActivityInfoServiceImpl extends MPJBaseServiceImpl<ActivityInfoMapp
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean add(ActivityInfo activityInfo) {
+    public Boolean add(AddActivityInfoDto dto) {
+        ActivityInfo activityInfo = BeanUtil.toBean(dto, ActivityInfo.class);
         activityInfoActivityInfoMapper.insert(activityInfo);
-        for (ActivityEnrollRange activityEnrollRange : activityInfo.getActivityEnrollRangeList()) {
-            activityEnrollRange.setActivityInfoId(activityInfo.getId());
-            activityInfoActivityEnrollRangeMapper.insert(activityEnrollRange);
-        }
-        for (ActivityEnroll activityEnroll : activityInfo.getActivityEnrollList()) {
-            activityEnroll.setActivityInfoId(activityInfo.getId());
-            activityInfoActivityEnrollMapper.insert(activityEnroll);
+        if(activityInfo.getActivityEnrollRangeList() != null){
+            for (ActivityEnrollRange activityEnrollRange : activityInfo.getActivityEnrollRangeList()) {
+                activityEnrollRange.setActivityInfoId(activityInfo.getId());
+                activityInfoActivityEnrollRangeMapper.insert(activityEnrollRange);
+            }
         }
 
         return true;