通知列表

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -8,8 +8,12 @@ import com.zhongzheng.modules.grade.service.IUserPeriodStatusService;
 import com.zhongzheng.modules.grade.vo.*;
 import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
 import com.zhongzheng.modules.user.domain.User;
+import com.zhongzheng.modules.user.domain.UserPlan;
+import com.zhongzheng.modules.user.domain.UserStudyRecordPhoto;
+import com.zhongzheng.modules.user.service.IUserStudyRecordPhotoService;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import com.zhongzheng.modules.user.vo.SubjectStudyRecordVo;
+import com.zhongzheng.modules.user.vo.UserStudyRecordPhotoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -44,6 +48,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     @Autowired
     private IUserPeriodStatusService userPeriodStatusService;
 
+    @Autowired
+    private IUserStudyRecordPhotoService userStudyRecordPhotoService;
+
     @Override
     public ClassGradeUserVo queryById(Long id){
         ClassGradeUser db = this.baseMapper.selectById(id);
@@ -198,7 +205,13 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                             userPeriodQueryBo.setUserId(classPeriodSectionVo.getUserId());
                             userPeriodQueryBo.setChapterId(classPeriodChapterVo.getId());
                             userPeriodQueryBo.setModuleId(classPeriodVo.getId());
-                            classPeriodSectionVo.setUserPeriodStatusVos(userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo));
+                            List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
+                            for (UserPeriodStatusVo userPeriodStatusVo : userPeriodStatusVos) {
+                                LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
+                                lqw.eq(UserStudyRecordPhoto::getRecordId,userPeriodStatusVo.getPeriodId());
+                                userPeriodStatusVo.setUserStudyRecordPhotoList(entity2PhotoVo(userStudyRecordPhotoService.list(lqw)));
+                            }
+                            classPeriodSectionVo.setUserPeriodStatusVos(userPeriodStatusVos);
                         }
                         classPeriodSectionVos.addAll(baseMapper.listperiodExam(classPeriodVo.getId(), bo.getGoodsId(),classPeriodVo.getCourseId(), bo.getUserId()));
                         classPeriodChapterVo.setClassPeriodSectionList(classPeriodSectionVos);
@@ -215,7 +228,13 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     userPeriodQueryBo.setGoodsId(bo.getGoodsId());
                     userPeriodQueryBo.setUserId(classPeriodSectionVo.getUserId());
                     userPeriodQueryBo.setChapterId(classPeriodVo.getId());
-                    classPeriodSectionVo.setUserPeriodStatusVos(userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo));
+                    List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
+                    for (UserPeriodStatusVo userPeriodStatusVo : userPeriodStatusVos) {
+                        LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
+                        lqw.eq(UserStudyRecordPhoto::getRecordId,userPeriodStatusVo.getPeriodId());
+                        userPeriodStatusVo.setUserStudyRecordPhotoList(entity2PhotoVo(userStudyRecordPhotoService.list(lqw)));
+                    }
+                    classPeriodSectionVo.setUserPeriodStatusVos(userPeriodStatusVos);
                 }
                 List<ClassPeriodSectionVo> classPeriodSectionVos1 = baseMapper.listPeriodSectionExam(classPeriodVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId());
                 for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos1) {
@@ -225,7 +244,13 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     userPeriodQueryBo.setUserId(bo.getUserId());
                     userPeriodQueryBo.setGoodsId(bo.getGoodsId());
                     userPeriodQueryBo.setChapterId(classPeriodVo.getId());
-                    classPeriodSectionVo.setUserPeriodStatusVos(userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo));
+                    List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
+                    for (UserPeriodStatusVo userPeriodStatusVo : userPeriodStatusVos) {
+                        LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
+                        lqw.eq(UserStudyRecordPhoto::getRecordId,userPeriodStatusVo.getPeriodId());
+                        userPeriodStatusVo.setUserStudyRecordPhotoList(entity2PhotoVo(userStudyRecordPhotoService.list(lqw)));
+                    }
+                    classPeriodSectionVo.setUserPeriodStatusVos(userPeriodStatusVos);
                 }
                 classPeriodSectionVos.addAll(classPeriodSectionVos1);
                 classPeriodVo.setClassPeriodSectionList(classPeriodSectionVos);
@@ -236,10 +261,36 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     userPeriodQueryBo.setGoodsId(bo.getGoodsId());
                     userPeriodQueryBo.setUserId(classPeriodVo.getUserId());
                     userPeriodQueryBo.setSectionId(classPeriodVo.getId());
-                    classPeriodVo.setUserPeriodStatusVos(userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo));
+                List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
+                for (UserPeriodStatusVo userPeriodStatusVo : userPeriodStatusVos) {
+                    LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
+                    lqw.eq(UserStudyRecordPhoto::getRecordId,userPeriodStatusVo.getPeriodId());
+                    userPeriodStatusVo.setUserStudyRecordPhotoList(entity2PhotoVo(userStudyRecordPhotoService.list(lqw)));
+                }
+                    classPeriodVo.setUserPeriodStatusVos(userPeriodStatusVos);
             }
 
         }
         return classPeriodVos;
     }
+
+    /**
+     * 实体类转化成视图对象
+     *
+     * @param collection 实体类集合
+     * @return
+     */
+    private List<UserStudyRecordPhotoVo> entity2PhotoVo(Collection<UserStudyRecordPhoto> collection) {
+        List<UserStudyRecordPhotoVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, UserStudyRecordPhotoVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<UserStudyRecordPhoto> page = (Page<UserStudyRecordPhoto>)collection;
+            Page<UserStudyRecordPhotoVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
 }

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

@@ -23,6 +23,8 @@ public class UserStudyRecordPhoto implements Serializable {
 
 private static final long serialVersionUID=1L;
 
+    /** $column.columnComment */
+    private Long id;
     /** 学习记录id */
     @TableId(value = "record_id")
     private Long recordId;

zhongzheng-system/src/main/resources/mapper/modules/course/TeacherProjectMapper.xml

@@ -23,22 +23,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryTeacher" parameterType="Long"  resultMap="TeacherProjectVo">
         SELECT
         p.*,
+        t.project_name,
+        t.id as project_id,
+        e.id as education_id,
         e.education_name
         FROM
-        major_project j
-        LEFT JOIN course_project_type p on p.id=j.project_id
-        LEFT JOIN course_education_type e ON p.education_id = e.id
-        where 1=1
-        <if test="status != null and status.size()!=0 ">
-            AND p.status in
-            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
+        teacher_project p
+        LEFT JOIN course_project_type t on p.project_id=t.id
+        LEFT JOIN course_education_type e on t.education_id = e.id
+        WHERE
+        1 =1
         <if test="id != null and id!=0 ">
-            AND j.major_id = #{id}
+            AND p.teacher_id = #{id}
         </if>
-        order by j.update_time desc
+        order by p.update_time desc
     </select>
 
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/grade/UserPeriodStatusMapper.xml

@@ -15,7 +15,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
-    <select id="selectPeriodStatus" parameterType="com.zhongzheng.modules.grade.bo.UserPeriodQueryBo" resultMap="UserPeriodStatusResult">
+
+    <resultMap type="com.zhongzheng.modules.grade.vo.UserPeriodStatusVo" id="UserPeriodStatusVo">
+        <result property="status" column="status"/>
+        <result property="recordStartTime" column="record_start_time"/>
+        <result property="recordEndTime" column="record_end_time"/>
+        <result property="id" column="id"/>
+        <result property="periodId" column="period_id"/>
+        <result property="periodStatus" column="period_status"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+    <select id="selectPeriodStatus" parameterType="com.zhongzheng.modules.grade.bo.UserPeriodQueryBo" resultMap="UserPeriodStatusVo">
         SELECT
             ups.*
         FROM