禅道：http://zentao.elinkservice.cn/story-view-670.html

个人档案中上报事件模块相关接口由原来的查询resi_event改为查询ic_event表，市北客户继续沿用之前接口

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

@@ -386,7 +386,7 @@
             ic_event_reply rer
         WHERE
             rer.del_flag = '0'
-        AND rer.resi_event_id = #{icEventId}
+        AND rer.ic_event_id = #{icEventId}
         ORDER BY
             rer.created_time DESC
     </select>
@@ -396,13 +396,15 @@
             re.id AS resiEventId,
             re.event_content AS eventContent,
             if(re.operation_type='1', '1', '0') AS shiftProject,
-            if(re.operation_type='1', re.OPERATION_ID, '') AS projectId,
+            if(re.operation_type='1', re.operation_id, '') AS projectId,
             re.created_time AS reportTime
         FROM
             ic_event re
         WHERE
             re.del_flag = '0'
-        AND re.report_user_id = ''
+        <foreach item="epmetUserId" collection="epmetUserIdList" open="AND (" separator="or" close=")" index="">
+            re.report_user_id = #{epmetUserId}
+        </foreach>
         ORDER BY re.created_time desc
     </select>
 
@@ -452,7 +454,7 @@
             ea.ATTACHMENT_TYPE AS type,
             ea.duration AS duration,
             re.GRID_ID AS gridId,
-            re.CREATED_BY AS eventUserId,
+            re.REPORT_USER_ID AS eventUserId,
             re.AGENCY_ID AS orgId
         FROM ic_event re
         LEFT JOIN ic_event_attachment ea ON (ea.IC_EVENT_ID = re.ID AND ea.DEL_FLAG = '0')