合并

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

     private IAppointmentService iAppointmentService;
 
     @RequestMapping(value = "/wx/appointment/{openid}", method = RequestMethod.GET)
-    @ApiOperation(value = "根据openid 查询 预约记录", notes = "根据openid 查询 预约记录")
+    @ApiOperation(value = "微信小程序 根据openid 查询 预约记录", notes = "根据openid 查询 预约记录")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "pageNum第几页"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "pageSize一页多少行"),
     }
 
     @RequestMapping(value = "/wx/appointment/{openid}", method = RequestMethod.POST)
-    @ApiOperation(value = "根据openid 添加 预约记录", notes = "根据openid 添加 预约记录")
+    @ApiOperation(value = "微信小程序 根据openid 添加 预约记录", notes = "根据openid 添加 预约记录")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "buildingId楼盘编号;appointmentDate预约时间;customerName姓名;phone手机;remark备注"),
             @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "openid", value = "openid")

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

 public interface IAppointmentService extends IService<Appointment> {
 
     /**
-     * 根据 openid 查询 预约记录
+     * 微信小程序 根据 openid 查询 预约记录
      * @param openid
      * @param pageNum
      * @param pageSize
     ResponseBean getOpenidAppointmentList(String openid, Integer pageNum, Integer pageSize);
 
     /**
-     * 添加 预约记录
+     * 微信小程序  添加 预约记录
      * @param openid
      * @param parameter
      * @return

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

 import com.example.wholeestate.model.*;
 import com.example.wholeestate.service.IBuildingService;
 import com.fasterxml.jackson.databind.util.ArrayBuilders;
+import com.google.common.collect.Maps;
 import com.sun.org.apache.bcel.internal.generic.NEW;
 import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
     @Autowired
     private  BuildingApartmentMapper buildingApartmentMapper;
 
-//    @Autowired
-//    private  ApartmentImgMapper apartmentImgMapper;
+    @Autowired
+    private BuildingDynamicMapper buildingDynamicMapper;
+
+
 
     private IdGen idGen = IdGen.get();
 
         buildingImgBannerQueryWrapper.orderBy(true, true, "order_no");
         List<BuildingImg> buildingBannerImg = buildingImgMapper.selectList(buildingImgBannerQueryWrapper);
 
+        building.setBuildingImg(buildingBannerImg);
+
         // 楼盘户型
         QueryWrapper<BuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
         buildingApartmentQueryWrapper.eq("building_id", building.getBuildingId());
             e.setBuildingImgList(buildingImgList);
         });
 
-
+        // 项目最新动态
+        QueryWrapper<BuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        buildingApartmentQueryWrapper.eq("building_id", building.getBuildingId());
+        buildingApartmentQueryWrapper.orderByDesc("create_date");
+        Page<BuildingDynamic> page = new Page<>();
+        page.setCurrent(1);
+        page.setSize(1);
+        IPage<BuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
+        List<BuildingDynamic> records = buildingDynamicIPage.getRecords();
+
+        Map<String, Object> buildingMap = Maps.newHashMap();
+        buildingMap.put("info", building);
+        buildingMap.put("buildingApartment", buildingApartmentList);
+        buildingMap.put("buildingDynamic", records);
+
+        responseBean.addSuccess(buildingMap);
 
         return responseBean;
     }