diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index a2856bc80..81acadb80 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -50,6 +50,8 @@
item.ITEM_STATE
WHEN 0 THEN
'处理中'
+ WHEN 5 THEN
+ '已关闭'
WHEN 10 THEN
'已结案' ELSE ''
END AS stateName
@@ -75,30 +77,30 @@
ON t1.EVENT_ID = t2.ID
AND t2.DEL_FLAG = '0'
WHERE t1.DEL_FLAG = '0'
- AND t1.GRID_ID = #{deptId}
+ AND t1.GRID_ID = #{formDto.deptId}
AND t1.ITEM_STATE IN
#{state}
-
- = ]]> #{someMonthsAgo}
+
+ = ]]> #{formDto.someMonthsAgo}
-
- #{timestamp}
+
+ #{formDto.timestamp}
-
- AND t1.ITEM_CONTENT LIKE CONCAT('%',#{searchContent},'%')
+
+ AND t1.ITEM_CONTENT LIKE CONCAT('%',#{formDto.searchContent},'%')
-
- AND t1.ISSUE_CATEGORY_ID = #{categoryId}
+
+ AND t1.ISSUE_CATEGORY_ID = #{formDto.categoryId}
-
- AND t1.USER_ID = #{userId}
+
+ AND t1.USER_ID = #{formDto.userId}
ORDER BY
t1.CREATED_TIME DESC
- LIMIT #{pageIndex},#{pageSize}
+ LIMIT #{formDto.pageIndex},#{formDto.pageSize}
) temp
)
ORDER BY