Browse Source

Merge remote-tracking branch 'origin/dev_resi_event' into develop

master
zxc 4 years ago
parent
commit
d499d3ff81
  1. 4
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml

4
epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml

@ -49,7 +49,7 @@
ORDER BY re.CLOSE_CASE_TIME DESC
</if>
)t
LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 0 OR rea.SORT = 1 OR rea.SORT = 2))
LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 3 OR rea.SORT = 1 OR rea.SORT = 2))
</select>
@ -182,7 +182,7 @@
FROM resi_event_report_org ro
LEFT JOIN resi_event re ON (re.ID = ro.RESI_EVENT_ID AND re.DEL_FLAG = '0')
LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND
ea.ATTACHMENT_TYPE = 'image' AND ea.SORT IN (0,1,2))
ea.ATTACHMENT_TYPE = 'image' AND ea.SORT IN (3,1,2))
WHERE ro.DEL_FLAG = '0'
AND ro.ORG_READ = 'un_read'
AND ro.ORG_ID IN(

Loading…
Cancel
Save