From 50a775ac70f13a0c9c804b3e7f578fddbb13e0e0 Mon Sep 17 00:00:00 2001
From: yangshaoping <123456>
Date: Tue, 17 Mar 2020 14:44:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=A0=B9=E6=8D=AE=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7id,=E6=89=80=E5=B1=9E=E7=AB=AF=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=A6=96=E9=A1=B5=E9=85=8D=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E7=A8=BF-=E6=B3=A8=E9=87=8A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/CustomerHomeDetailDao.java | 7 ++++++-
 .../main/java/com/epmet/service/impl/HomeServiceImpl.java  | 5 +++--
 .../src/main/resources/mapper/CustomerHomeDetailDao.xml    | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeDetailDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeDetailDao.java
index c6571bd2ef..838b83083d 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeDetailDao.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeDetailDao.java
@@ -42,6 +42,11 @@ public interface CustomerHomeDetailDao extends BaseDao<CustomerHomeDetailEntity>
 	 * @date 2020/3/16 14:02
 	 */
 	void updateCustomerHomeDetailByHomeId(String homeId);
-
+	/**
+	 *
+	 * 根据客户id,所属端获取客户首页配置的设计稿
+	 * @author yangshaoping
+	 * @date 2020/3/1714:02
+	 */
     List<CommonComponentDesignResultDTO> getCustomerHomeDetailComponent(HomeDesignByCustomerFormDTO form);
 }
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java
index 2d94250b2e..b3c72107bd 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java
@@ -45,9 +45,10 @@ public class HomeServiceImpl implements HomeService {
     @Override
     public Result<HomeDesignByCustomerResultDTO> getHomeDesignByCustomer(HomeDesignByCustomerFormDTO formDTO) {
         HomeDesignByCustomerResultDTO resultDTO = new HomeDesignByCustomerResultDTO();
+        //根据客户id,所属端获取客户首页配置的设计稿
         List<CommonComponentDesignResultDTO> list = customerHomeDetailDao.getCustomerHomeDetailComponent(formDTO);
-        List<CommonComponentDesignResultDTO> flist=new ArrayList<CommonComponentDesignResultDTO>();//功能组件
-        List<String> usedComponent=new ArrayList<>();//使用的组件集合
+        List<CommonComponentDesignResultDTO> flist=new ArrayList<CommonComponentDesignResultDTO>();//功能组件列表
+        List<String> usedComponent=new ArrayList<>();//使用过的组件集合
         for(CommonComponentDesignResultDTO c:list){
             usedComponent.add(c.getComponentId());
             //所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml
index 91df873854..ab479f04a4 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml
@@ -28,7 +28,7 @@
             AND DEL_FLAG = 0
     </update>
 
-    <!--   客户草稿列表查询 -->
+    <!--   根据客户id,所属端获取客户首页配置的设计稿 -->
     <select id="getCustomerHomeDetailComponent" parameterType="com.epmet.dto.form.HomeDesignByCustomerFormDTO"
             resultType="com.epmet.dto.result.CommonComponentDesignResultDTO">
     SELECT