Merge remote-tracking branch 'origin/master'

无关风月

3 天以前 7289189c907038db99d41aefcd9e12dce5077d3e

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

@@ -6,6 +6,7 @@
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TClinicalTrialPoints">
        <id column="id" property="id" />
        <result column="team_id" property="teamId" />
        <result column="process_engineer_id" property="processEngineerId" />
        <result column="trial_content" property="trialContent" />
        <result column="trial_time" property="trialTime" />
        <result column="evaluate_score" property="evaluateScore" />
@@ -18,7 +19,40 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, team_id, trial_content, trial_time, evaluate_score, create_time, update_time, create_by, update_by, disabled
        id, team_id, process_engineer_id,trial_content, trial_time, evaluate_score, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TClinicalTrialPointsVO">
        select
        t.id,
        t.team_id,
        t.process_engineer_id,
        t.trial_content,
        t.trial_time,
        t.evaluate_score,
        t.create_time,
        t.update_time,
        t.create_by,
        t.update_by,
        t.disabled,
        p.team_name AS teamName
        from t_clinical_trial_points t
        left join t_project_team p on t.team_id = p.id
        <where>
            <if test="query.teamName != null and query.teamName != ''">
                and p.team_name like concat('%',#{query.teamName},'%')
            </if>
            <if test="query.trialContent != null and query.trialContent != ''">
                and t.trial_content like concat('%',#{query.trialContent},'%')
            </if>
            <if test="query.teamIds != null and query.teamIds.size() > 0">
                and t.team_id in
                <foreach item="teamId" collection="query.teamIds" separator="," open="(" close=")" index="">
                    #{teamId}
                </foreach>
            </if>
            AND t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY t.create_time DESC
    </select>

</mapper>