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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -843,22 +843,17 @@
             si."ORG_BRANCH_CODE",
             si."COMPANY_ORG_BRANCH_CODE"
         FROM
-            (SELECT
-                 "RECORD","INFORM_END"
-             FROM
-                 (
-                     SELECT
-                                 ROW_NUMBER () OVER (
-                             PARTITION BY "RECORD"
-                             ORDER BY
-                                 "REC_DATE"
-                             ) AS rowNum1,"RECORD", "INFORM_END"
-                     FROM
-                         idx_biz_jg_maintenance_record_info
-                     WHERE "INFORM_END" <![CDATA[<]]> to_char(now(), 'YYYY-MM-DD')
-                 ) d
-             WHERE
-                 rowNum1 = 1) tt
+            (
+                SELECT
+                "RECORD","INFORM_END","ROWNUM1"
+                FROM
+                (
+                    SELECT "RECORD","INFORM_END",ROW_NUMBER() OVER (PARTITION BY "RECORD" ORDER BY "REC_DATE" DESC) AS ROWNUM1
+                    FROM
+                    idx_biz_jg_maintenance_record_info
+                ) d
+                WHERE d."ROWNUM1" = 1 and  d."INFORM_END" <![CDATA[<]]> to_char(now(), 'YYYY-MM-DD')
+            ) tt
                 LEFT JOIN idx_biz_jg_use_info ui ON ui."RECORD" = tt."RECORD"
                 LEFT JOIN idx_biz_jg_register_info ri ON ri."RECORD" = tt."RECORD"
                 LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = tt."RECORD"