Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-04 49cc25af3ee07e1d0366588db5b5c01483057185

 ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml

@@ -163,4 +163,55 @@
        LIMIT 1
    </select>

    <select id="getDeptPointGB" resultType="string">
        SELECT
            DISTINCT serial_number
        FROM
             t_yw_point
        WHERE
            <if test="tagType == 0">
                dept_tag = 1
            </if>
            <if test="tagType == 1">
                important_tag = 1
            </if>
            <if test="tagType == 2">
                important_command_image_tag = 1
            </if>
             AND deleted = 0
    </select>

    <select id="select" resultType="com.ycl.platform.domain.entity.YwPoint">
        SELECT
               *
        FROM
             t_yw_point
        <where>
            <if test="keyword != null and keyword != ''">
                AND (serial_number like concat('%', #{keyword}, '%') or point_name like concat('%', #{keyword}, '%'))
            </if>
            <if test="unitId != null">
                AND unit_id = #{unitId}
            </if>
            AND deleted = 0
        </where>

    </select>

    <select id="getReportResult" resultType="com.ycl.platform.domain.vo.ReportAuditingRecordVO">
        SELECT
               ar.result, r.begin_create_time, r.end_create_time
        FROM
             t_report r
                 INNER JOIN t_report_auditing_record ar ON r.id = ar.report_id
                                                               AND ar.deleted = 0
                                                               AND r.report_type = #{reportType}
                                                               AND r.deleted = 0
                                                               AND r.serial_number = #{serialNumber}
                                                                AND ar.result = 1
        ORDER BY
             ar.create_time DESC
        limit 1
    </select>

</mapper>