fix role status

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

@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ActivityConfigurationCourseMapper extends BaseMapper<ActivityConfigurationCourse> {
 
+    void insertCourse(ActivityConfigurationCourse activityConfigurationCourse);
 }

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

@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ActivityGradePrivilegeCouresMapper extends BaseMapper<ActivityGradePrivilegeCoures> {
 
+    void insertCouse(ActivityGradePrivilegeCoures setCourseId);
 }

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

@@ -102,7 +102,7 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         ArrayList<ActivityAdvertising> activityAdvertisingList = new ArrayList<>();
-        ids.stream().forEach(id -> activityAdvertisingList.add(new ActivityAdvertising().setId(id).setStatus(0)));
+        ids.stream().forEach(id -> activityAdvertisingList.add(new ActivityAdvertising().setId(id).setStatus(0).setUpdateTime(DateUtils.getNowTime())));
         return this.updateBatchById(activityAdvertisingList);
     }
 

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

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.activity.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.activity.bo.ActivityConfigurationAddBo;
 import com.zhongzheng.modules.activity.bo.ActivityConfigurationEditBo;
 import com.zhongzheng.modules.activity.bo.ActivityConfigurationQueryBo;
@@ -75,18 +76,22 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
         int insert = baseMapper.insert(activityConfiguration);
         if (bo.getCoursesId() != null) {
             //绑定课程
-            insertConfigCourse(activityConfiguration, bo.getCoursesId());
+            insertConfigCourse(activityConfiguration.getId(), bo.getCoursesId());
         }
         return true;
     }
 
-    private void insertConfigCourse(ActivityConfiguration activityConfiguration, String[] coursesId) {
-        Arrays.stream(coursesId).forEach(e -> activityConfigurationCourseMapper.insert(new ActivityConfigurationCourse()
-                .setConfigurationId(activityConfiguration.getId()).setCourseId(Convert.toLong(e))));
+    private void insertConfigCourse(Long id, String[] coursesId) {
+        Arrays.stream(coursesId).forEach(e -> {
+            ActivityConfigurationCourse activityConfigurationCourse = new ActivityConfigurationCourse()
+                    .setConfigurationId(id).setCourseId(Convert.toLong(e));
+            activityConfigurationCourseMapper.insertCourse(activityConfigurationCourse);
+        });
     }
 
 
     @Override
+    @Transactional
     public Boolean updateByEditBo(ActivityConfigurationEditBo bo) {
         ActivityConfiguration update = BeanUtil.toBean(bo, ActivityConfiguration.class);
         //修改绑定课程
@@ -114,9 +119,10 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
     }
 
     @Override
+    @Transactional
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         ArrayList<ActivityConfiguration> activityConfigurations = new ArrayList<>();
-        ids.stream().forEach(id -> activityConfigurations.add(new ActivityConfiguration().setId(id).setStatus(0)));
+        ids.stream().forEach(id -> activityConfigurations.add(new ActivityConfiguration().setId(id).setStatus(0).setUpdateTime(DateUtils.getNowTime())));
         return this.updateBatchById(activityConfigurations);
     }
 }

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

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.activity.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.activity.bo.ActivityGradeAddBo;
 import com.zhongzheng.modules.activity.bo.ActivityGradeEditBo;
 import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeEditBo;
@@ -68,13 +69,26 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
         lqw.eq(bo.getNeedIntegralStart() != null, ActivityGrade::getNeedIntegralStart, bo.getNeedIntegralStart());
         lqw.eq(bo.getNeedIntegralEnd() != null, ActivityGrade::getNeedIntegralEnd, bo.getNeedIntegralEnd());
         lqw.eq(StrUtil.isNotBlank(bo.getRemarks()), ActivityGrade::getRemarks, bo.getRemarks());
-        List<ActivityGradeVo> activityGradeVos = selectGradeCourse(this.list(lqw));
+        List<ActivityGrade> list = this.list(lqw);
+        List<ActivityGradeVo> activityGradeVos = selectGradeCourse(list);
         return entity2Vo(activityGradeVos);
     }
 
+    /**
+     * 实体类转化成视图对象
+     *
+     * @param collection 实体类集合
+     * @return
+     */
+    private List<ActivityGradeVo> entity2GradeVo(Collection<ActivityGrade> collection) {
+        List<ActivityGradeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ActivityGradeVo.class))
+                .collect(Collectors.toList());
+        return voList;
+    }
+
     private List<ActivityGradeVo> selectGradeCourse(List<ActivityGrade> list) {
-        List<ActivityGradeVo> activityGradeVos =new ArrayList<>();
-                BeanUtil.copyProperties(list,activityGradeVos);
+        List<ActivityGradeVo> activityGradeVos = entity2GradeVo(list);
         activityGradeVos.stream().forEach(a -> a.setActivityGradePrivilegesVo(activityGradePrivilegeMapper.selectGradePriList(a.getId())));
         return activityGradeVos;
     }
@@ -103,18 +117,22 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
     public Boolean insertByAddBo(ActivityGradeAddBo bo) {
         ActivityGrade add = BeanUtil.toBean(bo, ActivityGrade.class);
         validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        boolean save = this.save(add);
         //添加特权类型
         if (!CollectionUtils.isEmpty(bo.getActivityGradePrivilegeAddBos())) {
             bo.getActivityGradePrivilegeAddBos().stream().forEach(p ->{
                 ActivityGradePrivilege activityGradePrivilege = BeanUtil.toBean(p, ActivityGradePrivilege.class);
+                activityGradePrivilege.setGradeId(add.getId());
                 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))));
             });
         }
         //添加特权绑定的
-        return this.save(add);
+        return save;
     }
 
     @Override

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

@@ -197,7 +197,6 @@ public class ExamArrangementServiceImpl extends ServiceImpl<ExamArrangementMappe
 
     @Override
     public List<ExamUserVo> queryUserList(ExamArrangementQueryBo bo) {
-
         List<ExamUserVo> examUserVos = examArrangementStudentService.queryUserList(bo);
         return examUserVos;
     }

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.ActivityConfigurationCourseMapper">
+<mapper namespace="com.zhongzheng.modules.activity.mapper.ActivityConfigurationCourseMapper">
 
     <resultMap type="com.zhongzheng.modules.activity.domain.ActivityConfigurationCourse" id="ActivityConfigurationCourseResult">
         <result property="configurationId" column="configuration_id"/>
@@ -10,4 +10,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
+
+    <insert id="insertCourse" parameterType="map">
+        insert into activity_configuration_course (
+            configuration_id,
+            course_id
+        )values(
+                   #{configurationId},
+                   #{courseId}
+               )
+    </insert>
+
 </mapper>

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

@@ -9,5 +9,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="courseId" column="course_id"/>
     </resultMap>
 
-
+    <insert id="insertCouse" parameterType="map">
+        insert into activity_grade_privilege_coures (
+            privilege_id,
+            course_id
+        )values(
+                   #{privilegeId},
+                   #{courseId}
+               )
+    </insert>
 </mapper>

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

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="discount" column="discount"/>
         <result property="endTimeSum" column="end_time_sum"/>
         <result property="quantity" column="quantity"/>
+        <result property="status" column="status"/>
         <collection property="courseVo" javaType="java.util.List" resultMap="CourseResult"/>
     </resultMap>
 
@@ -51,6 +52,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             activity_grade_privilege c
                 LEFT JOIN activity_grade_privilege_coures f ON c.id = f.privilege_id
                 LEFT JOIN course e ON f.course_id = e.course_id
-        WHERE c.grade_id = #{id,jdbcType=INTEGER}
+        WHERE c.grade_id = #{id,jdbcType=INTEGER} and c.status != 0
     </select>
 </mapper>