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

buhuazhen

4 天以前 706d0d62cc25829ec6948e2fd5d03e62acf29306

 src/main/resources/mapper/safe/SafeTrainingMapper.xml

@@ -31,20 +31,21 @@
        <result column="tenant_id" property="tenantId" />
    </resultMap>
    <select id="pageSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto">
        select st.*,
               su.nick_name assessmentUserName,
                count(std.id) nums
        from safe_training st
        left join safe_training_details std on std.safe_training_id = st.id
        left join sys_user su on st.assessment_user_id = su.user_id
        where  st.state = #{c.state}
        GROUP BY st.id
        SELECT
        st.*,
        su.nick_name AS assessmentUserName,
        COUNT(std.id) AS nums
        FROM safe_training st
        LEFT JOIN safe_training_details std ON std.safe_training_id = st.id
        LEFT JOIN sys_user su ON st.assessment_user_id = su.user_id
        WHERE st.state = #{c.state}
        <if test="c.placeTraining != null and c.placeTraining != ''">
            and st.place_training like concat('%', #{c.placeTraining}, '%')
            AND st.place_training LIKE CONCAT('%', #{c.placeTraining}, '%')
        </if>
        <if test="c.trainingDate != null ">
            and st.training_date = date_format(#{c.trainingDate},'%Y%m%d')
            AND DATE_FORMAT(st.training_date, '%Y%m%d') = DATE_FORMAT(#{c.trainingDate}, '%Y%m%d')
        </if>
        GROUP BY st.id, su.nick_name
    </select>
    <select id="getSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto">
         select st.*,