Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-16 72fe8a562375629dc84cac9c3adf2c24c51d409b

Merge remote-tracking branch 'origin/master'

 src/main/resources/mapper/ExamPaperAnswerMapper.xml

@@ -260,12 +260,12 @@
        select count(*) from t_exam_paper_answer a
        inner join
        (select user_id from t_user_department
        <where>
            and department_id in
        <if test="deptIds != null and deptIds.size() > 0">
          where department_id in
            <foreach collection="deptIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </where>
        </if>
        group by user_id)
        b on a.create_user = b.user_id
  </select>

 src/main/resources/mapper/ExamPaperQuestionCustomerAnswerMapper.xml

@@ -261,12 +261,12 @@
        SELECT count(*) from t_exam_paper_question_customer_answer a
        inner join
        (select user_id from t_user_department
        <where>
          and department_id in
        <if test="deptIds != null and deptIds.size() > 0">
          where department_id in
          <foreach collection="deptIds" item="item" open="(" separator="," close=")">
            #{item}
          </foreach>
        </where>
        </if>
        group by user_id)
        b on a.create_user = b.user_id
  </select>
@@ -278,12 +278,12 @@
                  SELECT DATE_FORMAT(create_time,'%Y-%m-%d') as create_time from t_exam_paper_question_customer_answer a
                  inner join
                  (select user_id from t_user_department
                  <where>
                    and department_id in
                  <if test="deptIds != null and deptIds.size() > 0">
                    where department_id in
                    <foreach collection="deptIds" item="item" open="(" separator="," close=")">
                      #{item}
                    </foreach>
                  </where>
                  </if>
                  group by user_id)
                  b on a.create_user = b.user_id
                    WHERE  create_time  between  #{startTime}  and  #{endTime}

 src/main/resources/mapper/UserEventLogMapper.xml

@@ -139,12 +139,12 @@
                  SELECT DATE_FORMAT(create_time,'%Y-%m-%d') as create_time from t_user_event_log a
                  inner join
                  (select user_id from t_user_department
                  <where>
                    and department_id in
                  <if test="deptIds != null and deptIds.size() > 0">
                    where department_id in
                    <foreach collection="deptIds" item="item" open="(" separator="," close=")">
                      #{item}
                    </foreach>
                  </where>
                  </if>
                  group by user_id)
                  b on a.user_id = b.user_id
                    WHERE  create_time  between  #{startTime}  and  #{endTime}