Merge remote-tracking branch 'origin/feature/bssb_screen' into feature/bssb_screen

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

@@ -669,7 +669,9 @@
         eve.COMMENT_NUM,
         eve.BROWSE_NUM,
 
-            (case when (process.STATE = 1001 and HOUR( timediff( now(), item.CREATED_TIME) ) >= 24) then '1' else '' end) as isRemind,
+        case when (getworkminute(item.CREATED_TIME,now())  / 60 > 8) then '1'
+        when (getworkminute(item.CREATED_TIME,now())   / 60 > 6 and getworkminute(item.CREATED_TIME,now()) / 60 <=8) then '2'
+        when (getworkminute(item.CREATED_TIME,now())   / 60 <= 6) then '3' else '' end as isRemind,
 
             (case when (getworkminute(item.CREATED_TIME,now()) / 60 > 8) then '红灯'
             when (getworkminute(item.CREATED_TIME,now()) / 60 > 6 and getworkminute(item.CREATED_TIME,now()) / 60 <=8) then '黄灯'
@@ -710,13 +712,16 @@
         ) process on process.ITEM_ID = item.ID
         WHERE item.DEL_FLAG = '0'
         and (process.state is not null and process.state not in (11,15))
-        and (item.IS_PEOPLE = '0' or (item.IS_PEOPLE = '1' and item.PEOPLE_FLAG = '0'))
+        and item.IS_PEOPLE = '1'
         <if test="typeKey != null and typeKey != '' and typeKey == 'grid_party'">
             and (process.state != 0 or process.state is null)
         </if>
         <if test="peopleFlag != null and peopleFlag != ''">
             AND item.PEOPLE_FLAG = #{peopleFlag}
         </if>
+        <if test="serialNum != null and serialNum != ''">
+            and item.SERIAL_NUM like '%${serialNum}%'
+        </if>
         <if test="itemState != null and itemState != ''">
             AND item.ITEM_STATE = #{itemState}
         </if>