bug修复调整

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

@@ -185,9 +185,7 @@ public class ActivityInfoController {
     @ApiOperation(value = "修改活动信息")
     @SaCheckPermission("activityinfo:edit")
     public RT<Boolean> update(@Valid @RequestBody UpdateActivityInfoDto dto){
-
-        ActivityInfo activityInfo = BeanUtil.toBean(dto, ActivityInfo.class);
-        return RT.ok(activityInfoService.update(activityInfo));
+        return RT.ok(activityInfoService.update(dto));
 
     }
 

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

@@ -4,6 +4,7 @@ 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.dto.UpdateActivityInfoDto;
 import com.xjrsoft.module.activity.entity.ActivityInfo;
 import com.xjrsoft.module.activity.vo.ActivityInfoPageVo;
 
@@ -27,10 +28,9 @@ public interface IActivityInfoService extends MPJBaseService<ActivityInfo> {
     /**
     * 更新
     *
-    * @param activityInfo
     * @return
     */
-    Boolean update(ActivityInfo activityInfo);
+    Boolean update(UpdateActivityInfoDto dto);
 
     /**
     * 删除

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

@@ -6,6 +6,7 @@ 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.dto.UpdateActivityInfoDto;
 import com.xjrsoft.module.activity.entity.ActivityEnroll;
 import com.xjrsoft.module.activity.entity.ActivityEnrollRange;
 import com.xjrsoft.module.activity.entity.ActivityInfo;
@@ -14,6 +15,7 @@ import com.xjrsoft.module.activity.mapper.ActivityEnrollRangeMapper;
 import com.xjrsoft.module.activity.mapper.ActivityInfoMapper;
 import com.xjrsoft.module.activity.service.IActivityInfoService;
 import com.xjrsoft.module.activity.vo.ActivityInfoPageVo;
+import com.yomahub.liteflow.util.JsonUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,7 +48,7 @@ public class ActivityInfoServiceImpl extends MPJBaseServiceImpl<ActivityInfoMapp
                 activityEnrollRange.setActivityInfoId(activityInfo.getId());
                 activityInfoActivityEnrollRangeMapper.insert(activityEnrollRange);
             }
-            activityInfo.setEnrollRange(dto.getActivityEnrollRangeList().toString());
+            activityInfo.setEnrollRange(JsonUtil.toJsonString(dto.getActivityEnrollRangeList()));
         }
         activityInfoActivityInfoMapper.insert(activityInfo);
         return true;
@@ -54,7 +56,9 @@ public class ActivityInfoServiceImpl extends MPJBaseServiceImpl<ActivityInfoMapp
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean update(ActivityInfo activityInfo) {
+    public Boolean update(UpdateActivityInfoDto dto) {
+        ActivityInfo activityInfo = BeanUtil.toBean(dto, ActivityInfo.class);
+        activityInfo.setEnrollRange(JsonUtil.toJsonString(dto.getActivityEnrollRangeList()));
         activityInfoActivityInfoMapper.updateById(activityInfo);
         //********************************* ActivityEnrollRange  增删改  开始 *******************************************/
         {

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

@@ -15,16 +15,11 @@
     </select>
 
     <select id="getList" parameterType="com.xjrsoft.module.activity.dto.ActivityEnrollPageDto" resultType="com.xjrsoft.module.activity.vo.ActivityEnrollPageVo">
-        SELECT t1.id,t1.status,t2.name,t1.create_date,t2.user_name,t2.mobile,t1.activity_info_id,
-        (select id from base_teacher where user_id = t1.user_id) as teacher_id,
-        (select id from base_student where user_id = t1.user_id) as student_id FROM activity_enroll t1
+        SELECT t1.id,t1.status,t2.name,t1.create_date,t2.user_name,t2.mobile,t1.activity_info_id FROM activity_enroll t1
         INNER JOIN xjr_user t2 ON t1.user_id = t2.id
         WHERE t1.delete_mark = 0 AND t1.activity_info_id = #{dto.activityInfoId}
         <if test="dto.status != null">
             and t1.status = #{dto.status}
         </if>
-        <if test="dto.loginUserId != null">
-            and t1.user_id = #{dto.loginUserId}
-        </if>
     </select>
 </mapper>