From db34e588b950cce7e3e8a59f2e694a2aa8d54565 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 29 Apr 2016 15:34:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/BasicConfigFacade.java      | 24 ++++++++++++++++------
 .../web/request/BasicConfigQueryRequest.java       | 12 ++++++++++-
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
index 73496fd..4d1ebaa 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
@@ -32,13 +32,27 @@ public class BasicConfigFacade {
      * @return 返回结果
      */
     public BaseListResponse findBasicConfigList(BasicConfigQueryRequest basicConfigQueryRequest) {
+
         BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
         basicConfigQuery.setNeed("1");
         basicConfigQuery.setPage(basicConfigQueryRequest.getPage());
         basicConfigQuery.setLimit(basicConfigQueryRequest.getLimit());
         basicConfigQuery.setYn(YnEnums.YES.getId());
         basicConfigQuery.setKeyword(basicConfigQueryRequest.getKeywords());
+        basicConfigQuery.setParentId(basicConfigQueryRequest.getId());
         List<BasicConfig> data = basicConfigService.queryBasicConfig(basicConfigQuery);
+
+        return new BaseListResponse().setData(buildResult(data)).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(basicConfigQuery.getPageInfo());
+    }
+
+/*    public  BaseListResponse findByParentId(String id){
+        BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
+        basicConfigQuery.setParentId(id);
+        List<BasicConfig> data =  basicConfigService.queryBasicConfig(basicConfigQuery);
+        return new BaseListResponse().setData(buildResult(data)).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+    }*/
+
+    public List<BasicConfigResult> buildResult( List<BasicConfig> data){
         List<BasicConfigResult> dataList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(data)) {
             for (BasicConfig basicConfig : data) {
@@ -47,14 +61,12 @@ public class BasicConfigFacade {
                 dataList.add(basicConfigResult);
             }
         }
-        basicConfigQueryRequest.setCount(basicConfigQuery.getCount());
-        basicConfigQueryRequest.setLimit(basicConfigQuery.getLimit());
-        basicConfigQueryRequest.setPage(basicConfigQuery.getPage());
-        basicConfigQueryRequest.setLastPage(basicConfigQuery.getLastPage());
-
-        return new BaseListResponse().setData(dataList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+        return  dataList;
     }
 
+
+
+
     /**
      * 修改一条基础项配置
      *
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigQueryRequest.java
index 3351554..d505008 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigQueryRequest.java
@@ -19,7 +19,17 @@ public class BasicConfigQueryRequest extends BaseQuery {
     
     @FormParam
     private String keywords;
-    
+    @FormParam
+    private String id;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public String getKeywords() {
         return keywords;
     }
-- 
1.8.3.1