Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 9cb78a5414cdbfdd59931b14759bf9800d275448

 ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml

@@ -3,11 +3,12 @@
<mapper namespace="com.ruoyi.system.mapper.TResultWorkEvaluateMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TTesterWorkEvaluate">
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TResultWorkEvaluate">
        <id column="id" property="id" />
        <result column="dispatch_id" property="dispatchId" />
        <result column="user_id" property="userId" />
        <result column="result_report_id" property="resultReportId" />
        <result column="evaluate_type" property="evaluateType" />
        <result column="evaluate_one" property="evaluateOne" />
        <result column="evaluate_two" property="evaluateTwo" />
        <result column="evaluate_three" property="evaluateThree" />
@@ -17,6 +18,7 @@
        <result column="status" property="status" />
        <result column="evaluate_person_id" property="evaluatePersonId" />
        <result column="evaluate_time" property="evaluateTime" />
        <result column="result_evaluate_json" property="resultEvaluateJson" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
@@ -26,7 +28,30 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, dispatch_id, user_id, result_report_id, evaluate_one, evaluate_two, evaluate_three, evaluate_four, evaluate_five, evaluate_six, status, evaluate_person_id, evaluate_time, create_time, update_time, create_by, update_by, disabled
        id, dispatch_id, user_id, result_report_id,evaluate_type, evaluate_one, evaluate_two, evaluate_three, evaluate_four, evaluate_five, evaluate_six, status, evaluate_person_id, evaluate_time,result_evaluate_json, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TResultWorkEvaluateVO">
        select t1.*,t2.team_name as teamName,t2.create_time as startTime from t_result_work_evaluate t1
        left join t_project_team t2 on t1.team_id = t2.id
        <where>
            <if test="query.teamName != null and query.teamName != ''">
                and t2.team_name like concat('%',#{query.teamName},'%')
            </if>
            <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                AND t1.create_time BETWEEN #{query.startTime} AND #{query.endTime}
            </if>
            <if test="query.status != null">
                AND t1.audit_status = #{query.auditStatus}
            </if>
            <if test="query.teamIds != null and query.teamIds > 0">
                AND t1.team_id in
                <foreach collection="query.teamIds" item="id" open="(" separator="," close=")">
                    #{id}
                </foreach>
            </if>
            AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        group by t1.team_id
    </select>

</mapper>