批量查询

@@ -66,6 +66,11 @@
 			<artifactId>union-service-model</artifactId>
 			<version>1.2.6-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>com.yoho.service.model</groupId>
+			<artifactId>union-service-model</artifactId>
+			<version>1.2.6-SNAPSHOT</version>
+		</dependency>
 	</dependencies>
 
 	<build>

 package com.yoho.unions.server.service.impl;
 
 import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.JSONObject;
 import com.yoho.error.ServiceError;
 import com.yoho.error.exception.ServiceException;
 import com.yoho.service.model.response.PageResponseBO;
@@ -28,7 +29,7 @@ import java.util.List;
  * Created by jianhui.wang on 2017/7/25.
  */
 @Service
-public class userRegisterBuyInfoserviceImpl implements IUserRegisterBuyInfoService, IBusinessExportService {
+public class UserRegisterBuyInfoserviceImpl implements IUserRegisterBuyInfoService, IBusinessExportService {
 
     static Logger logger = LoggerFactory.getLogger("UserRegisterBuyInfoserviceImpl");
 
@@ -94,6 +95,9 @@ public class userRegisterBuyInfoserviceImpl implements IUserRegisterBuyInfoServi
         while (userRegisterBuyBO != null);
 
         for (int k = 0; k < userInfoList.size(); k++) {
+            if (null==userRegisterBuyVO.getRegister()||null==userRegisterBuyVO.getBuy()) {
+                    getuserInfoList.add(userInfoList.get(k));
+            }
             if ("0".equals(userRegisterBuyVO.getRegister()) && ("0".equals(userInfoList.get(k).getBuy()) || "1".equals(userInfoList.get(k).getBuy()))) {
                 if ("未注册".equals(userInfoList.get(k).getRegister()) && "未购买".equals(userInfoList.get(k).getBuy())) {
                     getuserInfoList.add(userInfoList.get(k));
@@ -127,9 +131,8 @@ public class userRegisterBuyInfoserviceImpl implements IUserRegisterBuyInfoServi
     @Override
     public List<? extends Object> batchExport(String confStr) {
         try {
-            UserRegisterBuyVO userRegisterBuyVO =new UserRegisterBuyVO();
-            userRegisterBuyVO.setRegister(confStr.substring(15,16));
-            userRegisterBuyVO.setBuy(confStr.substring(27,28));
+            UserRegisterBuyVO userRegisterBuyVO = JSONObject.parseObject(confStr, UserRegisterBuyVO.class);
+
             PageResponseBO<UserRegisterBuyBO> pageResponseBO = getUserRegisterBuyList(userRegisterBuyVO);
             List<UserRegisterBuyBO> UserRegisterBuyBOList = pageResponseBO.getList();
             if (CollectionUtils.isEmpty(UserRegisterBuyBOList)) {

@@ -19,22 +19,20 @@
 
         <!--<button>Export</button>-->
 
-        <input id="isReplyCombobox" class="easyui-combobox" value="1" data-options="
+        <input id="isReplyCombobox" class="easyui-combobox" data-options="
         editable: false,
 		valueField: 'id',
 		textField: 'text',
-		data: [{
-			id: '1',
-			text: '已注册'
-		}, {
-			id: '2',
-			text: '未注册'
-		}]"/>
-        <input id="isDeleteCombobox" class="easyui-combobox" value="1" data-options="
+		data: [ { id: '', text: '是否注册' },
+		,{id: '1',text: '已注册'	},
+		 {id: '2',text: '未注册'	}
+		 ]"/>
+        <input id="isDeleteCombobox" class="easyui-combobox" data-options="
         editable: false,
 		valueField: 'id',
 		textField: 'text',
-		data: [{
+		data: [
+		{ id: '', text: '是否购买' },{
 			id: '1',
 			text: '未购买'
 		}, {
@@ -51,6 +49,20 @@
 </div>
 
 <script type="text/javascript">
+
+    function getParams() {
+        var isRegister = $("#isRegister").combobox('getValue');
+        var isBuy = $("#isBuy").combobox("getValue");
+
+        var param = {};
+        if (undefined !== isRegister && null !== isRegister && "" !== isRegister) {
+            param.isRegister = isRegister;
+        }
+        if (undefined !== isBuy && null !== isBuy && "" !== isBuy) {
+            param.isBuy = isBuy;
+        }
+        return param;
+    }
     $(function () {
         $("#batchProgram").linkbutton({
             text: "批量导入",