增删改查

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;
 
 /**
  * 网格员工作日志附件
@@ -13,4 +14,13 @@ 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);
 }

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);
 }

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);
+    }
+
 }

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 -> {
+        fileHandle(dto.getFileList(), entity.getId());
-                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
@@ -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);
+        }
+    }
+
 }

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>