fuliqi
2024-06-28 49132500e04ccca2100f181b523fcdf1202e7334
首页调整
6个文件已修改
50 ■■■■■ 已修改文件
src/main/java/com/ycl/jxkg/controller/admin/DashboardController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ycl/jxkg/mapper/ExamPaperScoreMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ycl/jxkg/service/ExamPaperScoreService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ycl/jxkg/service/impl/ExamPaperScoreServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ExamPaperScoreDetailMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ExamPaperScoreMapper.xml 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ycl/jxkg/controller/admin/DashboardController.java
@@ -30,7 +30,7 @@
        Integer examPaperCount = examPaperService.selectAllCount();
        Integer questionCount = questionService.selectAllCount();
        Integer doExamPaperCount = examPaperScoreService.selectAllCount();
        Integer doQuestionCount = examPaperScoreDetailService.selectAllCount();
        Integer doQuestionCount = examPaperScoreService.selectAllQuestionCount();
        vm.setExamPaperCount(examPaperCount);
        vm.setQuestionCount(questionCount);
src/main/java/com/ycl/jxkg/mapper/ExamPaperScoreMapper.java
@@ -18,7 +18,7 @@
    List<ExamPaperScore> studentPage(ExamPaperAnswerPageVO requestVM);
    Integer selectAllCount();
    Integer selectAllQuestionCount();
    List<KeyValue> selectCountByDate(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
    ExamPaperScore getByPidUid(@Param("pid") Integer paperId, @Param("uid") Integer uid);
src/main/java/com/ycl/jxkg/service/ExamPaperScoreService.java
@@ -50,6 +50,7 @@
    Integer selectAllCount();
    Integer selectAllQuestionCount();
    List<Integer> selectMothCount();
    PageInfo<ExamPaperAnswerPageResponseVO> adminPage(ExamPaperAnswerPageRequestVO requestVM);
src/main/java/com/ycl/jxkg/service/impl/ExamPaperScoreServiceImpl.java
@@ -161,6 +161,12 @@
    }
    @Override
    public Integer selectAllQuestionCount() {
        return examPaperScoreMapper.selectAllQuestionCount();
    }
    @Override
    public List<Integer> selectMothCount() {
        Date startTime = DateTimeUtil.getMonthStartDay();
        Date endTime = DateTimeUtil.getMonthEndDay();
src/main/resources/mapper/ExamPaperScoreDetailMapper.xml
@@ -74,13 +74,13 @@
    <select id="selectCountByDate" resultType="com.ycl.jxkg.domain.other.KeyValue">
        SELECT create_time as name, COUNT(create_time) as value
        SELECT answer_time as name, sum(question_count) as value
        from
            (
            SELECT DATE_FORMAT(create_time, '%Y-%m-%d') as create_time from t_exam_paper_question_customer_answer
            WHERE create_time between #{startTime} and #{endTime}
            SELECT question_count ,DATE_FORMAT(answer_time, '%Y-%m-%d') as answer_time from t_exam_paper_score
            WHERE answer_time between #{startTime} and #{endTime}
            ) a
        GROUP BY create_time
        GROUP BY answer_time
    </select>
    <update id="updateScore" parameterType="java.util.List">
src/main/resources/mapper/ExamPaperScoreMapper.xml
@@ -3,11 +3,9 @@
<mapper namespace="com.ycl.jxkg.mapper.ExamPaperScoreMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.ExamPaperScore">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="exam_paper_id" jdbcType="INTEGER" property="examPaperId"/>
        <result column="paper_id" jdbcType="INTEGER" property="examPaperId"/>
        <result column="paper_name" jdbcType="VARCHAR" property="paperName"/>
        <result column="paper_type" jdbcType="INTEGER" property="paperType"/>
        <result column="subject_id" jdbcType="INTEGER" property="subjectId"/>
        <result column="system_score" jdbcType="INTEGER" property="systemScore"/>
        <result column="user_score" jdbcType="INTEGER" property="userScore"/>
        <result column="paper_score" jdbcType="INTEGER" property="paperScore"/>
        <result column="question_correct" jdbcType="INTEGER" property="questionCorrect"/>
@@ -15,14 +13,17 @@
        <result column="do_time" jdbcType="INTEGER" property="doTime"/>
        <result column="status" jdbcType="INTEGER" property="status"/>
        <result column="create_user" jdbcType="INTEGER" property="createUser"/>
        <result column="judge_user" jdbcType="INTEGER" property="judgeUser"/>
        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
        <result column="task_exam_id" jdbcType="INTEGER" property="taskExamId"/>
        <result column="answer_time" jdbcType="TIMESTAMP" property="answerTime"/>
        <result column="exam_id" jdbcType="INTEGER" property="examId"/>
        <result column="exam_name" jdbcType="INTEGER" property="examName"/>
        <result column="paper_content" jdbcType="INTEGER" property="paperContent"/>
    </resultMap>
    <sql id="Base_Column_List">
        id
        , exam_paper_id, paper_name, paper_type, subject_id, system_score, user_score,
    paper_score, question_correct, question_count, do_time, status, create_user, create_time,
    task_exam_id
        id, paper_id, paper_name, paper_type, user_score,paper_score,
        question_correct, question_count, do_time, status, create_user, create_time,
        judge_user,answer_time,paper_content,create_time
    </sql>
    <select id="studentPage" resultMap="BaseResultMap"
@@ -41,15 +42,19 @@
    <select id="selectAllCount" resultType="java.lang.Integer">
        SELECT count(*)
        from t_exam_paper_answer
        from t_exam_paper_score
    </select>
    <select id="selectAllQuestionCount" resultType="java.lang.Integer">
        SELECT sum(question_count)
        from t_exam_paper_score
    </select>
    <select id="selectCountByDate" resultType="com.ycl.jxkg.domain.other.KeyValue">
        SELECT create_time as name, COUNT(create_time) as value
        from
            (
            SELECT DATE_FORMAT(create_time, '%Y-%m-%d') as create_time from t_exam_paper_answer
            SELECT DATE_FORMAT(create_time, '%Y-%m-%d') as create_time from t_exam_paper_score
            WHERE create_time between #{startTime} and #{endTime}
            ) a
        GROUP BY create_time
@@ -59,8 +64,8 @@
    <select id="getByPidUid" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from t_exam_paper_answer
        where exam_paper_id = #{pid} and create_user=#{uid}
        from t_exam_paper_score
        where paper_id = #{pid} and create_user=#{uid}
        limit 1
    </select>
@@ -73,7 +78,7 @@
        LEFT JOIN t_user b ON a.create_user = b.id
        <where>
            <if test="examPaperId != null">
                AND exam_paper_id = #{examPaperId}
                AND paper_id = #{examPaperId}
            </if>
            <if test="userName != null and userName != ''">
                AND INSTR(b.real_name, #{userName})