Merge branch 'develop_3' into 'develop_master'

Develop 3 See merge request LiuChao/foton-slrs-system-rest!353
2022-01-06 01:06:33 +08:00
parent 2faa8a452e 8eeb61a354
commit ed695393f3
3 changed files with 16 additions and 7 deletions
@@ -191,7 +191,7 @@
        APPLY_TYPE ,
        attr
        .ZRGCS AS DUTY_ENGINEER ,
-        NULL AS ITEMS_ID ,
+        ITEMS_ID ,
        NULL AS ITEMS_NUM , NULL AS ITEMS_NAME ,
        NULL AS POLICY_ID ,
        NULL AS POLICY_NAME ,
@@ -273,10 +273,11 @@
        WARNING_RESULT
        LEFT JOIN
        (
-        SELECT law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date
-        GROUP BY warning_date.law_id
+        SELECT item_id,law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date
+        GROUP BY warning_date.law_id,item_id
        ) warning_date
        ON warning_date.law_id = WARNING_RESULT.STAND_ID
+        AND warning_date.item_id = WARNING_RESULT.ITEMS_ID
        ORDER BY warning_date.SSRQ_MIN

    </select>