From 8ffccb9d5ee5754d5407c75ade8f27e0aafd0516 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 8 Aug 2022 17:09:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/IcWorkLogDTO.java |  7 +++++
 .../impl/IcWorkLogFileServiceImpl.java        |  2 ++
 .../service/impl/IcWorkLogServiceImpl.java    | 26 ++++++++++++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java
index 4a936d7acd..47fbe32b91 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java
@@ -2,6 +2,8 @@ package com.epmet.dto;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+
 import lombok.Data;
 
 
@@ -106,4 +108,9 @@ public class IcWorkLogDTO implements Serializable {
      */
     private String createdUser;
 
+    /**
+     * 附件
+     */
+    private List<IcWorkLogFileDTO> fileList;
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogFileServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogFileServiceImpl.java
index 4309859e91..3f5ecacca8 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogFileServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogFileServiceImpl.java
@@ -50,9 +50,11 @@ public class IcWorkLogFileServiceImpl extends BaseServiceImpl<IcWorkLogFileDao,
 
     private QueryWrapper<IcWorkLogFileEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
+        String logId = (String)params.get("logId");
 
         QueryWrapper<IcWorkLogFileEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.eq(StringUtils.isNotBlank(logId), "LOG_ID", logId);
 
         return wrapper;
     }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java
index d48aec4613..7433da4673 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
@@ -14,11 +15,14 @@ import com.epmet.dao.CustomerGridDao;
 import com.epmet.dao.IcWorkLogDao;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.IcWorkLogDTO;
+import com.epmet.dto.IcWorkLogFileDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.result.GridDetailResultDTO;
 import com.epmet.entity.IcWorkLogEntity;
+import com.epmet.entity.IcWorkLogFileEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.redis.IcWorkLogRedis;
+import com.epmet.service.IcWorkLogFileService;
 import com.epmet.service.IcWorkLogService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -45,6 +50,9 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
     @Autowired
     private LoginUserUtil loginUserUtil;
 
+    @Autowired
+    private IcWorkLogFileService icWorkLogFileService;
+
     @Autowired
     private EpmetUserFeignClient epmetUserFeignClient;
 
@@ -79,7 +87,12 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
     @Override
     public IcWorkLogDTO get(String id) {
         IcWorkLogEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IcWorkLogDTO.class);
+        IcWorkLogDTO dto = ConvertUtils.sourceToTarget(entity, IcWorkLogDTO.class);
+        Map<String, Object> params = new HashMap<>(2);
+        params.put("logId", id);
+        List<IcWorkLogFileDTO> files = icWorkLogFileService.list(params);
+        dto.setFileList(files);
+        return dto;
     }
 
     @Override
@@ -104,6 +117,17 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
         }
         IcWorkLogEntity entity = ConvertUtils.sourceToTarget(dto, IcWorkLogEntity.class);
         insert(entity);
+
+        if (!dto.getFileList().isEmpty()) {
+            dto.getFileList().forEach(item -> {
+                item.setLogId(entity.getId());
+                item.setCustomerId(loginUserUtil.getLoginUserCustomerId());
+                item.setFileType(NumConstant.ZERO_STR);
+            });
+
+            List<IcWorkLogFileEntity> fileEntityList = ConvertUtils.sourceToTarget(dto.getFileList(), IcWorkLogFileEntity.class);
+            icWorkLogFileService.insertBatch(fileEntityList);
+        }
     }
 
     @Override