合并

whole-estate/src/main/java/com/example/wholeestate/common/Constant.java

@@ -21,4 +21,10 @@ public class Constant {
      * 用户 session
      */
     public static final String USER_SESSION = "user_session";
+
+    /**
+     * 楼盘图片类型 banner
+     */
+    public static final String BUILDING_IMG_TYPE_BANNER = "banner";
+
 }

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

@@ -175,11 +175,17 @@ public class ActivityController extends BaseController {
     @ApiOperation(value = "根据活动id查询活动报名列表", notes = "根据活动id查询活动报名列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "pageNum第几页"),
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "pageSize一页多少行")
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "pageSize一页多少行"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "customerName", value = "客户端用户名"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "customerPhone", value = "客户端用户手机"),
     })
-    public ResponseBean activityEnrollList(@PathVariable("activityId") String activityId, @RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize) {
+    public ResponseBean activityEnrollList(@PathVariable("activityId") String activityId,
+                                           @RequestParam(defaultValue = "1") Integer pageNum,
+                                           @RequestParam(defaultValue = "10") Integer pageSize,
+                                           @RequestParam(required = false) String customerName,
+                                           @RequestParam(required = false) String customerPhone) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iActivityEnrollService.getActivitySignUpList(activityId, pageNum, pageSize);
+        responseBean = iActivityEnrollService.getActivitySignUpList(activityId, pageNum, pageSize, customerName, customerPhone);
         return responseBean;
     }
 

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

@@ -234,15 +234,26 @@ public class BuildingController extends BaseController {
         return responseBean;
     }
 
-   @ApiOperation(value = "户型列表", notes = "户型列表")
+//   @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;
-   }
+    @RequestMapping(value = "/wx/building/list", method = RequestMethod.GET)
+    public ResponseBean getWxBuildingList(){
+        ResponseBean  responseBean = iBuildingService.getWxBuildingList();
+        return responseBean;
+    }
 
 }

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

@@ -93,7 +93,7 @@ public class CommentController extends BaseController {
     public ResponseBean commentList(@RequestParam(defaultValue = "1") Integer pageNum,
                                     @RequestParam(defaultValue = "10") Integer pageSize,
                                     @RequestParam String commentType,
-                                    @RequestParam String mainId) {
+                                    @RequestParam(required = false) String mainId) {
         ResponseBean responseBean = new ResponseBean();
         responseBean = iCommentService.getCommentList(commentType, mainId, pageNum, pageSize);
         return responseBean;

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

@@ -10,9 +10,15 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 /**
  * <p>
@@ -26,17 +32,42 @@ import javax.servlet.http.HttpSession;
 @RequestMapping("/")
 @Api(value = "用户 API", description = "用户 API")
 public class CustomerController extends BaseController {
+
     @Autowired
     private ICustomerService iCustomerService;
 
+    /**
+     * 自定义方法绑定请求参数的Date类型
+     *
+     * @param request
+     * @param binder
+     * @throws Exception
+     */
+    @InitBinder
+    protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
+        binder.registerCustomEditor(Date.class, editor);
+    }
+
     @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:结束")
     })
-//    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
-    @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(@RequestBody String parameter,
+                                     @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/dao/ActivityEnrollMapper.java

@@ -8,6 +8,8 @@ import com.example.wholeestate.model.ActivityEnroll;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.Map;
+
 /**
  * <p>
  * 活动报名表 Mapper 接口
@@ -24,12 +26,7 @@ public interface ActivityEnrollMapper extends BaseMapper<ActivityEnroll> {
      * @param activityId
      * @return
      */
-    @Select("SELECT tacus.phone as phone,tacus.`name` as name,tacus.customer_name as customerName,tab.building_name AS buildingName FROM ta_activity tac " +
-            "RIGHT JOIN ta_activity_enroll tace ON tac.activity_id = tace.activity_id " +
-            "LEFT JOIN ta_customer tacus ON tace.customer_id = tacus.customer_id " +
-            "LEFT JOIN ta_building tab ON tac.building_id = tab.building_id " +
-            "WHERE tac.activity_id = #{activityId} and tac.status > -1")
-    IPage<Activity> selectPageActivityEnroll(Page page, @Param("activityId") String activityId);
+    IPage<Map<String, Object>> selectPageActivityEnroll(Page page, @Param("activityId") String activityId, @Param("customerName") String customerName, @Param("customerPhone") String customerPhone);
 
     /**
      * 根据 openid 查询 我参加的活动

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

@@ -127,4 +127,5 @@ public class Activity implements Serializable {
      */
     @TableField(exist = false)
     private Integer signUpNumber;
+
 }

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

@@ -21,7 +21,7 @@ public interface IActivityEnrollService extends IService<ActivityEnroll> {
      * @param pageNum
      * @return
      */
-    ResponseBean getActivitySignUpList(String activityId, Integer pageNum, Integer pageSize);
+    ResponseBean getActivitySignUpList(String activityId, Integer pageNum, Integer pageSize, String customerName, String customerPhone);
 
     /**
      * 根据 openid 查询. 我的活动记录

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

@@ -89,4 +89,12 @@ public interface IBuildingService extends IService<Building> {
      * @return
      */
     ResponseBean appointmentUpdate(String id,String writeoffRemark);
+
+    /**
+     * 微信小程序 楼盘列表
+     * @return
+     */
+    ResponseBean getWxBuildingList();
+
+    ResponseBean getWxBuildingById(String buildingId);
 }

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/ActivityEnrollServiceImpl.java

@@ -17,6 +17,8 @@ import com.example.wholeestate.service.IActivityEnrollService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 /**
  * <p>
  * 活动报名表 服务实现类
@@ -40,19 +42,21 @@ public class ActivityEnrollServiceImpl extends ServiceImpl<ActivityEnrollMapper,
     private IdGen idGen = IdGen.get();
 
     @Override
-    public ResponseBean getActivitySignUpList(String activityId, Integer pageNum, Integer pageSize) {
+    public ResponseBean getActivitySignUpList(String activityId, Integer pageNum, Integer pageSize, String customerName, String customerPhone) {
         ResponseBean responseBean = new ResponseBean();
 
-        Activity activity = activityMapper.selectById(activityId);
+        QueryWrapper<Activity> activityQueryWrapper = new QueryWrapper<>();
+        activityQueryWrapper.eq("activity_id", activityId);
+        Activity activity = activityMapper.selectOne(activityQueryWrapper);
         if (null == activity) {
             responseBean.addError("活动不存在!");
             return responseBean;
         }
 
-        Page<Activity> page = new Page<>();
+        Page<Map<String, Object>> page = new Page<>();
         page.setCurrent(pageNum == null ? 1 : pageNum);
         page.setSize(pageSize == null ? 10 : pageSize);
-        IPage<Activity> activityEnrollIPage = activityEnrollMapper.selectPageActivityEnroll(page, activityId);
+        IPage<Map<String, Object>> activityEnrollIPage = activityEnrollMapper.selectPageActivityEnroll(page, activityId, customerName, customerPhone);
 
         responseBean.addSuccess(activityEnrollIPage);
         return responseBean;

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.example.wholeestate.common.Constant;
 import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.common.uuid.IdGen;
 import com.example.wholeestate.dao.*;
@@ -368,4 +369,38 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     }
 
 
+    @Override
+    public ResponseBean getWxBuildingList() {
+        ResponseBean responseBean = new ResponseBean();
+
+        QueryWrapper<Building> buildingQueryWrapper = new QueryWrapper<>();
+        List<Building> buildingList = buildingMapper.selectList(buildingQueryWrapper);
+        responseBean.addSuccess(buildingList);
+
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getWxBuildingById(String buildingId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 楼盘信息
+        QueryWrapper<Building> buildingQueryWrapper = new QueryWrapper<>();
+        buildingQueryWrapper.eq("building_id", buildingId);
+        Building building = buildingMapper.selectOne(buildingQueryWrapper);
+        if (null == building) {
+            responseBean.addError("楼盘不存在!");
+            return responseBean;
+        }
+
+        // 楼盘Banner
+        QueryWrapper<BuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
+        buildingImgQueryWrapper.eq("building_id", building.getBuildingId());
+        buildingImgQueryWrapper.eq("img_type", Constant.BUILDING_IMG_TYPE_BANNER);
+        buildingImgMapper.selectList(buildingImgQueryWrapper);
+
+        // 楼盘户型图
+
+        return responseBean;
+    }
 }

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

@@ -78,7 +78,7 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
 
         QueryWrapper<Comment> commentQueryWrapper = new QueryWrapper<>();
         commentQueryWrapper.eq("comment_type", commentType);
-        commentQueryWrapper.eq("main_id", mainId);
+        commentQueryWrapper.eq(StringUtils.isNotBlank(mainId),"main_id", mainId);
         IPage<Comment> commentIPage = commentMapper.selectPage(page, commentQueryWrapper);
 
         responseBean.addSuccess(commentIPage);

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);

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.wholeestate.dao.ActivityEnrollMapper">
+
+    <select id="selectPageActivityEnroll" resultType="map">
+        SELECT
+          tacus.phone as phone,tacus.`name` as name,tacus.customer_name as customerName,tab.building_name AS buildingName,
+          tacus.id_num as idNum, tacus.avatar as avatar, tace.enroll_date as enrollDate
+        FROM ta_activity tac
+        RIGHT JOIN ta_activity_enroll tace ON tac.activity_id = tace.activity_id
+        LEFT JOIN ta_customer tacus ON tace.customer_id = tacus.customer_id
+        LEFT JOIN ta_building tab ON tac.building_id = tab.building_id
+        <where>
+            tac.activity_id = #{activityId} and tac.status > -1
+            <if test="customerName != null and customerName !=''">
+                and tacus.customer_name like CONCAT('%', #{customerName} , '%')
+            </if>
+            <if test="customerPhone != null and customerPhone !=''">
+                and tacus.phone like CONCAT('%', #{customerPhone} , '%')
+            </if>
+        </where>
+    </select>
+
+</mapper>