Merge remote-tracking branch 'origin/dev' into dev

fuliqi

2024-07-01 5c93dae79d982e3706fb3c8bfbe0a6c831554ddd

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/resources/mapper/ExamPaperScoreMapper.xml

 src/main/resources/mapper/ExamPaperScoreMapper.xml

@@ -56,7 +56,15 @@
        </where>
    </select>


    <select id="getByExamIdUserId" resultType="com.ycl.jxkg.domain.entity.ExamPaperScore">
        SELECT
        <include refid="Base_Column_List"/>
        from t_exam_paper_score
        <where>
            and user_id = #{userId}
            and exam_id = #{examId}
        </where>
    </select>
    <select id="selectAllCount" resultType="java.lang.Integer">
        SELECT count(*)
        from t_exam_paper_score
@@ -68,11 +76,13 @@
    </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_score
              WHERE create_time between #{startTime} and #{endTime}) a
        GROUP BY create_time
        SELECT submit_time as name, sum(question_count) as value
        from
            (
            SELECT question_count ,DATE_FORMAT(submit_time, '%Y-%m-%d') as submit_time from t_exam_paper_score
            WHERE submit_time between #{startTime} and #{endTime}
            ) a
        GROUP BY submit_time
    </select>