Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili

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

@@ -151,10 +151,10 @@
             ie.longitude,
             ie.address,
             ie.`status`,
-            IF(ie.status = 'processing','处理中',IF (ie.status = 'closed_case','已办结',''))statusName,
+            IF(ie.status = 'processing','处理中',IF (ie.status = 'closed_case','已办结','')) statusName,
             ie.close_case_time,
             ie.satisfaction,
-            IF(ie.satisfaction = 'bad','不满意',IF (ie.satisfaction = 'good','基本满意',IF (ie.satisfaction = 'perfect','非常满意','')))satisfactionName,
+            IF(ie.satisfaction = 'bad','不满意',IF (ie.satisfaction = 'good','基本满意',IF (ie.satisfaction = 'perfect','非常满意',''))) satisfactionName,
             ie.operation_type,
             ie.operation_id,
             ie.read_flag,