活動任務接口完善

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityConfigurationCourseMapper.java

@@ -11,5 +11,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ActivityConfigurationCourseMapper extends BaseMapper<ActivityConfigurationCourse> {
 
+    /**
+     * 添加课程
+     *
+     * @param activityConfigurationCourse 课程绑定
+     *
+     */
     void insertCourse(ActivityConfigurationCourse activityConfigurationCourse);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityGradePrivilegeCouresMapper.java

@@ -11,5 +11,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ActivityGradePrivilegeCouresMapper extends BaseMapper<ActivityGradePrivilegeCoures> {
 
+    /**
+     * 添加课程
+     *
+     * @param setCourseId 课程绑定
+     *
+     */
     void insertCouse(ActivityGradePrivilegeCoures setCourseId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityGradePrivilegeMapper.java

@@ -14,5 +14,11 @@ import java.util.List;
  */
 public interface ActivityGradePrivilegeMapper extends BaseMapper<ActivityGradePrivilege> {
 
+    /**
+     * 查询特技权限
+     *
+     * @param id 权限id
+     *
+     */
     List<ActivityGradePrivilegeVo> selectGradePriList(Long id);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityTaskTimeMapper.java

@@ -11,4 +11,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ActivityTaskTimeMapper extends BaseMapper<ActivityTaskTime> {
 
+    /**
+     * 添加考试范围时间段
+     *
+     * @param toBean 时间范围分数
+     *
+     */
+    void inserTaskTime(ActivityTaskTime toBean);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityTaskTimeService.java

@@ -49,4 +49,6 @@ public interface IActivityTaskTimeService extends IService<ActivityTaskTime> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    void inserTaskTime(ActivityTaskTime toBean);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityGradeServiceImpl.java

@@ -151,18 +151,17 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
         activityGradePrivilegeEditBos.stream().forEach(p ->{
                 //修改未删除
                 if (p.getId() != null && p.getStatus() == 1) {
-                    ActivityGradePrivilegeEditBo activityGradePrivilege = BeanUtil.toBean(p, ActivityGradePrivilegeEditBo.class);
-                    activityGradePrivilegeService.updateByEditBo(activityGradePrivilege);
-                    activityGradePrivilegeCouresService.removeById(activityGradePrivilege.getId());
-                    Arrays.stream(p.getCourseIds()).forEach(c -> activityGradePrivilegeCouresService
-                            .save(new ActivityGradePrivilegeCoures().setPrivilegeId(activityGradePrivilege.getId())
+                    activityGradePrivilegeService.updateByEditBo(p);
+                    activityGradePrivilegeCouresService.removeById(p.getId());
+                    Arrays.stream(p.getCourseIds()).forEach(c -> activityGradePrivilegeCouresMapper
+                            .insertCouse(new ActivityGradePrivilegeCoures().setPrivilegeId(p.getId())
                                     .setCourseId(Convert.toLong(c))));
                   //  增加
                 }else if(p.getId() == null){
                     ActivityGradePrivilege activityGradePrivilege = BeanUtil.toBean(p, ActivityGradePrivilege.class);
                     activityGradePrivilegeService.save(activityGradePrivilege);
-                    Arrays.stream(p.getCourseIds()).forEach(c -> activityGradePrivilegeCouresService
-                            .save(new ActivityGradePrivilegeCoures().setPrivilegeId(activityGradePrivilege.getId())
+                    Arrays.stream(p.getCourseIds()).forEach(c -> activityGradePrivilegeCouresMapper
+                            .insertCouse(new ActivityGradePrivilegeCoures().setPrivilegeId(activityGradePrivilege.getId())
                                     .setCourseId(Convert.toLong(c))));
                     //删除
                 }else {

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityTaskServiceImpl.java

@@ -40,17 +40,34 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
     @Override
     public ActivityTaskVo queryById(Long id){
         ActivityTask db = this.baseMapper.selectById(id);
+
+        ActivityTaskVo activityTaskTimeMove = activityTaskTimeMove(db);
+
+        return activityTaskTimeMove;
+    }
+
+    private ActivityTaskVo activityTaskTimeMove(ActivityTask db) {
         ActivityTaskVo activityTaskVo = BeanUtil.toBean(db, ActivityTaskVo.class);
         if (activityTaskVo.getId() != null && activityTaskVo.getTaskType() == 5) {
             LambdaQueryWrapper<ActivityTaskTime> lqwTime = Wrappers.lambdaQuery();
             lqwTime.eq(db.getId() != null,ActivityTaskTime::getTaskId,db.getId());
-            List<ActivityTaskTimeVo> activityTaskTimeVo = new ArrayList<>();
-            BeanUtil.copyProperties(activityTaskTimeService.list(lqwTime),activityTaskTimeVo);
+            List<ActivityTaskTimeVo> activityTaskTimeVo = entity2TimeActivityVo(activityTaskTimeService.list(lqwTime));
             activityTaskVo.setActivityTaskTimeVo(activityTaskTimeVo);
         }
         return activityTaskVo;
     }
-
+    /**
+     * 实体类转化成视图对象
+     *
+     * @param collection 实体类集合
+     * @return
+     */
+    private List<ActivityTaskTimeVo> entity2TimeActivityVo(Collection<ActivityTaskTime> collection) {
+        List<ActivityTaskTimeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ActivityTaskTimeVo.class))
+                .collect(Collectors.toList());
+        return voList;
+    }
     @Override
     public List<ActivityTaskVo> queryList(ActivityTaskQueryBo bo) {
         LambdaQueryWrapper<ActivityTask> lqw = Wrappers.lambdaQuery();
@@ -63,32 +80,31 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
         lqw.eq(bo.getLongTime() != null, ActivityTask::getLongTime, bo.getLongTime());
         lqw.eq(bo.getCountDay() != null, ActivityTask::getCountDay, bo.getCountDay());
         lqw.eq(bo.getStatus() != null, ActivityTask::getStatus, bo.getStatus());
-        List<ActivityTaskVo> list = new ArrayList<>();
-        BeanUtil.copyProperties(this.list(lqw),list);
-        list.stream().forEach(l -> {
+        List<ActivityTaskVo> activityTaskVos = entity2Vo(this.list(lqw));
+        activityTaskVos.stream().forEach(l -> {
             if (l.getId() != null && l.getTaskType() == 5) {
                 LambdaQueryWrapper<ActivityTaskTime> lqwTime = Wrappers.lambdaQuery();
                 lqwTime.eq(l.getId() != null,ActivityTaskTime::getTaskId,l.getId());
-                List<ActivityTaskTimeVo> activityTaskTimeVo = new ArrayList<>();
-                BeanUtil.copyProperties(activityTaskTimeService.list(lqwTime),activityTaskTimeVo);
+                List<ActivityTaskTimeVo> activityTaskTimeVo = entity2TimeActivityVo(activityTaskTimeService.list(lqwTime));
                 l.setActivityTaskTimeVo(activityTaskTimeVo);
             }
         });
-        return entity2Vo(list);
+        return activityTaskVos;
     }
 
+
     /**
     * 实体类转化成视图对象
     *
     * @param collection 实体类集合
     * @return
     */
-    private List<ActivityTaskVo> entity2Vo(Collection<ActivityTaskVo> collection) {
+    private List<ActivityTaskVo> entity2Vo(Collection<ActivityTask> collection) {
         List<ActivityTaskVo> voList = collection.stream()
                 .map(any -> BeanUtil.toBean(any, ActivityTaskVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<ActivityTaskVo> page = (Page<ActivityTaskVo>)collection;
+            Page<ActivityTask> page = (Page<ActivityTask>)collection;
             Page<ActivityTaskVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
@@ -101,10 +117,11 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
     public Boolean insertByAddBo(ActivityTaskAddBo bo) {
         ActivityTask add = BeanUtil.toBean(bo, ActivityTask.class);
         validEntityBeforeSave(add);
+        boolean save = this.save(add);
         if (bo.getTaskType() != null && bo.getTaskType() == 5){
-            bo.getActivityTaskTimeAddBo().stream().forEach(t -> activityTaskTimeService.save(BeanUtil.toBean(t,ActivityTaskTime.class)));
+            bo.getActivityTaskTimeAddBo().stream().forEach(t -> activityTaskTimeService.inserTaskTime(BeanUtil.toBean(t,ActivityTaskTime.class).setTaskId(add.getId())));
         }
-        return this.save(add);
+        return save;
     }
 
     @Override
@@ -114,7 +131,7 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
         //活动为考试时有分数区域得到等级分数
         if (bo.getTaskType() != null && bo.getTaskType() == 5){
             activityTaskTimeService.removeById(bo.getId());
-            bo.getActivityTaskTimeEditBoList().stream().forEach(t -> activityTaskTimeService.save(BeanUtil.toBean(t,ActivityTaskTime.class)));
+            bo.getActivityTaskTimeEditBoList().stream().forEach(t -> activityTaskTimeService.inserTaskTime(BeanUtil.toBean(t,ActivityTaskTime.class).setTaskId(bo.getId())));
         }
         return this.updateById(update);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityTaskTimeServiceImpl.java

@@ -94,4 +94,9 @@ public class ActivityTaskTimeServiceImpl extends ServiceImpl<ActivityTaskTimeMap
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public void inserTaskTime(ActivityTaskTime toBean) {
+        baseMapper.inserTaskTime(toBean);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementTimeAddBo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 /**
  * 考试时间段安排添加对象 exam_arrangement_time
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-25
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementTimeEditBo.java

@@ -10,7 +10,7 @@ import java.util.Date;
 /**
  * 考试时间段安排编辑对象 exam_arrangement_time
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-25
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementTimeQueryBo.java

@@ -14,7 +14,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 考试时间段安排分页查询对象 exam_arrangement_time
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-25
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamArrangementTimeMapper.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 考试时间段安排Mapper接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-25
  */
 public interface ExamArrangementTimeMapper extends BaseMapper<ExamArrangementTime> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamArrangementTimeService.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * 考试时间段安排Service接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-25
  */
 public interface IExamArrangementTimeService extends IService<ExamArrangementTime> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamArrangementTimeServiceImpl.java

@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 /**
  * 考试时间段安排Service业务层处理
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-25
  */
 @Service

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamArrangementTimeVo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 考试时间段安排视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-25
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamUserVo.java

@@ -9,7 +9,7 @@ import lombok.Data;
 /**
  * 用户视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-25
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserAddBo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 /**
  * 用户添加对象 user
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-25
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserEditBo.java

@@ -10,7 +10,7 @@ import java.util.Date;
 /**
  * 用户编辑对象 user
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-25
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserQueryBo.java

@@ -14,7 +14,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 用户分页查询对象 user
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-25
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/User.java

@@ -12,7 +12,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 用户对象 user
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-05-25
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserMapper.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 用户Mapper接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-25
  */
 public interface UserMapper extends BaseMapper<User> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserService.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * 用户Service接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-25
  */
 public interface IUserService extends IService<User> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserServiceImpl.java

@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 /**
  * 用户Service业务层处理
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-25
  */
 @Service

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 用户视图对象 mall_package
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-25
  */
 @Data

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityTaskTimeMapper.xml

@@ -11,5 +11,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="integral" column="integral"/>
     </resultMap>
 
-
+    <insert id="inserTaskTime" parameterType="map">
+        insert into activity_task_time (
+            task_id,
+            start_range,
+            end_range,
+            integral
+        )values(
+                   #{taskId},
+                   #{startRange},
+                   #{endRange},
+                   #{integral}
+               )
+    </insert>
 </mapper>