合并

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

@@ -234,16 +234,15 @@ 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 = "户型列表根据楼盘ID查询", notes = "户型列表根据楼盘ID查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "id", value = "核销id"),
+    })
+    @RequestMapping(value = "/buildingApartment/buildingId/{id}", method = RequestMethod.GET)
+    public ResponseBean buildingApartmentBuildingId(@PathVariable(value = "id") String id){
+        ResponseBean  responseBean = iBuildingService.buildingApartmentBuildingId(id);
+       return responseBean;
+   }
 
 
     @ApiOperation(value = "微信小程序楼盘列表", notes = "微信小程序楼盘列表")

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

@@ -57,16 +57,18 @@ public class CustomerController extends BaseController {
             @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:结束")
+            @ApiImplicitParam(paramType = "Query",dataType = "Date",name = "endDate",value = "endDate:结束"),
+            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "cardNo",value = "cardNo:身份证")
     })
     @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 = "cardNo", required = false)String cardNo,
                                      @RequestParam(value = "beginDate", required = false)Date beginDate,
                                      @RequestParam(value = "endDate", required = false)Date endDate){
-        ResponseBean  responseBean = iCustomerService.customerList(pageNum,pageSize,phone,beginDate,endDate,name);
+        ResponseBean  responseBean = iCustomerService.customerList(pageNum,pageSize,phone,beginDate,endDate,name,cardNo);
         return responseBean;
     }
 

whole-estate/src/main/java/com/example/wholeestate/dao/CustomerMapper.java

@@ -23,5 +23,5 @@ public interface CustomerMapper extends BaseMapper<Customer> {
      * @param page
      * @return
      */
-    IPage<Customer> customerList(Page<Customer> page, @Param("Name") String name, @Param("phone")String phone, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+    IPage<Customer> customerList(Page<Customer> page, @Param("Name") String name, @Param("phone")String phone, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate,@Param("cardNo") String cardNo);
 }

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

@@ -97,4 +97,11 @@ public interface IBuildingService extends IService<Building> {
     ResponseBean getWxBuildingList();
 
     ResponseBean getWxBuildingById(String buildingId);
+
+    /**
+     * 户型列表根据楼盘ID查询
+     * @param id
+     * @return
+     */
+    ResponseBean buildingApartmentBuildingId(String id);
 }

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

@@ -20,7 +20,7 @@ public interface ICustomerService extends IService<Customer> {
      * 会员列表
      * @return
      */
-    ResponseBean customerList(Integer pageNum, Integer pageSize, String phone, Date beginDate, Date endDate, String name);
+    ResponseBean customerList(Integer pageNum, Integer pageSize, String phone, Date beginDate, Date endDate, String name,String cardNo);
     /**
      * 会员详情
      * @param id

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

@@ -417,4 +417,14 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
 
         return responseBean;
     }
+
+    @Override
+    public ResponseBean buildingApartmentBuildingId(String id) {
+        ResponseBean responseBean= new ResponseBean();
+        QueryWrapper<BuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
+        buildingApartmentQueryWrapper.eq("building_id", id);
+         List<BuildingApartment> buildingApartment= buildingApartmentMapper.selectList(buildingApartmentQueryWrapper);
+         responseBean.addSuccess(buildingApartment);
+         return responseBean;
+    }
 }

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

@@ -38,13 +38,13 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     private IdGen idGen = IdGen.get();
 
     @Override
-    public ResponseBean customerList(Integer pageNum, Integer pageSize, String phone, Date beginDate, Date endDate, String name) {
+    public ResponseBean customerList(Integer pageNum, Integer pageSize, String phone, Date beginDate, Date endDate, String name , String cardNo) {
         ResponseBean response= new ResponseBean();
 
         Page<Customer> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        IPage<Customer> customer= customerMapper.customerList(page,name,phone,beginDate,endDate);
+        IPage<Customer> customer= customerMapper.customerList(page,name,phone,beginDate,endDate,cardNo);
         List<Customer> customerList=customer.getRecords();
 
         HashMap hashMap= new HashMap<>();

whole-estate/src/main/resources/mapper/CustomerMapper.xml

@@ -5,6 +5,11 @@
         select * from ta_customer
             <where>
                 status > -1
+
+                <if test="cardNo != null and cardNo != ''">
+                    and  ta_customer.id_num like concat('%',#{cardNo,jdbcType=VARCHAR},'%')
+                </if>
+
                 <if test="Name != null and Name != ''">
                     and  (ta_customer.name like concat('%',#{Name,jdbcType=VARCHAR},'%') or ta_customer.customer_name like concat('%',#{Name,jdbcType=VARCHAR},'%'))
                 </if>