From 083c9756d00b655c16b0ed3914374d079a451db9 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 9 Aug 2022 17:24:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dao/IcWorkLogDao.java  | 16 ++++++++++++++++
 .../service/impl/IcWorkLogServiceImpl.java     | 18 ++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java
index c1a8bfb5f4..dea24ced9c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java
@@ -17,7 +17,23 @@ import java.util.Map;
 @Mapper
 public interface IcWorkLogDao extends BaseDao<IcWorkLogEntity> {
 
+    /**
+     * 分页列表
+     *
+     * @param params
+     * @return java.util.List<com.epmet.dto.IcWorkLogDTO>
+     * @author zhy
+     * @date 2022/8/9 17:23
+     */
     List<IcWorkLogDTO> listPage(Map<String, Object> params);
 
+    /**
+     * 导出列表
+     *
+     * @param params
+     * @return java.util.List<com.epmet.dto.IcWorkLogDTO>
+     * @author zhy
+     * @date 2022/8/9 17:23
+     */
     List<IcWorkLogDTO> list4Export(Map<String, Object> params);
 }
\ 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 e4881ebf1e..745b6c2d2b 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
@@ -131,6 +131,7 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
             dto.setCreatedUser(staffInfo.getData().getRealName());
             dto.setMobile(staffInfo.getData().getMobile());
         }
+        // 查询网格信息
         CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
         customerGridFormDTO.setGridId(dto.getGridId());
         GridDetailResultDTO gridDetailResultDTO = customerGridDao.griddetail(customerGridFormDTO);
@@ -148,6 +149,14 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(IcWorkLogDTO dto) {
+        // 查询网格信息
+        CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
+        customerGridFormDTO.setGridId(dto.getGridId());
+        GridDetailResultDTO gridDetailResultDTO = customerGridDao.griddetail(customerGridFormDTO);
+        if (gridDetailResultDTO != null) {
+            dto.setAgencyId(gridDetailResultDTO.getAgencyId());
+            dto.setPids(gridDetailResultDTO.getPIds());
+        }
         IcWorkLogEntity entity = ConvertUtils.sourceToTarget(dto, IcWorkLogEntity.class);
         updateById(entity);
 
@@ -163,6 +172,15 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * 附件处理
+     *
+     * @param fileList
+     * @param logId
+     * @return void
+     * @author zhy
+     * @date 2022/8/9 17:24
+     */
     private void fileHandle(List<IcWorkLogFileDTO> fileList, String logId) {
         if (!fileList.isEmpty()) {
             fileList.forEach(item -> {