shenyijian
2024-09-18 7f3b30605ca7a30a0e5b5f4772e451a244db50f2
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -84,7 +84,7 @@
        DBMS_LOB.SUBSTR(report.video_urls) videoUrls,
        de.device_name,
        de.device_type,
        userR.approval_status,
        MAX(userR.approval_status) as approval_status,
        dict."DICT_VALUE" as typeName,
        si.control_unit,si.self_unit,dria."county_cd"
        FROM
@@ -130,6 +130,24 @@
        <if test="dto.endTime != null and dto.endTime !='' ">
            and report.report_time &lt;= #{dto.endTime}
        </if>
        group by
        report.id,
        report.program_name,
        report.gx_step_name,
        report."STATUS",
        report.audit_person,
        report.report_time,
        report.create_time,
        report.gx_progress,
        report.remark,
        DBMS_LOB.SUBSTR( report.images_urls) ,
        DBMS_LOB.SUBSTR( report.video_urls ) ,
        de.device_name,
        de.device_type,
        dict."DICT_VALUE" ,
        si.control_unit,
        si.self_unit,
        dria."county_cd"
        order by report.report_time desc
        <!--<choose >
            <when test="dto.approvalStatus != null and dto.approvalStatus == 0">