第二课堂bug修复

src/main/java/com/xjrsoft/module/courseTable/controller/SecondCourseController.java

@@ -223,7 +223,9 @@ public class SecondCourseController {
                     setRoleType("学生");
                 }
                 setUserName(listVo.getUserName());
-                setCreateDate(sdf.format(listVo.getCreateDate()));
+                if(listVo.getCreateDate() != null){
+                    setCreateDate(sdf.format(listVo.getCreateDate()));
+                }
             }});
         }
 

src/main/java/com/xjrsoft/module/courseTable/service/impl/SecondCourseServiceImpl.java

@@ -31,6 +31,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -56,16 +57,19 @@ public class SecondCourseServiceImpl extends MPJBaseServiceImpl<SecondCourseMapp
     public Boolean add(AddSecondCourseDto dto) {
         SecondCourse secondCourse = BeanUtil.toBean(dto, SecondCourse.class);
         secondCourse.setEnrollRange(JSONUtil.toJsonStr(dto.getSecondCourseEnrollRangeList()));
+        secondCourse.setCreateDate(new Date());
         courseMapper.insert(secondCourse);
-        if(secondCourse.getSecondCourseEnrollList() != null){
+        if(secondCourse.getSecondCourseTimeList() != null){
             for (SecondCourseTime secondCourseTime : secondCourse.getSecondCourseTimeList()) {
                 secondCourseTime.setSecondCourseId(secondCourse.getId());
+                secondCourseTime.setCreateDate(new Date());
                 courseTimeMapper.insert(secondCourseTime);
             }
         }
         if(secondCourse.getSecondCourseEnrollRangeList() != null){
             for (SecondCourseEnrollRange secondCourseEnrollRange : secondCourse.getSecondCourseEnrollRangeList()) {
                 secondCourseEnrollRange.setSecondCourseId(secondCourse.getId());
+                secondCourseEnrollRange.setCreateDate(new Date());
                 enrollRangeMapper.insert(secondCourseEnrollRange);
             }
         }
@@ -78,6 +82,7 @@ public class SecondCourseServiceImpl extends MPJBaseServiceImpl<SecondCourseMapp
     public Boolean update(UpdateSecondCourseDto dto) {
         SecondCourse secondCourse = BeanUtil.toBean(dto, SecondCourse.class);
         secondCourse.setEnrollRange(JSONUtil.toJsonStr(dto.getSecondCourseEnrollRangeList()));
+        secondCourse.setModifyDate(new Date());
         courseMapper.updateById(secondCourse);
         //********************************* SecondCourseTime  增删改  开始 *******************************************/
         {
@@ -92,12 +97,14 @@ public class SecondCourseServiceImpl extends MPJBaseServiceImpl<SecondCourseMapp
             for (SecondCourseTime secondCourseTime : secondCourse.getSecondCourseTimeList()) {
                 //如果不等于空则修改
                 if (secondCourseTime.getId() != null) {
+                    secondCourseTime.setModifyDate(new Date());
                     courseTimeMapper.updateById(secondCourseTime);
                 }
                 //如果等于空 则新增
                 else {
                     //已经不存在的id 删除
                     secondCourseTime.setSecondCourseId(secondCourse.getId());
+                    secondCourseTime.setCreateDate(new Date());
                     courseTimeMapper.insert(secondCourseTime);
                 }
             }
@@ -121,12 +128,14 @@ public class SecondCourseServiceImpl extends MPJBaseServiceImpl<SecondCourseMapp
             for (SecondCourseEnrollRange secondCourseEnrollRange : secondCourse.getSecondCourseEnrollRangeList()) {
                 //如果不等于空则修改
                 if (secondCourseEnrollRange.getId() != null) {
+                    secondCourseEnrollRange.setModifyDate(new Date());
                     enrollRangeMapper.updateById(secondCourseEnrollRange);
                 }
                 //如果等于空 则新增
                 else {
                     //已经不存在的id 删除
                     secondCourseEnrollRange.setSecondCourseId(secondCourse.getId());
+                    secondCourseEnrollRange.setCreateDate(new Date());
                     enrollRangeMapper.insert(secondCourseEnrollRange);
                 }
             }

src/main/resources/mapper/courseTable/SecondCourseMapper.xml

@@ -25,6 +25,14 @@
         (SELECT id FROM base_student WHERE user_id = t1.user_id) AS student_id FROM second_course_enroll t1
         INNER JOIN xjr_user t2 ON t1.user_id = t2.id
         WHERE t1.delete_mark = 0 AND t1.second_course_id = #{dto.secondCourseId}
+        <if test="dto.roleId != null">
+            <if test="dto.roleId == 2">
+                and (select id from base_teacher where user_id = t1.user_id) is not null
+            </if>
+            <if test="dto.roleId == 3">
+                and (SELECT id FROM base_student WHERE user_id = t1.user_id) is not null
+            </if>
+        </if>
     </select>
     <select id="getEnrollList" parameterType="com.xjrsoft.module.courseTable.dto.SecondCourseEnrollPageDto" resultType="com.xjrsoft.module.courseTable.vo.SecondCourseEnrollVo">
         SELECT t1.id,t1.status,t2.name,t1.create_date,t2.user_name,t2.mobile,t1.user_id,