1.标的物审批通过和未通过的都展示出来

2.商品通过、未通过、待审核均展示出来
3.标的物名称改成商铺名称
4.线下竞拍加一个时间，并按时间排序
5.线下竞拍搜索条件加一个身份证号搜索
6.线上拍卖加一个出价记录入口
7.支付加一个类型

krock-api/krock-api-all/src/main/java/com/ydw/yunbuyer/api/pm/api/PmVerifyApi.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import com.ydw.yunbuyer.api.pm.entity.ProjectItem;
+import org.tmsps.ne4spring.page.PagePackage;
 
 /**
  * 审核
@@ -22,9 +23,10 @@ public interface PmVerifyApi {
 	 * 查询未审批列表
 	 * 
 	 * @return
+	 * @param pagePackage
 	 */
 	@RequestMapping("/list_not_verify")
-	public List<Map<String, Object>> list_not_verify();
+	public PagePackage list_not_verify(@RequestBody PagePackage pagePackage);
 
 	/**
 	 * 查询审批通过的列表

krock-api/krock-api-all/src/main/java/com/ydw/yunbuyer/api/pm/api/ShopApi.java

@@ -13,7 +13,7 @@ import com.ydw.yunbuyer.api.pm.entity.Shop;
  * 
  * @author 吴思凡
  *
- * @param <T>
+ * @param
  */
 @RequestMapping("/api/pm/shop")
 public interface ShopApi {
@@ -42,7 +42,7 @@ public interface ShopApi {
 	 * @return
 	 */
 	@RequestMapping("/list_data")
-	public List<Map<String, Object>> list_data();
+	public PagePackage list_data(@RequestBody PagePackage pagePackage);
 
 	/**
 	 * cp 所有审核通过的店铺

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/PmVerifyController.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.tmsps.ne4spring.page.PagePackage;
 
 import java.util.List;
 import java.util.Map;
@@ -46,12 +47,13 @@ public class PmVerifyController extends ProjBaseAction {
 	@ApiOperation("查询所有待审核标的物列表")
 	@RequestMapping("/list_data_pm")
 	public String list_data_pm() {
-		List<Map<String, Object>> list = pmVerifyApi.list_not_verify();
+		PagePackage pagePackage = pmVerifyApi.list_not_verify(super.pagePackage);
+		List<Map<String, Object>> list = pagePackage.getData();
 		for (Map<String, Object> map : list) {
 			map.put("created", DateTools.getstrDate(map.get("created").toString()));
 		}
-		result.put("list", list);
-		return result.toJSONString();
+		pagePackage.getPage().setList(list);
+		return super.getPageResult(pagePackage);
 	}
 
 	/**

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/ShopsVerifyController.java

@@ -5,12 +5,14 @@ import com.ydw.yunbuyer.api.pm.entity.Shop;
 import com.ydw.yunbuyer.api.user.api.PersionApi;
 import com.ydw.yunbuyer.api.user.entity.Persion;
 import com.ydw.yunbuyer.web.cp.base.action.ProjBaseAction;
+import com.ydw.yunbuyer.web.cp.util.DateTools;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.tmsps.ne4spring.page.PagePackage;
 
 import java.util.List;
 import java.util.Map;
@@ -37,9 +39,14 @@ public class ShopsVerifyController extends ProjBaseAction {
 	@ApiOperation("查询所有待审核商铺列表")
 	@RequestMapping("/list_data")
 	public String list_data() {
-		List<Map<String, Object>> list = shopApi.list_data();
-		result.put("list", list);
-		return result.toJSONString();
+		PagePackage pagePackage = shopApi.list_data(super.pagePackage);
+		List<Map<String, Object>> list = pagePackage.getData();
+		for (Map<String, Object> map : list) {
+			map.put("created", DateTools.getstrDate(map.get("created").toString()));
+		}
+		pagePackage.getPage().setList(list);
+
+		return super.getPageResult(pagePackage);
 	}
 
 	/**

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/UnLineUserController.java

@@ -6,6 +6,7 @@ import com.ydw.yunbuyer.api.pm.entity.PmItemSubmit;
 import com.ydw.yunbuyer.api.pm.entity.PmOfflineApply;
 import com.ydw.yunbuyer.common.utils.ChkTools;
 import com.ydw.yunbuyer.web.cp.base.action.ProjBaseAction;
+import com.ydw.yunbuyer.web.cp.util.DateTools;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +45,9 @@ public class UnLineUserController extends ProjBaseAction {
 
 		PagePackage pagePackage = submitApi.list_data_offline(super.pagePackage);
 		List<Map<String, Object>> list = pagePackage.getData();
-
+		for (Map<String, Object> map : list) {
+			map.put("created", DateTools.getstrDate(map.get("created").toString()));
+		}
 		pagePackage.getPage().setList(list);
 
 		return super.getPageResult(pagePackage);

krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/bid_opening/bid_opening.html

@@ -228,6 +228,16 @@
                         }
                     },{
                         xtype : 'container'
+                    },{
+                        xtype : 'button',
+                        tooltip : '出价记录入口',
+                        icon : jcapp.getIcon("user_magnify.png"),
+                        handler : function(grid, rowIndex, colIndex) {
+                            var rec = grid.getStore().getAt(rowIndex);
+                            window.location.href = "/web-cp-all/view_cp_pm/pm/un_line_item/pm_info.html?kid="+rec.get('kid')+"&name="+rec.get('item_name')+"&r="+new Date();
+                        }
+                    },{
+                        xtype : 'container'
                     }]
                 } ],
                 viewConfig:{

krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/pay_record/list.html

@@ -194,6 +194,12 @@ Ext.onReady(function() {
 				dataIndex : 'money',
 				flex : 1
 			},{
+                text : '类型',
+                tooltip : '类型',
+                align : 'center',
+                dataIndex : 'business_type',
+                flex : 1
+            },{
 				text : '用户联系电话',
 				tooltip : '用户联系电话',
 				align : 'center',

krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/shops/shops_verify.html

@@ -26,7 +26,7 @@
                 url : "/web-cp-all/cp/pm/shops/verify/list_data",
                 reader : {
                     type : 'json',
-                    root : 'list',
+                    root : 'page.list',
                     totalProperty : 'page.totalRow'
                 }
             },
@@ -37,6 +37,15 @@
                 }
             }
         }); //#dataStore
+        var verifyStatusStore = Ext.create('Ext.data.Store',{
+            fields : ['abbr','name'],
+            data:[
+                {"abbr":"全部","name":"全部"},
+                {"abbr":"未审核","name":"未审核"},
+                {"abbr":"审核未通过","name":"审核未通过"},
+                {"abbr":"审核通过","name":"审核通过"},
+            ]
+        });
 
         var searchFormPanel = Ext.create('Ext.form.Panel', {
             frame : true,
@@ -55,9 +64,19 @@
                 layout : "hbox",
                 items : [ {
                     xtype : "textfield",
-                    fieldLabel : "标的物名称",
-                    name : "srh.notice_title"
-                }]
+                    fieldLabel : "商铺名称",
+                    name : "srh.name"
+                },{
+                    fieldLabel : "状态",
+                    name : "srh.verify_status",
+                    xtype : "combo",
+                    editable : false,
+                    store : verifyStatusStore,
+                    displayField : 'name',
+                    valueField : 'abbr',
+                    labelAlign : 'right',
+                    value : "全部"
+                },]
             } ],
             buttons : [ {
                 text : "搜索",

krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line_user/list.html

@@ -70,7 +70,12 @@ Ext.onReady(function() {
 						fieldLabel : "公司名称",
 						labelAlign : 'right',
 						name : "srh.company_name"
-					}
+					},{
+                        xtype : "textfield",
+                        fieldLabel : "身份证",
+                        labelAlign : 'right',
+                        name : "srh.id_card"
+                    }
 				]
 			} 
 		],
@@ -142,6 +147,12 @@ Ext.onReady(function() {
 				dataIndex : 'receive_mobile',
 				flex : 1
 			},{
+                text : '创建时间',
+                topTip : '创建时间',
+                align : 'center',
+                dataIndex : 'created',
+                flex : 1
+            },{
 				text : '公司名称',
 				topTip : '公司名称',
 				align : 'center',

krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/verify/bdw_verify.html

@@ -26,7 +26,7 @@
                 url : "/web-cp-all/cp/pm/verify/list_data_pm",
                 reader : {
                     type : 'json',
-                    root : 'list',
+                    root : 'page.list',
                     totalProperty : 'page.totalRow'
                 }
             },
@@ -34,10 +34,20 @@
                 'beforeload' : function(store, op, options) {
                     var params = searchFormPanel.getForm().getValues();
                     Ext.apply(dataStore.proxy.extraParams, params);
+                    console.log(dataStore);
                 }
             }
         }); //#dataStore
-        console.log(dataStore);
+        var verifyStatusStore = Ext.create('Ext.data.Store',{
+            fields : ['abbr','name'],
+            data:[
+                {"abbr":"全部","name":"全部"},
+                {"abbr":"未审核","name":"未审核"},
+                {"abbr":"未通过","name":"未通过"},
+                {"abbr":"审核通过","name":"审核通过"},
+            ]
+        });
+
         var searchFormPanel = Ext.create('Ext.form.Panel', {
             frame : true,
             title : "搜索条件",
@@ -56,8 +66,18 @@
                 items : [ {
                     xtype : "textfield",
                     fieldLabel : "标的物名称",
-                    name : "srh.notice_title"
-                }]
+                    name : "srh.item_name"
+                },{
+                    fieldLabel : "状态",
+                    name : "srh.verify_status",
+                    xtype : "combo",
+                    editable : false,
+                    store : verifyStatusStore,
+                    displayField : 'name',
+                    valueField : 'abbr',
+                    labelAlign : 'right',
+                    value : "全部"
+                },]
             } ],
             buttons : [ {
                 text : "搜索",
@@ -81,12 +101,14 @@
 
         var listGridPanel = Ext.create('Ext.grid.Panel', {
             title : '标的物列表',
-            dockedItems : [ {
-                xtype : 'pagingtoolbar',
-                store : dataStore,
-                dock : 'bottom',
-                displayInfo : true
-            } ],
+            dockedItems : [
+                {
+                    xtype : 'pagingtoolbar',
+                    store : dataStore,
+                    dock : 'bottom',
+                    displayInfo : true
+                }
+            ],
             store : dataStore,
             columns : [
                 {

krock-pm/krock-api-pm/src/main/java/com/ydw/yunbuyer/api/pm/api/PmVerifyApi.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import com.ydw.yunbuyer.api.pm.entity.ProjectItem;
+import org.tmsps.ne4spring.page.PagePackage;
 
 /**
  * 审核
@@ -24,7 +25,7 @@ public interface PmVerifyApi {
 	 * @return
 	 */
 	@RequestMapping("/list_not_verify")
-	public List<Map<String, Object>> list_not_verify();
+	public PagePackage list_not_verify(@RequestBody PagePackage pagePackage);
 
 	/**
 	 * 查询审批通过的列表

krock-pm/krock-api-pm/src/main/java/com/ydw/yunbuyer/api/pm/api/ShopApi.java

@@ -42,7 +42,7 @@ public interface ShopApi<T> {
 	 * @return
 	 */
 	@RequestMapping("/list_data")
-	public List<Map<String, Object>> list_data();
+	public PagePackage list_data(@RequestBody PagePackage pagePackage);
 
 	/**
 	 * cp 所有审核通过的店铺

krock-pm/krock-service-pm/src/main/java/com/ydw/yunbuyer/serv_pm/service/PmVerifyServiceApiImpl.java

@@ -4,10 +4,16 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import javax.transaction.Transactional;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.ClientProtocolException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
+import org.tmsps.ne4spring.orm.param.NeParamList;
+import org.tmsps.ne4spring.page.Page;
+import org.tmsps.ne4spring.page.PagePackage;
 import org.tmsps.ne4spring.utils.DateTools;
 import com.ydw.yunbuyer.api.pm.api.PmVerifyApi;
 import com.ydw.yunbuyer.api.pm.entity.PmItem;
@@ -29,10 +35,21 @@ public class PmVerifyServiceApiImpl implements PmVerifyApi {
 	BaseMySQLService bs;
 
 	@Override
-	public List<Map<String, Object>> list_not_verify() {
-		String sql = "select t.* from t_project_item t where status=0 and verify_status='未审核' ";
-		List<Map<String, Object>> list = bs.findList(sql);
-		return list;
+	public PagePackage list_not_verify(@RequestBody PagePackage pagePackage) {
+		JSONObject srh = pagePackage.getSrh();
+		Map<String, String> sort_param = pagePackage.getSort_param();
+		Page page = pagePackage.getPage();
+		String sql = "select t.* from t_project_item t where t.status=0 and (t.item_name like ?)  ";
+		String verify_status = srh.getString("verify_status");
+		if (StringUtils.isNotBlank(verify_status) && !"全部".equals(verify_status)){
+			sql+=" and t.verify_status='"+verify_status+"'";
+		}
+		sql+=" ORDER BY t.created desc ";
+		NeParamList params = NeParamList.makeParams();
+		params.addLike(srh.getString("item_name"));
+		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
+		pagePackage.setData(list);
+		return pagePackage;
 	}
 
 	@Override

krock-pm/krock-service-pm/src/main/java/com/ydw/yunbuyer/serv_pm/service/ShopServiceApiImpl.java

@@ -38,10 +38,22 @@ public class ShopServiceApiImpl extends BaseApiImpl<Shop> implements ShopApi<Sho
 	}
 
 	@Override
-	public List<Map<String, Object>> list_data() {
-		String sql = "select t.* from t_shop t where t.status=0 and t.verify_status='未审核' ";
-		List<Map<String, Object>> list = bs.findList(sql);
-		return list;
+	public PagePackage list_data(@RequestBody PagePackage pagePackage) {
+		JSONObject srh = pagePackage.getSrh();
+		Map<String, String> sort_param = pagePackage.getSort_param();
+		Page page = pagePackage.getPage();
+		String sql = " select t.* from t_shop t where t.status=0 and (t.name like ?) and (t.verify_status=?) ORDER BY t.created desc  ";
+		NeParamList params = NeParamList.makeParams();
+		params.addLike(srh.getString("name"));
+		if ("全部".equals(srh.getString("verify_status"))){
+			params.add("");
+		}else{
+			params.add(srh.getString("verify_status"));
+		}
+		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
+		pagePackage.setData(list);
+
+		return pagePackage;
 	}
 
 	@Override

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/action_api/IPmVerifyController.java

@@ -11,6 +11,7 @@ import com.ydw.yunbuyer.api.pm.entity.ProjectItem;
 import com.ydw.yunbuyer.common.utils.BeanUtils;
 import com.ydw.yunbuyer.web.pm.entity.t_project_item;
 import com.ydw.yunbuyer.web.pm.service.PmVerifyService;
+import org.tmsps.ne4spring.page.PagePackage;
 
 /**
  * 
@@ -25,8 +26,8 @@ public class IPmVerifyController implements PmVerifyApi {
 	PmVerifyService pmVerifyService;
 
 	@Override
-	public List<Map<String, Object>> list_not_verify() {
-		return pmVerifyService.list_not_verify();
+	public PagePackage list_not_verify(@RequestBody PagePackage pagePackage) {
+		return pmVerifyService.list_not_verify(pagePackage);
 	}
 
 	@Override

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/action_api/IShopController.java

@@ -35,8 +35,8 @@ public class IShopController implements ShopApi {
 	}
 
 	@Override
-	public List<Map<String, Object>> list_data() {
-		return shopService.list_data();
+	public PagePackage list_data(@RequestBody PagePackage pagePackage) {
+		return shopService.list_data(pagePackage);
 	}
 
 	@Override

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxItemController.java

@@ -11,6 +11,7 @@ import com.ydw.yunbuyer.web.pm.service.LiveRoomService;
 import com.ydw.yunbuyer.web.pm.service.PmItemService;
 import com.ydw.yunbuyer.web.pm.service.WxItemService;
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
+import com.ydw.yunbuyer.web.pm.web.WebMsgTools;
 import com.ydw.yunbuyer.web.pm.web.WebTools;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,6 +24,7 @@ import org.tmsps.ne4spring.utils.DateTools;
 
 import java.io.IOException;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -269,6 +271,10 @@ public class WxItemController extends ProjBaseAction {
 
 				// 发送模板消息
 				WebTools.sendMsg(url, pages, open_id, templateId, form_id, strarray);
+				/*Date day=new Date();
+				SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				String date = df.format(day);
+				WebMsgTools.sendAuctionStartReminderMessage(open_id,item_name,date);*/
 			}
 		}
 		super.setTipMsg(true, s + "成功", Tip.Type.success);

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/dao/PmVerifyDao.java

@@ -5,6 +5,7 @@ import java.util.Map;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.ydw.yunbuyer.web.pm.entity.t_project_item;
+import org.tmsps.ne4spring.page.PagePackage;
 
 /**
  * 审核
@@ -19,7 +20,7 @@ public interface PmVerifyDao {
 	 * 
 	 * @return
 	 */
-	public List<Map<String, Object>> list_not_verify();
+	public PagePackage list_not_verify(@RequestBody PagePackage pagePackage);
 
 	/**
 	 * 查询审批通过的列表

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/dao/ShopDao.java

@@ -37,7 +37,7 @@ public interface ShopDao extends BaseDao<t_shop>{
 	 * 
 	 * @return
 	 */
-	public List<Map<String, Object>> list_data();
+	public PagePackage list_data(@RequestBody PagePackage pagePackage);
 
 	/**
 	 * cp 所有审核通过的店铺

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/PmVerifyDaoImpl.java

@@ -4,11 +4,16 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.ClientProtocolException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.tmsps.ne4spring.orm.param.NeParamList;
+import org.tmsps.ne4spring.page.Page;
+import org.tmsps.ne4spring.page.PagePackage;
 import org.tmsps.ne4spring.utils.DateTools;
 import com.ydw.yunbuyer.web.pm.base.BaseMySQLService;
 import com.ydw.yunbuyer.web.pm.dao.PmVerifyDao;
@@ -30,10 +35,21 @@ public class PmVerifyDaoImpl implements PmVerifyDao {
 	BaseMySQLService bs;
 
 	@Override
-	public List<Map<String, Object>> list_not_verify() {
-		String sql = "select t.* from t_project_item t where status=0 and verify_status='未审核' ";
-		List<Map<String, Object>> list = bs.findList(sql);
-		return list;
+	public PagePackage list_not_verify(@RequestBody PagePackage pagePackage) {
+		JSONObject srh = pagePackage.getSrh();
+		Map<String, String> sort_param = pagePackage.getSort_param();
+		Page page = pagePackage.getPage();
+		String sql = "select t.* from t_project_item t where t.status=0 and (t.item_name like ?)  ";
+		String verify_status = srh.getString("verify_status");
+		if (StringUtils.isNotBlank(verify_status) && !"全部".equals(verify_status)){
+			sql+=" and t.verify_status='"+verify_status+"'";
+		}
+		sql+=" ORDER BY t.created desc ";
+		NeParamList params = NeParamList.makeParams();
+		params.addLike(srh.getString("item_name"));
+		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
+		pagePackage.setData(list);
+		return pagePackage;
 	}
 
 	@Override

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/ShopDaoImpl.java

@@ -37,10 +37,21 @@ public class ShopDaoImpl extends BaseDaoImpl<t_shop> implements ShopDao {
 	}
 
 	@Override
-	public List<Map<String, Object>> list_data() {
-		String sql = "select t.* from t_shop t where t.status=0 and t.verify_status='未审核' ";
-		List<Map<String, Object>> list = bs.findList(sql);
-		return list;
+	public PagePackage list_data(@RequestBody PagePackage pagePackage) {
+		JSONObject srh = pagePackage.getSrh();
+		Map<String, String> sort_param = pagePackage.getSort_param();
+		Page page = pagePackage.getPage();
+		String sql = " select t.* from t_shop t where t.status=0 and (t.name like ?) and (t.verify_status=?) ORDER BY t.created desc  ";
+		NeParamList params = NeParamList.makeParams();
+		params.addLike(srh.getString("name"));
+		if ("全部".equals(srh.getString("verify_status"))){
+			params.add("");
+		}else{
+			params.add(srh.getString("verify_status"));
+		}
+		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
+		pagePackage.setData(list);
+		return pagePackage;
 	}
 
 	@Override

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/WxSubmitDaoImpl.java

@@ -94,10 +94,12 @@ public class WxSubmitDaoImpl extends BaseDaoImpl<t_pm_offline_apply> implements
 		JSONObject srh = pagePackage.getSrh();
 		Map<String, String> sort_param = pagePackage.getSort_param();
 		Page page = pagePackage.getPage();
-		String sql = "select t.* from t_pm_offline_apply t where t.status=0 and t.pm_item_id is null and (t.receive_name like ?) and (t.company_name like ?) ";
+		String sql = "select t.* from t_pm_offline_apply t where t.status=0 and t.pm_item_id is null and (t.receive_name like ?) and (t.company_name like ?) and (t.id_card like ?) ORDER BY t.created desc ";
 		NeParamList params = NeParamList.makeParams();
+
 		params.addLike(srh.getString("receive_name"));
 		params.addLike(srh.getString("company_name"));
+		params.addLike(srh.getString("id_card"));
 		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
 		pagePackage.setData(list);
 		return pagePackage;

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/service/PmVerifyService.java

@@ -3,6 +3,8 @@ package com.ydw.yunbuyer.web.pm.service;
 import java.util.List;
 import java.util.Map;
 import com.ydw.yunbuyer.web.pm.entity.t_project_item;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.tmsps.ne4spring.page.PagePackage;
 
 /**
  * 审核
@@ -17,7 +19,7 @@ public interface PmVerifyService {
 	 * 
 	 * @return
 	 */
-	public List<Map<String, Object>> list_not_verify();
+	public PagePackage list_not_verify(@RequestBody PagePackage pagePackage);
 
 	/**
 	 * 查询审批通过的列表

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/service/ShopService.java

@@ -2,6 +2,8 @@ package com.ydw.yunbuyer.web.pm.service;
 
 import java.util.List;
 import java.util.Map;
+
+import org.springframework.web.bind.annotation.RequestBody;
 import org.tmsps.ne4spring.page.PagePackage;
 import com.ydw.yunbuyer.web.pm.entity.t_shop;
 
@@ -35,7 +37,7 @@ public interface ShopService extends BaseService<t_shop> {
 	 * 
 	 * @return
 	 */
-	public List<Map<String, Object>> list_data();
+	public PagePackage list_data(@RequestBody PagePackage pagePackage);
 
 	/**
 	 * cp 所有审核通过的店铺

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/serviceImpl/PmVerifyServiceImpl.java

@@ -10,6 +10,7 @@ import com.ydw.yunbuyer.web.pm.base.BaseMySQLService;
 import com.ydw.yunbuyer.web.pm.dao.PmVerifyDao;
 import com.ydw.yunbuyer.web.pm.entity.t_project_item;
 import com.ydw.yunbuyer.web.pm.service.PmVerifyService;
+import org.tmsps.ne4spring.page.PagePackage;
 
 /**
  * 
@@ -27,8 +28,8 @@ public class PmVerifyServiceImpl implements PmVerifyService {
 	PmVerifyDao mVerifyDao;
 
 	@Override
-	public List<Map<String, Object>> list_not_verify() {
-		return mVerifyDao.list_not_verify();
+	public PagePackage list_not_verify(@RequestBody PagePackage pagePackage) {
+		return mVerifyDao.list_not_verify(pagePackage);
 	}
 
 	@Override

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/serviceImpl/ShopServiceImpl.java

@@ -28,8 +28,8 @@ public class ShopServiceImpl extends BaseServiceImpl<t_shop> implements ShopServ
 	}
 
 	@Override
-	public List<Map<String, Object>> list_data() {
-		return shopDao.list_data();
+	public PagePackage list_data(@RequestBody PagePackage pagePackage){
+		return shopDao.list_data(pagePackage);
 	}
 
 	@Override

krock-sso/krock-web-sso/src/main/resources/application.yml

@@ -7,7 +7,8 @@ server:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://192.168.1.249:16000/eureka/
+#      defaultZone: http://192.168.1.249:16000/eureka/
+      defaultZone: http://127.0.0.1:16000/eureka/
 spring:
   application:
     name: web-sso