合并

whole-estate/src/main/java/com/example/wholeestate/controller/BuildingController.java

@@ -234,16 +234,16 @@ public class BuildingController extends BaseController {
         return responseBean;
     }
 
-//    @ApiOperation(value = "户型列表", notes = "户型列表")
-////    @ApiImplicitParams({
-////            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "id", value = "核销id"),
-////    })
-////    @RequestMapping(value = "/buildingApartment/{id}", method = RequestMethod.GET)
-////    public ResponseBean buildingApartmentSelectId(@PathVariable(value = "id") String id,
-////                                     @RequestParam("pageSize")Integer pageSize){
-////        ResponseBean  responseBean = iBuildingService.buildingApartmentSelectId(id);
-////        return responseBean;
-////    }
+//   @ApiOperation(value = "户型列表", notes = "户型列表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "id", value = "核销id"),
+//    })
+//    @RequestMapping(value = "/buildingApartment/{id}", method = RequestMethod.GET)
+//    public ResponseBean buildingApartmentSelectId(@PathVariable(value = "id") String id,
+//                                     @RequestParam("pageSize")Integer pageSize){
+//        ResponseBean  responseBean = iBuildingService.buildingApartmentSelectId(id);
+//       return responseBean;
+//   }
 
 
     @ApiOperation(value = "微信小程序楼盘列表", notes = "微信小程序楼盘列表")

whole-estate/src/main/java/com/example/wholeestate/controller/CustomerController.java

@@ -52,11 +52,21 @@ public class CustomerController extends BaseController {
 
     @ApiOperation(value = "会员列表", notes = "会员列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "pageNum:分页第几页,pageSize:每页长度,phone:手机号，name：姓名，beginDate:开始时间，endDate:结束时间")
+            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageNum",value = "pageNum:分页第几页" ),
+            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageSize",value = "pageSize:每页长度"),
+            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "phone",value = "phone:别名"),
+            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "name",value = "name:名字"),
+            @ApiImplicitParam(paramType = "Query",dataType = "Date",name = "beginDate",value = "beginDate:开始时间"),
+            @ApiImplicitParam(paramType = "Query",dataType = "Date",name = "endDate",value = "endDate:结束")
     })
-    @RequestMapping(value = "/customerList", method = RequestMethod.POST)
-    public ResponseBean buildingList(@RequestBody String parameter, HttpSession session){
-        ResponseBean  responseBean = iCustomerService.customerList(parameter);
+    @RequestMapping(value = "/customerList", method = RequestMethod.GET)
+    public ResponseBean buildingList(@RequestParam(value = "pageNum", required = false)Integer pageNum,
+                                     @RequestParam(value = "pageSize", required = false)Integer pageSize,
+                                     @RequestParam(value = "name", required = false)String name,
+                                     @RequestParam(value = "phone", required = false)String phone,
+                                     @RequestParam(value = "beginDate", required = false)Date beginDate,
+                                     @RequestParam(value = "endDate", required = false)Date endDate){
+        ResponseBean  responseBean = iCustomerService.customerList(pageNum,pageSize,phone,beginDate,endDate,name);
         return responseBean;
     }
 

whole-estate/src/main/java/com/example/wholeestate/service/ICustomerService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.model.Customer;
 
+import java.util.Date;
+
 /**
  * <p>
  *  服务类
@@ -16,11 +18,9 @@ public interface ICustomerService extends IService<Customer> {
 
     /**
      * 会员列表
-     * @param parameter
      * @return
      */
-    ResponseBean customerList(String parameter);
-
+    ResponseBean customerList(Integer pageNum, Integer pageSize, String phone, Date beginDate, Date endDate, String name);
     /**
      * 会员详情
      * @param id

whole-estate/src/main/java/com/example/wholeestate/service/impl/CustomerServiceImpl.java

@@ -38,15 +38,8 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     private IdGen idGen = IdGen.get();
 
     @Override
-    public ResponseBean customerList(String parameter) {
+    public ResponseBean customerList(Integer pageNum, Integer pageSize, String phone, Date beginDate, Date endDate, String name) {
         ResponseBean response= new ResponseBean();
-        JSONObject object= JSONObject.parseObject(parameter);
-        Date beginDate = object.getDate("beginDate");
-        Date endDate = object.getDate("endDate");
-        String phone = object.getString("phone");
-        String name = object.getString("name");
-        Integer pageNum = object.getInteger("pageNum");
-        Integer pageSize = object.getInteger("pageSize");
 
         Page<Customer> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);