From abf61ca87c8ccfe3f2efe3b1337b29784f3b2a35 Mon Sep 17 00:00:00 2001
From: hujiaqi <hujiaqi@lymsh.com>
Date: Wed, 4 Jan 2017 14:15:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=AE=BE=E7=BD=AEexcel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/MatDeliverController.java       | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
index 044e526..fd3d92c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
@@ -178,6 +178,33 @@ public class MatDeliverController extends BaseController{
     public void childbirthManagerExcel(HttpServletRequest httpServletRequest, @RequestBody ChildbirthManagerRequest childbirthManagerRequest, HttpServletResponse httpServletResponse) {
         try {
             childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
+
+            Map<String, String> query;
+            if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())) {
+                // 自定义查询
+                query = new HashMap<>();
+                String initQuery = childbirthManagerRequest.getInitQuery();
+                for (String key : childbirthManagerRequest.getInitQueryMap().keySet()) {
+                    if (initQuery.contains(key)) {
+                        query.put(key, query.get(key));
+                    }
+                }
+            } else {
+                // 没有自定义查询，开始构造普通查询
+                if (StringUtils.isEmpty(childbirthManagerRequest.getIsArea())) {
+                    // 非区域
+                    query = childbirthManagerRequest.getNormalQueryMap();
+                } else {
+                    // 区域
+                    query = childbirthManagerRequest.getAreaQueryMap();
+                }
+                String queryStr = "";
+                for (String key : query.keySet()) {
+                    queryStr += key + ",";
+                }
+                childbirthManagerRequest.setInitQuery(queryStr.substring(0, queryStr.length() - 1));
+            }
+
             childbirthManagerRequest.setExcel(true);
             // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据
             @SuppressWarnings("unchecked")
-- 
1.8.3.1