From d00db96ac54a9c39d5cfa0bd72b289aa9183c2d6 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 19 May 2022 15:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E3=80=81=E8=BD=AC=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E3=80=81=E8=BD=AC=E9=9C=80=E6=B1=82=E3=80=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcEventServiceImpl.java      | 52 ++++++++++---------
 .../src/main/resources/mapper/IcEventDao.xml  |  2 +
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
index d1d7341ec9..61c74a4945 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
@@ -290,7 +290,6 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             if (categoryEntity != null) {
                 icEventCategoryService.insert(categoryEntity);
             }
-
         }
         //3-4.操作记录数据保存
         List<IcEventOperationLogEntity> logList = new ArrayList<>();
@@ -668,28 +667,29 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         icEventReplyService.insert(replyEntity);
 
         //4.判断新增或修改分类数据
-        if (StringUtils.isNotBlank(formDTO.getOperationType())) {
+        if (StringUtils.isNotBlank(formDTO.getCategoryId())) {
             //查询分类信息
             List<String> categoryList = new ArrayList<>();
             categoryList.add(formDTO.getCategoryId());
             CategoryTagResultDTO category = queryCategory(formDTO.getCustomerId(), categoryList);
-            AtomicReference<IcEventCategoryEntity> categoryEntity = null;
-            category.getCategoryList().forEach(ca -> {
+            IcEventCategoryEntity categoryEntity = null;
+            for (IssueProjectCategoryDictDTO ca : category.getCategoryList()){
                 if (ca.getId().equals(formDTO.getCategoryId())) {
-                    categoryEntity.set(new IcEventCategoryEntity());
-                    categoryEntity.get().setCustomerId(formDTO.getCustomerId());
-                    categoryEntity.get().setIcEventId(entity.getId());
-                    categoryEntity.get().setCategoryId(ca.getId());
-                    categoryEntity.get().setCategoryPids(ca.getPids());
-                    categoryEntity.get().setCategoryCode(ca.getCategoryCode());
+                    categoryEntity = new IcEventCategoryEntity();
+                    categoryEntity.setCustomerId(formDTO.getCustomerId());
+                    categoryEntity.setIcEventId(entity.getId());
+                    categoryEntity.setCategoryId(ca.getId());
+                    categoryEntity.setCategoryPids(ca.getPids());
+                    categoryEntity.setCategoryCode(ca.getCategoryCode());
                 }
-            });
+            }
+
             IcEventCategoryEntity icEventCategory = icEventCategoryService.getByEventId(formDTO.getIcEventId());
             if (null == category) {
-                icEventCategoryService.insert(categoryEntity.get());
+                icEventCategoryService.insert(categoryEntity);
             } else {
-                categoryEntity.get().setId(icEventCategory.getId());
-                icEventCategoryService.updateById(categoryEntity.get());
+                categoryEntity.setId(icEventCategory.getId());
+                icEventCategoryService.updateById(categoryEntity);
             }
         }
 
@@ -840,17 +840,19 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 resultDTO.setSourceTypeName(statusMap.get(resultDTO.getSourceType()));
             }
             //每个事件对应的图片数据
-            List<String> imageList = new ArrayList<>();
-            List<String> voiceList = new ArrayList<>();
-            resultDTO.getAttachmentList().forEach(file -> {
-                if ("image".equals(file.getType())) {
-                    imageList.add(file.getUrl());
-                } else if ("voice".equals(file.getType())) {
-                    voiceList.add(file.getUrl());
-                }
-            });
-            resultDTO.setImageList(imageList);
-            resultDTO.setVoiceList(voiceList);
+            if(!CollectionUtils.isEmpty(resultDTO.getAttachmentList())){
+                List<String> imageList = new ArrayList<>();
+                List<String> voiceList = new ArrayList<>();
+                resultDTO.getAttachmentList().forEach(file -> {
+                    if ("image".equals(file.getType())) {
+                        imageList.add(file.getUrl());
+                    } else if ("voice".equals(file.getType())) {
+                        voiceList.add(file.getUrl());
+                    }
+                });
+                resultDTO.setImageList(imageList);
+                resultDTO.setVoiceList(voiceList);
+            }
 
             //分类信息
             if(StringUtils.isNotBlank(resultDTO.getCategoryId())){
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index 107cb634f0..8d5d8caec9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
@@ -96,6 +96,7 @@
         <result property="satisfactionName" column="satisfactionName" />
         <result property="createdTime" column="created_time" />
         <result property="status" column="status" />
+        <result property="statusName" column="statusName" />
         <result property="happenTime" column="happen_time" />
         <result property="createdUserId" column="created_by" />
         <result property="categoryId" column="category_id" />
@@ -131,6 +132,7 @@
             IF(ie.satisfaction = 'bad','不满意',IF (ie.satisfaction = 'good','基本满意',IF (ie.satisfaction = 'perfect','非常满意','')))satisfactionName,
             ie.created_time,
             ie.`status`,
+            IF(ie.satisfaction = 'processing','处理中',IF (ie.satisfaction = 'closed_case','已办结',''))statusName,
             ie.happen_time,
             ie.created_by,
             iec.category_id