待处理红绿灯查询规则修改

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -536,9 +536,19 @@
                 when (getworkminute(item.CREATED_TIME,now()) / 60 > 6 and getworkminute(item.CREATED_TIME,now()) / 60 <=8) then '黄灯'
                 when (getworkminute(item.CREATED_TIME,now()) / 60 <= 6) then '绿灯' else '' end) as lamp,
 
-                (case when (getworkminute(item.CREATED_TIME,now())  / 60 > 8) then concat('超时',(ROUND(getworkminute(item.CREATED_TIME,now())  / 60,2) - 8),'h')
-                when (getworkminute(item.CREATED_TIME,now()) / 60 > 6 and getworkminute(item.CREATED_TIME,now()) / 60 <=8) then concat('剩余',(8 - ROUND((getworkminute(item.CREATED_TIME,now()) / 60),2)),'h')
-                when (getworkminute(item.CREATED_TIME,now()) / 60 <= 6) then concat('剩余',(8 - ROUND((getworkminute(item.CREATED_TIME,now()) / 60),2)),'h') else 0 end) as remainTime,
+                (
+                    case when (getworkminute(item.CREATED_TIME,now())  / 60 > 8)
+                    then concat('超时',
+                        case when (getworkminute(item.CREATED_TIME,now()) - 480) < 60
+                        then concat((getworkminute(item.CREATED_TIME,now()) - 480),'分钟')
+                        else concat((ROUND(getworkminute(item.CREATED_TIME,now()) / 60,1) - 8),'小时') end)
+                    else
+                        concat('剩余',
+                        case when (480 - getworkminute(item.CREATED_TIME,now())) < 60
+                        then concat((480 - getworkminute(item.CREATED_TIME,now())),'分钟')
+                        else concat((8 - ROUND((getworkminute(item.CREATED_TIME,now()) / 60),1)),'小时') end)
+                    end
+                ) as remainTime,
             </if>
             ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS participantsNum,
             (case when d.ID is not null then '1' else '0' end) as isDelay