合并

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

@@ -71,14 +71,16 @@ public class BuildingController extends BaseController {
     @ApiOperation(value = "楼盘预约", notes = "楼盘预约")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageNum",value = "分页第几页" ),
-            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageSize",value = "pageSize:每页长度" )
+            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageSize",value = "pageSize:每页长度" ),
+            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "buildingId",value = "buildingId:楼盘ID" ),
+            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "username",value = "username:用户名称" )
 
     })
 //    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
-    @RequestMapping(value = "/appointmentlsit", method = RequestMethod.GET)
-    public ResponseBean appointmentList(@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize, HttpSession session){
+    @RequestMapping(value = "/appointmentlist", method = RequestMethod.GET)
+    public ResponseBean appointmentList(@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize, HttpSession session,@RequestParam("buildingId")Integer buildingId,@RequestParam("username")String username){
 //        SysUser sessionUser= getSessionUser(session);
-        ResponseBean  responseBean = iBuildingService.appointmentList(pageNum,pageSize);
+        ResponseBean  responseBean = iBuildingService.appointmentList(pageNum,pageSize,buildingId,username);
         return responseBean;
     }
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.wholeestate.model.Appointment;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -19,7 +20,7 @@ public interface AppointmentMapper extends BaseMapper<Appointment> {
      * @param page
      * @return
      */
-    IPage<Appendable> appendableList(Page<Appendable> page);
+    IPage<Appointment> appendableList(Page page, @Param("buildingId") Integer buildingId, @Param("username")String username);
     
 
 }

whole-estate/src/main/java/com/example/wholeestate/model/Appointment.java

@@ -1,8 +1,11 @@
 package com.example.wholeestate.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -68,5 +71,16 @@ public class Appointment implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 预约用户
+     */
+    @TableField(exist = false)
+    private List<Character> arrayListUser;
+
+    /**
+     * 预约楼盘
+     */
+    @TableField(exist = false)
+    private List<Building> arrayListbuilding;
 
 }

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

@@ -41,7 +41,7 @@ public interface IBuildingService extends IService<Building> {
      * @param
      * @return
      */
-    ResponseBean appointmentList(Integer pageNum, Integer pageSize);
+    ResponseBean appointmentList(Integer pageNum, Integer pageSize,Integer buildingId,String username);
 
     /**
      * 添加楼盘

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

@@ -9,13 +9,17 @@ import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.common.uuid.IdGen;
 import com.example.wholeestate.dao.AppointmentMapper;
 import com.example.wholeestate.dao.BuildingMapper;
+import com.example.wholeestate.dao.CustomerMapper;
+import com.example.wholeestate.model.Appointment;
 import com.example.wholeestate.model.Building;
+import com.example.wholeestate.model.Customer;
 import com.example.wholeestate.service.IBuildingService;
 import com.fasterxml.jackson.databind.util.ArrayBuilders;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -36,6 +40,8 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     @Autowired
     private AppointmentMapper AppointmentMapper;
 
+    @Autowired
+    private  CustomerMapper customerMapper;
     private IdGen idGen = IdGen.get();
 
     @Override
@@ -61,6 +67,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         ResponseBean response= new ResponseBean();
         QueryWrapper<Building> buildingtWrapper = new QueryWrapper<>();
         buildingtWrapper.lambda().eq(Building::getStatus,0);
+        buildingtWrapper.lambda().eq(Building::getBuildingId,id);
         Building building= buildingMapper.selectOne(buildingtWrapper);
         response.addSuccess(building);
         return response;
@@ -94,13 +101,35 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     }
 
     @Override
-    public ResponseBean appointmentList(Integer pageNum,Integer pageSize) {
+    public ResponseBean appointmentList(Integer pageNum,Integer pageSize,Integer buildingId,String username) {
         ResponseBean response= new ResponseBean();
-        Page<Appendable> page = new Page<>();
+        Page<Appointment> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        IPage<Appendable> building= AppointmentMapper.appendableList(page);
-        List<Appendable> buildingList=building.getRecords();
+        IPage<Appointment> building= AppointmentMapper.appendableList(page,buildingId,username);
+        List<Appointment> buildingList=building.getRecords();
+        //预约的用户，
+        ArrayList  arrayListUser= new ArrayList<>();
+
+        //预约的楼盘，
+        ArrayList  arrayListbuilding= new ArrayList<>();
+       for (Appointment bui:buildingList){
+          Building buil= new Building();
+           QueryWrapper<Building> buildingtWrapper = new QueryWrapper<>();
+           buildingtWrapper.lambda().eq(Building::getStatus,0);
+           buildingtWrapper.lambda().eq(Building::getBuildingId,bui.getBuildingId());
+           Building bu= buildingMapper.selectOne(buildingtWrapper);
+           arrayListUser.add(bu);
+
+           QueryWrapper<Customer> customerWrapper = new QueryWrapper<>();
+           customerWrapper.lambda().eq(Customer::getStatus,0);
+           customerWrapper.lambda().eq(Customer::getCustomerId,bui.getCustomerId());
+           Customer cust= customerMapper.selectOne(customerWrapper);
+           arrayListbuilding.add(cust);
+
+           bui.setArrayListUser(arrayListUser);
+           bui.setArrayListbuilding(arrayListbuilding);
+       }
 
         HashMap hashMap= new HashMap<>();
         hashMap.put("list",buildingList);

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

@@ -4,5 +4,15 @@
 
     <select id="appendableList" resultType="com.example.wholeestate.model.Appointment">
         SELECT * FROM ta_appointment
+      <where>
+        <if test="buildingId != null and buildingId != ''">
+            and  ta_appointment.building_id like concat('%',#{buildingId,jdbcType=INTEGER},'%')
+        </if>
+
+          <if test="username != null and username != ''">
+              and  ta_appointment.customer_name like concat('%',#{username,jdbcType=VARCHAR},'%')
+          </if>
+
+      </where>
     </select>
 </mapper>