From 8211995f2f7ac2364288b6a2e22e8f09b0b6b869 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 8 Aug 2022 17:47:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/IcWorkLogFileDao.java  | 12 ++++++-
 .../epmet/service/IcWorkLogFileService.java   | 10 ++++++
 .../impl/IcWorkLogFileServiceImpl.java        |  6 ++++
 .../service/impl/IcWorkLogServiceImpl.java    | 31 ++++++++++++-------
 .../resources/mapper/IcWorkLogFileDao.xml     |  7 +++++
 5 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogFileDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogFileDao.java
index 88828adcc4..3165b1039d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogFileDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogFileDao.java
@@ -3,6 +3,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.IcWorkLogFileEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 网格员工作日志附件
@@ -12,5 +13,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcWorkLogFileDao extends BaseDao<IcWorkLogFileEntity> {
-	
+
+    /**
+     * 删除
+     *
+     * @param logId
+     * @return void
+     * @author generator
+     * @date 2022-08-05
+     */
+    void deleteByLogId(@Param("logId") String logId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogFileService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogFileService.java
index fb51be3aeb..b5813982cd 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogFileService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogFileService.java
@@ -75,4 +75,14 @@ public interface IcWorkLogFileService extends BaseService<IcWorkLogFileEntity> {
      * @date 2022-08-05
      */
     void delete(String[] ids);
+
+    /**
+     * 删除
+     *
+     * @param logId
+     * @return void
+     * @author generator
+     * @date 2022-08-05
+     */
+    void deleteByLogId(String logId);
 }
\ 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 3f5ecacca8..eac5f28c73 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
@@ -86,4 +86,10 @@ public class IcWorkLogFileServiceImpl extends BaseServiceImpl<IcWorkLogFileDao,
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteByLogId(String id) {
+        baseDao.deleteByLogId(id);
+    }
+
 }
\ No newline at end of file
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 9aad5c5890..3424b10cec 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
@@ -91,7 +91,7 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
         Map<String, Object> params = new HashMap<>(2);
         params.put("logId", id);
         List<IcWorkLogFileDTO> files = icWorkLogFileService.list(params);
-        files.forEach(item->item.setName(item.getFileName()));
+        files.forEach(item -> item.setName(item.getFileName()));
         dto.setFileList(files);
         return dto;
     }
@@ -119,16 +119,8 @@ 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);
-        }
+        // 处理附件
+        fileHandle(dto.getFileList(), entity.getId());
     }
 
     @Override
@@ -136,6 +128,10 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
     public void update(IcWorkLogDTO dto) {
         IcWorkLogEntity entity = ConvertUtils.sourceToTarget(dto, IcWorkLogEntity.class);
         updateById(entity);
+
+        // 处理附件
+        icWorkLogFileService.deleteByLogId(entity.getId());
+        fileHandle(dto.getFileList(), entity.getId());
     }
 
     @Override
@@ -145,4 +141,17 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    private void fileHandle(List<IcWorkLogFileDTO> fileList, String logId) {
+        if (!fileList.isEmpty()) {
+            fileList.forEach(item -> {
+                item.setLogId(logId);
+                item.setCustomerId(loginUserUtil.getLoginUserCustomerId());
+                item.setFileType(NumConstant.ZERO_STR);
+            });
+
+            List<IcWorkLogFileEntity> fileEntityList = ConvertUtils.sourceToTarget(fileList, IcWorkLogFileEntity.class);
+            icWorkLogFileService.insertBatch(fileEntityList);
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogFileDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogFileDao.xml
index 23ab1afedd..7461622a6e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogFileDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogFileDao.xml
@@ -20,4 +20,11 @@
     </resultMap>
 
 
+    <delete id="deleteByLogId">
+        DELETE
+        FROM
+            ic_work_log_file
+        WHERE
+            LOG_ID = #{logId}
+    </delete>
 </mapper>
\ No newline at end of file