From 2d11c3b0d17a84d9f3296a37ddd03c723eb76d11 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 28 Oct 2021 10:35:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opendata/service/impl/BaseGridInfoServiceImpl.java     | 7 +++++--
 .../opendata/service/impl/BaseGridUserServiceImpl.java     | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java
index 7802dfc707..8c7fd0d5c8 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java
@@ -20,6 +20,7 @@ package com.epmet.opendata.service.impl;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerGridDTO;
@@ -58,7 +59,8 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl<BaseGridInfoDao, Ba
     @Transactional(rollbackFor = Exception.class)
     public void getAgencyBaseInfo(GridBaseInfoFormDTO formDTO) {
         //1.查询组织基础信息
-        Result<List<CustomerAgencyDTO>> result = dataStatisticalOpenFeignClient.getAgencyBaseInfo(formDTO);
+        com.epmet.dto.org.form.GridBaseInfoFormDTO formDTO1 = ConvertUtils.sourceToTarget(formDTO, com.epmet.dto.org.form.GridBaseInfoFormDTO.class);
+        Result<List<CustomerAgencyDTO>> result = dataStatisticalOpenFeignClient.getAgencyBaseInfo(formDTO1);
         if (!result.success()) {
             throw new RenException(result.getInternalMsg());
         }
@@ -110,7 +112,8 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl<BaseGridInfoDao, Ba
     @Transactional(rollbackFor = Exception.class)
     public void getGridBaseInfo(GridBaseInfoFormDTO formDTO) {
         //1.查询网格基础信息
-        Result<List<CustomerGridDTO>> result = dataStatisticalOpenFeignClient.getGridBaseInfo(formDTO);
+        com.epmet.dto.org.form.GridBaseInfoFormDTO formDTO1 = ConvertUtils.sourceToTarget(formDTO, com.epmet.dto.org.form.GridBaseInfoFormDTO.class);
+        Result<List<CustomerGridDTO>> result = dataStatisticalOpenFeignClient.getGridBaseInfo(formDTO1);
         if (!result.success()) {
             throw new RenException(result.getInternalMsg());
         }
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridUserServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridUserServiceImpl.java
index c323a8e2c4..6a8902a38b 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridUserServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridUserServiceImpl.java
@@ -56,7 +56,8 @@ public class BaseGridUserServiceImpl extends BaseServiceImpl<BaseGridUserDao, Ba
     @Transactional(rollbackFor = Exception.class)
     public void getStaffBaseInfo(StaffBaseInfoFormDTO formDTO) {
         //1.查询网格基础信息
-        Result<List<GridUserInfoDTO>> result = dataStatisticalOpenFeignClient.getStaffBaseInfo(formDTO);
+        com.epmet.dto.user.form.StaffBaseInfoFormDTO formDTO1 = ConvertUtils.sourceToTarget(formDTO,  com.epmet.dto.user.form.StaffBaseInfoFormDTO.class);
+        Result<List<GridUserInfoDTO>> result = dataStatisticalOpenFeignClient.getStaffBaseInfo(formDTO1);
         if (!result.success()) {
             throw new RenException(result.getInternalMsg());
         }