bug fix

src/main/java/com/huiju/estateagents/common/CommConstant.java

 
     //=================  首屏广告 / 轮播图 end =======================
 
-
     /**
      * 客户报备
      */
      * 审核不同意
      */
     public static final Integer VERIFY_DISAGREE = 2;
+
+    //=================  客户入口类型 start =======================
+    /*
+    * 自主进入
+    * */
+    public static final String ENTRY_VOLUNTEER = "volunteer";
+    /*
+    添加
+    */
+    public static final String ENTRY_INPUT = "input";
+    /*
+    * 报备
+    * */
+    public static final String ENTRY_VERIFY = "verify";
+    //=================  客户入口类型 end =======================
+
 }

src/main/java/com/huiju/estateagents/controller/ExtendContentController.java

      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/extendContent",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/extendContent",method= RequestMethod.GET)
     public ResponseBean extendContentList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
      * @param extendContent 实体对象
      * @return
      */
-    @RequestMapping(value="/extendContent",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/extendContent",method= RequestMethod.POST)
     public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent){
         ResponseBean  responseBean= iExtendContentService.extendContentAdd(extendContent);
           responseBean.addSuccess(extendContent);
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/extendContent/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/extendContent/{id}", method= RequestMethod.DELETE)
     public ResponseBean extendContentDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
      * @param extendContent 实体对象
      * @return
      */
-    @RequestMapping(value="/extendContent/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/extendContent/{id}",method= RequestMethod.PUT)
     public ResponseBean extendContentUpdate(@PathVariable Integer id,
                                         @RequestBody ExtendContent extendContent){
         ResponseBean responseBean = new ResponseBean();
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/extendContent/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/extendContent/{id}",method= RequestMethod.GET)
     public ResponseBean extendContentGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {

src/main/java/com/huiju/estateagents/controller/TaBuildingController.java

 
 
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.service.ITaBuildingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
     public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id){
         return taBuildingService.buildingAllSelectId(id);
     }
-
-
+    /**
+     * 查询当前所有项目
+     */
+    @RequestMapping(value = "/admin/buildingAll", method = RequestMethod.GET)
+    public  ResponseBean buildingAll(){
+        ResponseBean taBuilding= taBuildingService.buildingAll();
+        return taBuilding;
+    }
 }

src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java

 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
+import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.HashMap;
 
 /**
  * <p>
     @Autowired
     private ITaBuildingDynamicService iBuildingDynamicService;
 
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
     public  ResponseBean buildingDynamicAdd(@RequestBody String parameter){
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
-        dynamic.setStatus(0);
+        dynamic.setStatus(1);
 //        dynamic.setDynamicId(idGen.nextId()+"");
         dynamic.setCreateDate(LocalDateTime.now());
         iBuildingDynamicService.save(dynamic);
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
         return responseBean;
     }
-}
+
+    @RequestMapping(value = "/admin/buildingDynamic/Details", method = RequestMethod.GET)
+    public ResponseBean buildingDynamicDetails(@RequestParam("dynamicId")String dynamicId) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
+        dynamicQueryWrapper.eq("dynamic_id", dynamicId);
+        TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
+        TaBuilding building= taBuildingMapper.selectBuilding(dynamic.getBuildingId());
+        dynamic.setBuildingName(building.getBuildingName());
+        responseBean.addSuccess(dynamic);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/SignList", method = RequestMethod.GET)
+    public ResponseBean getSignList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
+                                    @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+                                    @RequestParam(value = "dynamicId",required = false)String dynamicId) {
+        Page<TaActivityDynamicEnlist> page = new Page<>();
+        page.setSize(pageSize);
+        page.setCurrent(pageNum);
+        ResponseBean signList = iBuildingDynamicService.signList(page,dynamicId);
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("list", signList);
+        map.put("total", page.getTotal());
+        map.put("pageNum", page.getCurrent());
+        map.put("pageSize", page.getSize());
+        return ResponseBean.success(map);
+    }
+
+    @RequestMapping(value = "/admin/buildingDynamic/finish" ,method =RequestMethod.PUT)
+    public  ResponseBean buildingDynamicFinish(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject object = JSONObject.parseObject(parameter);
+        String dynamicId = object.getString("dynamicId");
+        String top = object.getString("top");
+        QueryWrapper<TaBuildingDynamic> taBuildingDynamic = new QueryWrapper<>();
+        taBuildingDynamic.eq("dynamic_id", dynamicId);
+        TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(taBuildingDynamic);
+        if ("1".equals(top)) {
+            dynamic.setCreateDate(LocalDateTime.now());
+        } else {
+            dynamic.setIsEnlist("2");
+        }
+        iBuildingDynamicService.update(dynamic, taBuildingDynamic);
+        responseBean.addSuccess("成功");
+        return responseBean;
+    }
+    }
+

src/main/java/com/huiju/estateagents/controller/TaPointsExchangeController.java

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPointsExchange;
 import com.huiju.estateagents.service.ITaPointsExchangeService;
 import org.slf4j.Logger;
      */
     @RequestMapping(value="/admin/taPointsExchange",method= RequestMethod.GET)
     public ResponseBean taPointsExchangeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                             @RequestParam(value ="personName",required = false) String personName,
+                                             @RequestParam(value ="phone",required = false) String phone,
+                                             @RequestParam(value ="personType",required = false) String personType,
+                                             @RequestParam(value ="targetName",required = false) String targetName,
+                                             @RequestParam(value ="startCreateDate",required = false) String startCreateDate,
+                                             @RequestParam(value ="endCreateDate",required = false) String endCreateDate,
+                                             @RequestParam(value ="startVerifyDate",required = false) String startVerifyDate,
+                                             @RequestParam(value ="endVerifyDate",required = false) String endVerifyDate,
+                                             @RequestParam(value ="status",required = false) Integer status,
+                                             @RequestParam(value ="tel",required = false) String tel){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
             TaPointsExchange taPointsExchange = new TaPointsExchange();
+            taPointsExchange.setPersonName(personName);
+            taPointsExchange.setPhone(phone);
+            taPointsExchange.setPersonType(personType);
+            taPointsExchange.setTargetName(targetName);
+            taPointsExchange.setStartCreateDate(startCreateDate);
+            taPointsExchange.setEndCreateDate(endCreateDate);
+            taPointsExchange.setStartVerifyDate(startVerifyDate);
+            taPointsExchange.setEndVerifyDate(endVerifyDate);
+            taPointsExchange.setStatus(status);
+            taPointsExchange.setTel(tel);
             
             responseBean = iTaPointsExchangeService.selectList(pageNum,pageSize,taPointsExchange);
 
         }
         return responseBean;
     }
+    
+    /**
+     * 修改对象
+     * @param taPointsExchange 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taPointsExchange/change",method= RequestMethod.PUT)
+    public ResponseBean taPointsExchangeStatusChange(@RequestBody TaPointsExchange taPointsExchange){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (null != taPointsExchange.getStatus() && !taPointsExchange.getStatus().equals(CommConstant.STATUS_NORMAL)){
+                taPointsExchange.setStatus(CommConstant.STATUS_NORMAL);
+            }
+            if (iTaPointsExchangeService.updateById(taPointsExchange)){
+                responseBean.addSuccess(taPointsExchange);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 
     /**
      * 保存对象
 
     /**
      * 修改对象
-     * @param id  实体ID
-     * @param taPointsExchange 实体对象
+     * @param recId  实体ID
      * @return
      */
-    @RequestMapping(value="/taPointsExchange/{id}",method= RequestMethod.PUT)
-    public ResponseBean taPointsExchangeUpdate(@PathVariable Integer id,
-                                        @RequestBody TaPointsExchange taPointsExchange){
+    @RequestMapping(value="/admin/taPointsExchange/{recId}",method= RequestMethod.PUT)
+    public ResponseBean taPointsExchangeUpdate(@PathVariable Integer recId){
         ResponseBean responseBean = new ResponseBean();
         try {
+            TaPointsExchange taPointsExchange = iTaPointsExchangeService.getById(recId);
+            if (null == taPointsExchange){
+                responseBean.addError("找不到需要核销的商品");
+                return responseBean;
+            }
+            if (taPointsExchange.getStatus().equals(CommConstant.STATUS_NORMAL)){
+                responseBean.addError("此商品已经被领取");
+                return responseBean;
+            }
+            taPointsExchange.setStatus(CommConstant.STATUS_NORMAL);
             if (iTaPointsExchangeService.updateById(taPointsExchange)){
                 responseBean.addSuccess(taPointsExchange);
             }else {

src/main/java/com/huiju/estateagents/controller/TaPointsRecordsController.java

 import com.huiju.estateagents.entity.TaPointsRecords;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaPointsRecordsService;
+import org.apache.ibatis.annotations.Mapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
     public ResponseBean taPointsRecordsUpdate(@PathVariable Integer id,
                                         @RequestBody TaPointsRecords taPointsRecords){
         ResponseBean responseBean = new ResponseBean();
+        taPointsRecords.setPointsRecordId(id);
         try {
             if (iTaPointsRecordsService.updateById(taPointsRecords)){
                 responseBean.addSuccess(taPointsRecords);
         }
         return responseBean;
     }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taPointsRecords/{id}",method= RequestMethod.GET)
+    public ResponseBean CustomerPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @PathVariable(value = "id") String id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("person_id",taPersonService.getPersonIdByCustomerId(id));
+            queryWrapper.orderByDesc("create_date");
+            IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
+            Integer totalPoints = 0;
+            for (int i = 0;i<result.getRecords().size();i++){
+                totalPoints += result.getRecords().get(i).getPointsAmount();
+            }
+            Map<String,Object> data = new HashMap<>();
+            data.put("totalPoints",totalPoints);
+            data.put("result",result);
+            responseBean.addSuccess(data);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsRecordsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java

         }
     }
 
-    @PostMapping("/customer/recommend")
-    public ResponseBean getCustomerList (@RequestParam(value ="name",defaultValue = "false") String name,
-                                         @RequestParam(value ="tel",defaultValue = "false") String tel,
-                                         @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
-                                         @RequestParam(value ="consultName",defaultValue = "false") String consultName,
-                                         @RequestParam(value ="consultTel",defaultValue = "false") String consultTel,
+    @GetMapping("/admin/customer/recommend")
+    public ResponseBean getCustomerList (@RequestParam(value ="name",required = false) String name,
+                                         @RequestParam(value ="tel",required = false) String tel,
+                                         @RequestParam(value ="buildingId",required = false) String buildingId,
+                                         @RequestParam(value ="consultName",required = false) String consultName,
+                                         @RequestParam(value ="consultTel",required = false) String consultTel,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value ="entryType",required = false) String entryType,
+                                         @RequestParam(value ="verifyStatus",required = false) String verifyStatus){
         try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel));
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
-    @PostMapping("/customer/recommend/{customerId}")
-    public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize,String customerId){
+    @GetMapping("/admin/customer/recommend/{customerId}")
+    public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId){
         String buildingId="";
         try{
             return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,buildingId));
      * @param taRecommendCustomer 实体对象
      * @return
      */
-    @RequestMapping(value="/customer/recommend/edit/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/customer/recommend/edit/{id}",method= RequestMethod.PUT)
     public ResponseBean taRecommendCustomerUpdate(@PathVariable String id,
             @RequestBody TaRecommendCustomer taRecommendCustomer){
         ResponseBean responseBean = new ResponseBean();
         return responseBean;
     }
 
-    @RequestMapping(value = "/wx/customer/recommend/get/{id}")
-    public ResponseBean getSingleCustomer(String customerId) {
+    @RequestMapping(value = "/wx/customer/recommend/get/{id}", method = RequestMethod.GET)
+    public ResponseBean getSingleCustomer(@PathVariable(value = "id") String customerId) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(taRecommendCustomerService.getById(customerId));
         return responseBean;
     }
 
-    @RequestMapping(value = "/customer/recommend/get/{id}")
-    public ResponseBean getCutomerDetail(String id) {
+
+    @RequestMapping(value = "/admin/customer/recommend/getById/{id}", method = RequestMethod.GET)
+    public ResponseBean getRecommendCustomerById(@PathVariable(value = "id") String customerId) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taRecommendCustomerService.getCustomerById(customerId));
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    @GetMapping(value = "/admin/customer/recommend/get/{id}")
+    public ResponseBean getCutomerDetail(@PathVariable String id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id));
         return responseBean;
     }
 
-    @PostMapping("/customer/recommend/drift")
+    @GetMapping("/admin/customer/recommend/drift")
     public ResponseBean getDriftCustomerList (@RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){

src/main/java/com/huiju/estateagents/controller/TdBuildingTypeController.java

+package com.huiju.estateagents.controller;
+
+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.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TdBuildingType;
+import com.huiju.estateagents.service.ITdBuildingTypeService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import com.huiju.estateagents.base.BaseController;
+
+/**
+ * <p>
+    * 项目类型字典表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-07-29
+ */
+@RestController
+@RequestMapping("/")
+public class TdBuildingTypeController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TdBuildingTypeController.class);
+
+    @Autowired
+    public ITdBuildingTypeService iTdBuildingTypeService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/tdBuildingType",method= RequestMethod.GET)
+    public ResponseBean tdBuildingTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TdBuildingType> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TdBuildingType> result = iTdBuildingTypeService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("tdBuildingTypeList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tdBuildingType 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdBuildingType",method= RequestMethod.POST)
+    public ResponseBean tdBuildingTypeAdd(@RequestBody TdBuildingType tdBuildingType){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdBuildingTypeService.save(tdBuildingType)){
+                responseBean.addSuccess(tdBuildingType);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdBuildingTypeAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tdBuildingType/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tdBuildingTypeDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTdBuildingTypeService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdBuildingTypeDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tdBuildingType 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdBuildingType/{id}",method= RequestMethod.PUT)
+    public ResponseBean tdBuildingTypeUpdate(@PathVariable Integer id,
+                                        @RequestBody TdBuildingType tdBuildingType){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdBuildingTypeService.updateById(tdBuildingType)){
+                responseBean.addSuccess(tdBuildingType);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdBuildingTypeUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tdBuildingType/{id}",method= RequestMethod.GET)
+    public ResponseBean tdBuildingTypeGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTdBuildingTypeService.getById(id));
+        }catch (Exception e){
+            logger.error("tdBuildingTypeDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/entity/TaBuildingDynamic.java

      * 点赞
      */
     private  int favorNum;
+
+    /**
+     * 项目名称
+     */
+    @TableField(exist = false)
+    private  String buildingName;
+
+    /**
+     *活动地点
+     */
+    private  String address;
+
+    /**
+     * 活动人数
+     */
+    private  String personNum;
 }

src/main/java/com/huiju/estateagents/entity/TaPointsExchange.java

     
     @TableField(exist = false)
     private String endVerifyDate;
+    
+    @TableField(exist = false)
+    private String tel;
 }

src/main/java/com/huiju/estateagents/entity/TaPointsRecords.java

 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
      */
     private Integer status;
 
+    @TableField(exist = false)
+    private Integer totalPoints;
+
 
 }

src/main/java/com/huiju/estateagents/entity/TaRecommendCustomer.java

     @TableField(exist = false)
     private Map<String, Object> consultants;
 
+    @TableField(exist = false)
+    private String consultantName;
+
+    @TableField(exist = false)
+    private String consultTel;
+
     private Integer verifyStatus;
 
     private String verifyRemark;
 
     private String city;
 
+    private String entryType;
+
     @TableField(exist = false)
     private List<TaPersonVisitRecord> visitRecords;
 

src/main/java/com/huiju/estateagents/entity/TdBuildingType.java

+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 项目类型字典表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TdBuildingType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目类型id
+     */
+    @TableId(value = "building_type_id", type = IdType.AUTO)
+    private Integer buildingTypeId;
+
+    /**
+     * 项目类型名称
+     */
+    private String buildingTypeName;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

src/main/java/com/huiju/estateagents/mapper/TaActivityDynamicEnlistMapper.java

 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
 @Mapper
 public interface TaActivityDynamicEnlistMapper extends BaseMapper<TaActivityDynamicEnlist> {
 
+    /**
+     * 查询活动报名记录
+     * @param page
+     * @param dynamicId
+     * @return
+     */
+    List<TaActivityDynamicEnlist> signList(Page<TaActivityDynamicEnlist> page, @Param("dynamicId") String dynamicId);
 }

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

 
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")
     void setFieldNum(@Param("buildingId") String buildingId, @Param("field") String field, @Param("increment") int increment);
+
+    List<TaBuilding> buildingAll();
+
+    /**
+     * 查询当前楼盘
+     * @param buildingId
+     * @return
+     */
+    TaBuilding selectBuilding(@Param("buildingId") String buildingId);
 }

src/main/java/com/huiju/estateagents/mapper/TaPointsExchangeMapper.java

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaPointsExchange;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 @Mapper
 public interface TaPointsExchangeMapper extends BaseMapper<TaPointsExchange> {
 	
-	List<TaPointsExchange> selectListByParams(Page page, TaPointsExchange taPointsExchange);
+	List<TaPointsExchange> selectListByParams(Page page,@Param("taPointsExchange") TaPointsExchange taPointsExchange);
 }

src/main/java/com/huiju/estateagents/mapper/TaPointsRecordsMapper.java

 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaPointsRecords;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
  */
 @Mapper
 public interface TaPointsRecordsMapper extends BaseMapper<TaPointsRecords> {
+    IPage<TaPointsRecords> getCustomerPointsList(IPage<TaPointsRecords> page, @Param("personId") String personId);
 
 }

src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java

 package com.huiju.estateagents.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
     TaRecommendCustomer getCustomerDetail(@Param("customerId")String customerId);
 
+    TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
+
+    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus);
+
 
 }

src/main/java/com/huiju/estateagents/mapper/TdBuildingTypeMapper.java

+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TdBuildingType;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 项目类型字典表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-29
+ */
+@Mapper
+public interface TdBuildingTypeMapper extends BaseMapper<TdBuildingType> {
+
+}

src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java

 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
      * @return
      */
     ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist);
+
+    /**
+     * 报名列表
+     * @param page
+     * @return
+     */
+    ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId);
 }

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

      * @return
      */
     ResponseBean apartmentDel(String id);
+
+    /**
+     * 查询所有项目
+     * @return
+     */
+    ResponseBean buildingAll();
 }

src/main/java/com/huiju/estateagents/service/ITaPersonService.java

 
     IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building);
 
+    String getPersonIdByCustomerId(String customerId);
+
 
 }

src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java

 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 
-    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel);
+    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus);
 
     TaRecommendCustomer getCustomerDetail(String customerId);
 
+    TaRecommendCustomer getCustomerById(String customerId);
+
     IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,String building);
 
 

src/main/java/com/huiju/estateagents/service/ITdBuildingTypeService.java

+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TdBuildingType;
+
+/**
+ * <p>
+ * 项目类型字典表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-29
+ */
+public interface ITdBuildingTypeService extends IService<TdBuildingType> {
+
+}

src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java

         page.setCurrent(pageNum == null ? 1 : pageNum);
 
         IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId);
-        List<TaBuildingDynamic> buildingDynamicList=buildingDynamic.getRecords();
+        List<TaBuildingDynamic> buildingDynamicList = buildingDynamic.getRecords();
+        for (TaBuildingDynamic taBuildingDynamic:buildingDynamicList){
+            QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist= new QueryWrapper<>();
+            taActivityDynamicEnlist.eq("dynamic_id",taBuildingDynamic.getDynamicId());
+            taActivityDynamicEnlist.eq("building_id",taBuildingDynamic.getBuildingId());
+            int singCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
+            taBuildingDynamic.setCount(singCount);
+        }
 
         HashMap hashMap= new HashMap<>();
         hashMap.put("list",buildingDynamicList);
         return ResponseBean.success(state);
     }
 
+    @Override
+    public ResponseBean signList(Page<TaActivityDynamicEnlist> page, String dynamicId) {
+        List<TaActivityDynamicEnlist> signList= taActivityDynamicEnlistMapper.signList(page,dynamicId);
+        return ResponseBean.success(signList);
+    }
+
     /**
      *     根据报名开始时间和结束时间判断当前图标状态
      */

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

        return ResponseBean.success("");
     }
 
+    @Override
+    public ResponseBean buildingAll() {
+        List<TaBuilding> taBuilding= taBuildingMapper.buildingAll();
+        return ResponseBean.success(taBuilding);
+    }
+
 
     int insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
         int rows = 0;

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
         return taPersonMapper.selectPage(page,queryWrapper);
     }
+
+    @Override
+    public String getPersonIdByCustomerId(String customerId){
+        return taRecommendCustomerMapper.getCustomerPersonId(customerId);
+    }
 }

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

     }
 
     @Override
-    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel){
-        QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
-        if(building.equals("") && null != building){
-            queryWrapper.eq("building_id",building);
-        }
-        if(name.equals("") && null != name){
-            queryWrapper.like("name",name);
-        }
-        if(tel.equals("") && null != tel){
-            queryWrapper.eq("phone",tel);
-        }
-        if(consultName.equals("") && null != consultName){
-            List<String> consultIds = taPersonMapper.getConsultantByName(consultName);
-            queryWrapper.in("realty_consultant",consultIds);
-        }
-        if(consultTel.equals("") && null != consultTel){
-            String consultId = taPersonMapper.getConsultantByTel(consultTel);
-            queryWrapper.eq("realty_consultant",consultId);
-        }
-
-        queryWrapper.gt("status", CommConstant.MESSAGE_UNREAD);
+    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus){
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.selectPage(page,queryWrapper);
+        return taRecommendCustomerMapper.getCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus);
+    }
+
+    @Override
+    public TaRecommendCustomer getCustomerById(String customerId){
+        return taRecommendCustomerMapper.getCustomerById(customerId);
     }
 
+
     @Override
     public TaRecommendCustomer getCustomerDetail(String customerId){
         String personId = taRecommendCustomerMapper.getCustomerPersonId(customerId);
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId);
-        if(!personId.equals("")&& null != personId){
+        if(!StringUtils.isEmpty(personId)){
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
         }
-        if(!taRecommendCustomer.getRealtyConsultant().equals("")&&null != taRecommendCustomer.getRealtyConsultant()){
+        if(!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())){
             TaPerson consultant =  taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
             consultant.setProjects(taPersonMapper.getUserProjects(consultant.getPersonId()));
             taRecommendCustomer.setConsultant(consultant);

src/main/java/com/huiju/estateagents/service/impl/TdBuildingTypeServiceImpl.java

+package com.huiju.estateagents.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TdBuildingType;
+import com.huiju.estateagents.mapper.TdBuildingTypeMapper;
+import com.huiju.estateagents.service.ITdBuildingTypeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 项目类型字典表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-29
+ */
+@Service
+public class TdBuildingTypeServiceImpl extends ServiceImpl<TdBuildingTypeMapper, TdBuildingType> implements ITdBuildingTypeService {
+
+}

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

 <?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.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper">
-
+        <select id="signList" resultType="com.huiju.estateagents.entity.TaActivityDynamicEnlist">
+            select * from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId}
+        </select>
 </mapper>

src/main/resources/mapper/TaBuildingDynamicMapper.xml

         <if test="buildingId != null and buildingId !=''">
             and building_id = #{buildingId}
         </if>
+        ORDER BY create_date DESC
   </select>
 
     <select id="iBuildingDynamicSelectId" parameterType="string" resultType="com.huiju.estateagents.entity.TaBuildingDynamic">

src/main/resources/mapper/TaBuildingMapper.xml

         ORDER BY create_date DESC
     </select>
 
+    <select id="buildingAll" resultType="com.huiju.estateagents.entity.TaBuilding">
+         SELECT * FROM ta_building
+         where status > -1
+    </select>
+
+    <select id="selectBuilding" resultType="com.huiju.estateagents.entity.TaBuilding">
+         SELECT * FROM ta_building
+         where building_id = #{buildingId}
+    </select>
+
 </mapper>

src/main/resources/mapper/TaPointsExchangeMapper.xml

         FROM
             ta_points_exchange t
             LEFT JOIN ta_person p ON t.person_id = p.person_id
+        where 1=1
+        <if test="taPointsExchange.status != null and taPointsExchange.status != '' or taPointsExchange.status ==0">
+            and  t.`status` = #{taPointsExchange.status}
+        </if>
+        <if test="taPointsExchange.personName != null and taPointsExchange.personName != ''">
+            and  t.person_name like concat('%',#{taPointsExchange.personName},'%')
+        </if>
+        <if test="taPointsExchange.phone != null and taPointsExchange.phone != ''">
+            and  t.phone like concat('%',#{taPointsExchange.phone},'%')
+        </if>
+        <if test="taPointsExchange.tel != null and taPointsExchange.tel != ''">
+            and  t.phone = #{taPointsExchange.tel}
+        </if>
+        <if test="taPointsExchange.personType != null and taPointsExchange.personType != ''">
+            and  p.person_type = #{taPointsExchange.personType}
+        </if>
+        <if test="taPointsExchange.targetName != null and taPointsExchange.targetName != ''">
+            and  t.target_name like concat('%',#{taPointsExchange.targetName},'%')
+        </if>
+        <if test="taPointsExchange.startCreateDate != null and taPointsExchange.startCreateDate != ''">
+            and  date_format(t.create_date,'%Y-%m-%d') >= date_format(#{taPointsExchange.startCreateDate},'%Y-%m-%d')
+        </if>
+        <if test="taPointsExchange.endCreateDate != null and taPointsExchange.endCreateDate != ''">
+            and  date_format(t.create_date,'%Y-%m-%d') &lt;= date_format(#{taPointsExchange.endCreateDate},'%Y-%m-%d')
+        </if>
+        <if test="taPointsExchange.startVerifyDate != null and taPointsExchange.startVerifyDate != ''">
+            and  date_format(t.verify_date,'%Y-%m-%d') >= date_format(#{taPointsExchange.startVerifyDate},'%Y-%m-%d')
+        </if>
+        <if test="taPointsExchange.endVerifyDate != null and taPointsExchange.endVerifyDate != ''">
+            and  date_format(t.verify_date,'%Y-%m-%d') &lt;= date_format(#{taPointsExchange.startVerifyDate},'%Y-%m-%d')
+        </if>
     </select>
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

 	LEFT JOIN ta_person_visit_record c ON b.person_id = c.person_id
 	where a.customer_id = #{customerId}
     </select>
+
+    <select id="getCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+        SELECT
+	a.*,
+	b.name as consultantName,
+    b.tel as consultTel
+FROM
+	ta_recommend_customer a
+	LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+	<where>
+        a.status > 0
+        <if test="building != null and building !=''">
+            and a.building_id = #{building}
+        </if>
+        <if test="name != null and name !=''">
+            and a.name = #{name}
+        </if>
+        <if test="tel != null and tel!=''">
+            and a.phone = #{tel}
+        </if>
+        <if test="consultName != null and consultName !=''">
+            and b.name like CONCAT('%',#{consultName}, '%')
+        </if>
+        <if test="consultTel != null and consultTel !=''">
+            and b.tel = #{consultTel}
+        </if>
+        <if test="entryType != null and entryType !=''">
+            and a.entry_type = #{entryType}
+        </if>
+        <if test="verifyStatus != null and verifyStatus !=''">
+            and a.verify_status = #{verifyStatus}
+        </if>
+
+    </where>
+    </select>
+    <select id="getCustomerById" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+         SELECT
+	a.*,
+	b.name as consultantName
+FROM
+	ta_recommend_customer a
+	LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+	WHERE a.customer_id = #{customerId}
+    </select>
 </mapper>

src/main/resources/mapper/TdBuildingTypeMapper.xml

+<?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.huiju.estateagents.mapper.TdBuildingTypeMapper">
+
+</mapper>