zxl
2025-11-10 cb415813de667096290d6bd0f924f5b523104117
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -32,9 +32,9 @@
               GROUP_CONCAT(DISTINCT ret.error_type SEPARATOR ',') AS errorType
        FROM
        t_report r
        LEFT JOIN t_yw_unit u ON r.unit_id = u.id and u.deleted = 0
        LEFT JOIN (SELECT id,unit_name FROM t_yw_unit WHERE deleted =0) u ON r.unit_id = u.id
        LEFT JOIN t_yw_people p ON r.people_id = p.user_id and p.deleted = 0
        LEFT JOIN t_yw_point pt ON r.serial_number = pt.serial_number and pt.deleted = 0
        LEFT JOIN (SELECT serial_number,point_name FROM t_yw_point WHERE deleted =0) pt ON r.serial_number = pt.serial_number
        INNER JOIN t_report_error_type ret ON ret.report_id = r.id and ret.deleted = 0 <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">
        AND ret.error_type in <foreach collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach>
        </if>
@@ -62,13 +62,15 @@
            AND r.end_create_time &lt;= #{query.effectTimeEnd}
        </if>
        GROUP BY
            r.id, r.report_materials, r.create_time, r.report_type, r.report_content, r.status, r.serial_number,
            r.begin_create_time,
            r.end_create_time,
            r.import_batch_number,
            u.unit_name,
            p.yw_person_name,
            pt.point_name
            r.id
--                ,
--             r.report_materials, r.create_time, r.report_type, r.report_content, r.status, r.serial_number,
--             r.begin_create_time,
--             r.end_create_time,
--             r.import_batch_number,
--             u.unit_name,
--             p.yw_person_name,
--             pt.point_name
        ORDER BY r.update_time DESC
    </select>