xiangpei
2024-03-15 551fa4de5446f9564de08e666740fceccfd5ba6a
成绩统计详情增加时间查询
6个文件已修改
33 ■■■■ 已修改文件
src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mindskip/xzs/repository/ExamPaperAnswerMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mindskip/xzs/viewmodel/admin/paper/ExamPaperGradeQuery.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ExamPaperAnswerMapper.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java
@@ -121,8 +121,8 @@
    }
    @RequestMapping(value = "/details", method = RequestMethod.POST)
    public RestResponse<PageInfo<ExamPaperAnswer>> selectSource(@RequestBody ScoreTemplatesCountVO scoreTemplatesCountVO) throws Exception {
      return RestResponse.ok(examPaperAnswerService.getByCreatUser(scoreTemplatesCountVO));
    public RestResponse<PageInfo<ExamPaperAnswer>> selectSource(@RequestBody ExamPaperGradeQuery query) throws Exception {
      return RestResponse.ok(examPaperAnswerService.getByCreatUser(query));
    }
src/main/java/com/mindskip/xzs/repository/ExamPaperAnswerMapper.java
@@ -7,6 +7,7 @@
import com.mindskip.xzs.domain.vo.ScoreTemplatesCountVO;
import com.mindskip.xzs.domain.vo.TeamplatesUserExcelVO;
import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradePageRequestVM;
import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradeQuery;
import com.mindskip.xzs.viewmodel.student.exampaper.ExamPaperAnswerPageVM;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -37,7 +38,7 @@
    List<ExamPaperAnswer> getByScorePaperIdAndUserId(@Param("scoreTemplatesUserCounts")List<ScoreTemplatesUserCount> scoreTemplatesUserCounts);
    List<ExamPaperAnswer> getByCreatUser(ScoreTemplatesCountVO scoreTemplatesCountVO);
    List<ExamPaperAnswer> getByCreatUser(@Param("query") ExamPaperGradeQuery query);
    List<ExamPaperAnswer> getByExamPaperIds(@Param("ids")List<Integer> ids);
src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java
@@ -4,6 +4,7 @@
import com.mindskip.xzs.domain.*;
import com.mindskip.xzs.domain.vo.ScoreTemplatesCountVO;
import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradePageRequestVM;
import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradeQuery;
import com.mindskip.xzs.viewmodel.student.exam.ExamPaperSubmitVM;
import com.mindskip.xzs.viewmodel.student.exampaper.ExamPaperAnswerPageVM;
@@ -61,5 +62,5 @@
    List<ExamPaperAnswer> getByScorePaperIdAndUserId(List<ScoreTemplatesUserCount> scoreTemplatesUserCounts);
    PageInfo<ExamPaperAnswer> getByCreatUser(ScoreTemplatesCountVO scoreTemplatesCountVO);
    PageInfo<ExamPaperAnswer> getByCreatUser(ExamPaperGradeQuery query);
}
src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java
@@ -22,6 +22,7 @@
import com.mindskip.xzs.utility.ExamUtil;
import com.mindskip.xzs.utility.JsonUtil;
import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradePageRequestVM;
import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradeQuery;
import com.mindskip.xzs.viewmodel.student.exam.ExamPaperSubmitItemVM;
import com.mindskip.xzs.viewmodel.student.exam.ExamPaperSubmitVM;
import com.mindskip.xzs.viewmodel.student.exampaper.ExamPaperAnswerPageVM;
@@ -307,8 +308,9 @@
    }
    @Override
    public PageInfo<ExamPaperAnswer> getByCreatUser(ScoreTemplatesCountVO scoreTemplatesCountVO) {
        return PageHelper.startPage(scoreTemplatesCountVO.getPageIndex(), scoreTemplatesCountVO.getPageSize(), "id desc").doSelectPageInfo(() ->
                examPaperAnswerMapper.getByCreatUser(scoreTemplatesCountVO));
    public PageInfo<ExamPaperAnswer> getByCreatUser(ExamPaperGradeQuery query) {
        query.setFullTime();
        return PageHelper.startPage(query.getPageIndex(), query.getPageSize(), "id desc").doSelectPageInfo(() ->
                examPaperAnswerMapper.getByCreatUser(query));
    }
}
src/main/java/com/mindskip/xzs/viewmodel/admin/paper/ExamPaperGradeQuery.java
@@ -26,6 +26,11 @@
     */
    private Integer deptId;
    /**
     * 参考人
     */
    private Integer createUser;
    public void setFullTime() {
        // 完善时间范围
        if (Objects.nonNull(start)) {
src/main/resources/mapper/ExamPaperAnswerMapper.xml
@@ -346,10 +346,18 @@
        </foreach>
      </if>
    </select>
    <select id="getByCreatUser" resultMap="BaseResultMap" parameterType="com.mindskip.xzs.domain.vo.ScoreTemplatesCountVO">
      select
      <include refid="Base_Column_List4"/>
      from t_exam_paper_answer where create_user = #{createUser} and create_time between '2023-01-01'and '2023-12-31'
      from
           t_exam_paper_answer
      <where>
        AND create_user = #{query.createUser}
        <if test="query.start != null and query.end != null">
          AND create_time between #{query.start} and #{query.end}
        </if>
      </where>
    </select>
  <select id="getByExamPaperIds" resultMap="BaseResultMap" parameterType="list">