bug fix

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

@@ -1,241 +1,240 @@
-package com.huiju.estateagents.controller;
-
-
-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.common.StringUtils;
-import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
-import com.huiju.estateagents.entity.TaBuilding;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
-import com.huiju.estateagents.mapper.TaBuildingMapper;
-import com.huiju.estateagents.service.ITaBuildingDynamicService;
-import com.huiju.estateagents.service.ITaPersonService;
-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 javax.swing.*;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * <p>
- * 项目动态表 前端控制器
- * </p>
- *
- * @author jobob
- * @since 2019-03-21
- */
-@RestController
-@RequestMapping("/api")
-public class TaBuildingDynamicController extends BaseController {
-
-    @Autowired
-    private ITaBuildingDynamicService iBuildingDynamicService;
-
-    @Autowired
-    private TaBuildingMapper taBuildingMapper;
-
-    @Autowired
-    private ITaPersonService taPersonService;
-
-    @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);
-    }
-
-    @RequestMapping(value = "/admin/iBuildingDynamicList", method = RequestMethod.GET)
-    public ResponseBean iBuildingDynamicList(@RequestParam("pageNum")Integer pageNum,
-                                             @RequestParam("pageSize")Integer pageSize,
-                                             @RequestParam(required = false)String name,
-                                             @RequestParam(required = false)Integer cityId,
-                                             @RequestParam(required = false)String buildingId,
-                                             HttpSession session){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId);
-        return responseBean;
-    }
-
-    @RequestMapping(value = "/admin/iBuildingDynamicSelectId/{id}", method = RequestMethod.GET)
-    public ResponseBean iBuildingDynamicSelectId(@PathVariable(value = "id") String id, HttpSession session){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectId(id);
-        return responseBean;
-    }
-
-    /**
-     * 活动列表
-     * @param pageNum
-     * @param pageSize
-     * @param request
-     * @return
-     */
-    @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
-    public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
-                                               @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
-                                               @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
-                                               @RequestParam(defaultValue = "false" )boolean mine,
-                                               HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
-        ResponseBean  responseBean = new ResponseBean();
-        if(mine){
-            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
-            if (null == taPersons || taPersons.size() != 1) {
-                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-            }
-            TaPerson person = taPersons.get(0);
-            responseBean.addSuccess(taPersonService.getJoinedActivity(pageNum,pageSize,person.getPhone(),""));
-        }else {
-            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
-        }
-
-        return responseBean;
-    }
-
-    /**
-     * 活动详情
-     * @param dynamicId
-     * @return
-     */
-    @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
-    public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
-
-                                             HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
-        String buildingId = "";
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);
-        return responseBean;
-    }
-
-    /**
-     * 添加活动报名
-     * @param taActivityDynamicEnlist
-     * @param request
-     * @return
-     */
-    @RequestMapping(value = "/wx/activityDynamicEnlistAdd", method = RequestMethod.POST)
-    public ResponseBean taActivityDynamicEnlist(@RequestBody TaActivityDynamicEnlist taActivityDynamicEnlist,
-                                                HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
-        ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist);
-        return responseBean;
-    }
-
-
-    @RequestMapping(value = "/admin/buildingDynamic/add" ,method =RequestMethod.POST)
-    public  ResponseBean buildingDynamicAdd(@RequestBody String parameter){
-        ResponseBean responseBean = new ResponseBean();
-        TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
-        dynamic.setStatus(1);
-//        dynamic.setDynamicId(idGen.nextId()+"");
-        dynamic.setPublishDate(LocalDateTime.now());
-        dynamic.setCreateDate(LocalDateTime.now());
-        iBuildingDynamicService.save(dynamic);
-        return responseBean;
-    }
-
-    @RequestMapping(value = "/admin/buildingDynamic/update" ,method =RequestMethod.PUT)
-    public  ResponseBean buildingDynamicUpdate(@RequestBody String parameter){
-        ResponseBean responseBean = new ResponseBean();
-        TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
-        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
-        buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
-        iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
-        return responseBean;
-    }
-
-    @RequestMapping(value = "/admin/buildingDynamic/delete", method = RequestMethod.DELETE)
-    public ResponseBean pageImdelect(@RequestParam(value = "id",required = false)String id) {
-        ResponseBean responseBean = iBuildingDynamicService.buildingDynamicDelete(id);
-        return responseBean;
-    }
-
-    @RequestMapping(value = "/admin/buildingDynamic/send/{dynamicId}", method = RequestMethod.PUT)
-    public ResponseBean send(@PathVariable String dynamicId) {
-        ResponseBean responseBean = new ResponseBean();
-        QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
-        dynamicQueryWrapper.eq("dynamic_id", dynamicId);
-        TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
-        dynamic.setStatus(1);
-        dynamic.setPublishDate(LocalDateTime.now());
-        iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
-        return responseBean;
-    }
-
-    @RequestMapping(value = "/admin/buildingDynamic/cancel/{dynamicId}", method = RequestMethod.PUT)
-    public ResponseBean cancel(@PathVariable String dynamicId) {
-        ResponseBean responseBean = new ResponseBean();
-        QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
-        dynamicQueryWrapper.eq("dynamic_id", dynamicId);
-        TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
-        dynamic.setStatus(0);
-        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());
-
-        if (null != building) {
-            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;
-    }
-    }
-
+package com.huiju.estateagents.controller;
+
+
+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.common.StringUtils;
+import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
+import com.huiju.estateagents.entity.TaBuilding;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
+import com.huiju.estateagents.mapper.TaBuildingMapper;
+import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaPersonService;
+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 javax.swing.*;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 项目动态表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-21
+ */
+@RestController
+@RequestMapping("/api")
+public class TaBuildingDynamicController extends BaseController {
+
+    @Autowired
+    private ITaBuildingDynamicService iBuildingDynamicService;
+
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
+    @Autowired
+    private ITaPersonService taPersonService;
+
+    @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);
+    }
+
+    @RequestMapping(value = "/admin/iBuildingDynamicList", method = RequestMethod.GET)
+    public ResponseBean iBuildingDynamicList(@RequestParam("pageNum")Integer pageNum,
+                                             @RequestParam("pageSize")Integer pageSize,
+                                             @RequestParam(required = false)String name,
+                                             @RequestParam(required = false)Integer cityId,
+                                             @RequestParam(required = false)String buildingId,
+                                             HttpSession session){
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/iBuildingDynamicSelectId/{id}", method = RequestMethod.GET)
+    public ResponseBean iBuildingDynamicSelectId(@PathVariable(value = "id") String id, HttpSession session){
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectId(id);
+        return responseBean;
+    }
+
+    /**
+     * 活动列表
+     * @param pageNum
+     * @param pageSize
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
+    public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
+                                               @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
+                                               @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+                                               @RequestParam(defaultValue = "false" )boolean mine,
+                                               HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        ResponseBean  responseBean = new ResponseBean();
+        if(mine){
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            responseBean.addSuccess(taPersonService.getJoinedActivity(pageNum,pageSize,person.getPhone(),""));
+        }else {
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
+        }
+
+        return responseBean;
+    }
+
+    /**
+     * 活动详情
+     * @param dynamicId
+     * @return
+     */
+    @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
+    public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
+                                             HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        String buildingId = "";
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);
+        return responseBean;
+    }
+
+    /**
+     * 添加活动报名
+     * @param taActivityDynamicEnlist
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/wx/activityDynamicEnlistAdd", method = RequestMethod.POST)
+    public ResponseBean taActivityDynamicEnlist(@RequestBody TaActivityDynamicEnlist taActivityDynamicEnlist,
+                                                HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist);
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/admin/buildingDynamic/add" ,method =RequestMethod.POST)
+    public  ResponseBean buildingDynamicAdd(@RequestBody String parameter){
+        ResponseBean responseBean = new ResponseBean();
+        TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
+        dynamic.setStatus(1);
+//        dynamic.setDynamicId(idGen.nextId()+"");
+        dynamic.setPublishDate(LocalDateTime.now());
+        dynamic.setCreateDate(LocalDateTime.now());
+        iBuildingDynamicService.save(dynamic);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/buildingDynamic/update" ,method =RequestMethod.PUT)
+    public  ResponseBean buildingDynamicUpdate(@RequestBody String parameter){
+        ResponseBean responseBean = new ResponseBean();
+        TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
+        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
+        iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/buildingDynamic/delete", method = RequestMethod.DELETE)
+    public ResponseBean pageImdelect(@RequestParam(value = "id",required = false)String id) {
+        ResponseBean responseBean = iBuildingDynamicService.buildingDynamicDelete(id);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/buildingDynamic/send/{dynamicId}", method = RequestMethod.PUT)
+    public ResponseBean send(@PathVariable String dynamicId) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
+        dynamicQueryWrapper.eq("dynamic_id", dynamicId);
+        TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
+        dynamic.setStatus(1);
+        dynamic.setPublishDate(LocalDateTime.now());
+        iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/buildingDynamic/cancel/{dynamicId}", method = RequestMethod.PUT)
+    public ResponseBean cancel(@PathVariable String dynamicId) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
+        dynamicQueryWrapper.eq("dynamic_id", dynamicId);
+        TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
+        dynamic.setStatus(0);
+        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());
+
+        if (null != building) {
+            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/TaBuildingReportController.java

@@ -0,0 +1,144 @@
+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.TaBuildingReport;
+import com.huiju.estateagents.service.ITaBuildingReportService;
+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-08-08
+ */
+@RestController
+@RequestMapping("/api")
+public class TaBuildingReportController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaBuildingReportController.class);
+
+    @Autowired
+    public ITaBuildingReportService iTaBuildingReportService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taBuildingReport",method= RequestMethod.GET)
+    public ResponseBean taBuildingReportList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaBuildingReport> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaBuildingReport> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaBuildingReport> result = iTaBuildingReportService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("taBuildingReportList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taBuildingReport 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taBuildingReport",method= RequestMethod.POST)
+    public ResponseBean taBuildingReportAdd(@RequestBody TaBuildingReport taBuildingReport){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaBuildingReportService.save(taBuildingReport)){
+                responseBean.addSuccess(taBuildingReport);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taBuildingReportAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taBuildingReport/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taBuildingReportDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaBuildingReportService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taBuildingReportDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taBuildingReport 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taBuildingReport/{id}",method= RequestMethod.PUT)
+    public ResponseBean taBuildingReportUpdate(@PathVariable Integer id,
+                                        @RequestBody TaBuildingReport taBuildingReport){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaBuildingReportService.updateById(taBuildingReport)){
+                responseBean.addSuccess(taBuildingReport);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taBuildingReportUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taBuildingReport/{id}",method= RequestMethod.GET)
+    public ResponseBean taBuildingReportGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaBuildingReportService.getById(id));
+        }catch (Exception e){
+            logger.error("taBuildingReportDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -77,32 +77,34 @@ public class TaPersonVisitRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.POST)
-    public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request,  @RequestParam(value = "buildingId", required = false) String buildingId){
+    public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request){
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        if (!StringUtils.isEmpty(buildingId)){
-            taPersonVisitRecord.setBuildingId(buildingId);
-        }
+        taPersonVisitRecord.setActivity(taPersonVisitRecord.getPropertyName());
         QueryWrapper<TaEventProperties>event = new QueryWrapper<>();
-        event.eq("buildingId",buildingId);
+        event.eq("targetId",taPersonVisitRecord.getTargetId());
+        event.eq("event_type",taPersonVisitRecord.getEventType());
         event.eq("property_code",taPersonVisitRecord.getActivity());
         List<TaEventProperties> eventProperties = taEventPropertiesService.list(event);
         if(eventProperties.size()<=0){
             TaEventProperties taEventProperty = new TaEventProperties();
-            taEventProperty.setBuildingId(buildingId);
+            taEventProperty.setBuildingId(taPersonVisitRecord.getTargetId());
             taEventProperty.setCreateDate(LocalDateTime.now());
-            taEventProperty.setPropertyCode(taPersonVisitRecord.getActivity());
+            taEventProperty.setPropertyCode(taPersonVisitRecord.getPropertyName());
             taEventProperty.setPropertyName(taPersonVisitRecord.getPropertyName());
             taEventProperty.setStatus(CommConstant.STATUS_NORMAL);
+            taEventProperty.setBuildingId(taPersonVisitRecord.getBuildingId());
+            taEventProperty.setEventType(taPersonVisitRecord.getEventType());
             if (!taEventPropertiesService.save(taEventProperty)){
                 return ResponseBean.error("新增失败",ResponseBean.ERROR_UNAVAILABLE);
             }
 
         }
+
         taPersonVisitRecord.setPersonId(person.getPersonId());
         taPersonVisitRecord.setVisitTime(LocalDateTime.now());
         try {

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

@@ -0,0 +1,144 @@
+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.TdReport;
+import com.huiju.estateagents.service.ITdReportService;
+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-08-08
+ */
+@RestController
+@RequestMapping("/api")
+public class TdReportController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TdReportController.class);
+
+    @Autowired
+    public ITdReportService iTdReportService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/tdReport",method= RequestMethod.GET)
+    public ResponseBean tdReportList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TdReport> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TdReport> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TdReport> result = iTdReportService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("tdReportList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tdReport 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdReport",method= RequestMethod.POST)
+    public ResponseBean tdReportAdd(@RequestBody TdReport tdReport){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdReportService.save(tdReport)){
+                responseBean.addSuccess(tdReport);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdReportAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tdReport/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tdReportDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTdReportService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdReportDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tdReport 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdReport/{id}",method= RequestMethod.PUT)
+    public ResponseBean tdReportUpdate(@PathVariable Integer id,
+                                        @RequestBody TdReport tdReport){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdReportService.updateById(tdReport)){
+                responseBean.addSuccess(tdReport);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdReportUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tdReport/{id}",method= RequestMethod.GET)
+    public ResponseBean tdReportGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTdReportService.getById(id));
+        }catch (Exception e){
+            logger.error("tdReportDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,53 @@
+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-08-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaBuildingReport implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设置ID
+     */
+    @TableId(value = "setting_id", type = IdType.AUTO)
+    private Integer settingId;
+
+    /**
+     * 报表编码
+     */
+    private String reportCode;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

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

@@ -59,5 +59,9 @@ public class TaEventProperties implements Serializable {
      */
     private String buildingId;
 
+    private String targetId;
+
+    private String eventType;
+
 
 }

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

@@ -112,6 +112,8 @@ public class TaRecommendCustomer implements Serializable {
      */
     private String recommendPerson;
 
+    private String personId;
+
     /**
      * 服务顾问
      */

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.entity;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -73,6 +74,7 @@ public class TdCity implements Serializable {
 
     private String status;
 
+    @TableField(exist = false)
     private String initial;
 
 

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

@@ -0,0 +1,55 @@
+package com.huiju.estateagents.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 报表字典 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TdReport implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 报表编码
+     */
+    private String reportCode;
+
+    /**
+     * 报表名称
+     */
+    private String reportName;
+
+    /**
+     * 关联项目
+     */
+    private Boolean isProject;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaBuildingReport;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 项目报表设置  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-08
+ */
+@Mapper
+public interface TaBuildingReportMapper extends BaseMapper<TaBuildingReport> {
+
+}

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TdPersonFrom;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,6 +13,7 @@ import com.huiju.estateagents.entity.TdPersonFrom;
  * @author jobob
  * @since 2019-08-08
  */
+@Mapper
 public interface TdPersonFromMapper extends BaseMapper<TdPersonFrom> {
 
 }

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TdReport;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 报表字典  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-08
+ */
+@Mapper
+public interface TdReportMapper extends BaseMapper<TdReport> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaBuildingReport;
+
+/**
+ * <p>
+ * 项目报表设置  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-08
+ */
+public interface ITaBuildingReportService extends IService<TaBuildingReport> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TdReport;
+
+/**
+ * <p>
+ * 报表字典  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-08
+ */
+public interface ITdReportService extends IService<TdReport> {
+
+}

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

@@ -1,298 +1,298 @@
-package com.huiju.estateagents.service.impl;
-
-
-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.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.*;
-import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
-import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
-import com.huiju.estateagents.mapper.TaBuildingMapper;
-import com.huiju.estateagents.mapper.TaPersonMapper;
-import com.huiju.estateagents.service.ITaBuildingDynamicService;
-import com.huiju.estateagents.service.ITaBuildingService;
-import com.huiju.estateagents.service.ITaSaveService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.propertyeditors.CustomDateEditor;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.ServletRequestDataBinder;
-
-import javax.servlet.http.HttpServletRequest;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * <p>
- * 项目动态表 服务实现类
- * </p>
- *
- * @author jobob
- * @since 2019-03-21
- */
-@Service
-public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicMapper, TaBuildingDynamic> implements ITaBuildingDynamicService {
-
-    @Autowired
-    private TaBuildingDynamicMapper buildingDynamicMapper;
-
-    @Autowired
-    private TaBuildingMapper buildingMapper;
-
-    @Autowired
-    private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
-
-    @Autowired
-    private TaPersonMapper taPersonMapper;
-
-    @Autowired
-    private ITaSaveService iTaSaveService;
-
-    protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
-        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
-        binder.registerCustomEditor(Date.class, editor);
-    }
-    @Override
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId) {
-        Page<TaBuildingDynamic> page = new Page<>();
-        page.setSize(pageSize == null ? 10 : pageSize);
-        page.setCurrent(pageNum == null ? 1 : pageNum);
-
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId);
-        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);
-        hashMap.put("total",buildingDynamic.getTotal());
-        hashMap.put("pageNum",buildingDynamic.getCurrent());
-        hashMap.put("pageSize",buildingDynamic.getSize());
-        return ResponseBean.success(hashMap);
-    }
-
-    @Override
-    public ResponseBean iBuildingDynamicSelectId(String id) {
-        TaBuildingDynamic buildingDynamicList= buildingDynamicMapper.iBuildingDynamicSelectId(id);
-        return ResponseBean.success(buildingDynamicList);
-    }
-
-    @Override
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid) {
-        Page<TaBuildingDynamic> page = new Page<>();
-        page.setCurrent(pageNum);
-        page.setSize(pageSize);
-
-        TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
-        if (null == taPerson){
-            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
-        buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
-        buildingDynamicQueryWrapper.eq("status", "1");
-        buildingDynamicQueryWrapper.orderByDesc("create_date");
-        IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
-        List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
-        // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间)，2:未开始（展示活动报名时间）,3:结束（不展示）
-        for (TaBuildingDynamic taBuildingDynamic:records){
-            setExtendInfo(taBuildingDynamic, taPerson);
-        }
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("list", records);
-        map.put("total", buildingDynamicIPage.getTotal());
-        map.put("pageNum", buildingDynamicIPage.getCurrent());
-        map.put("pageSize", buildingDynamicIPage.getSize());
-        return ResponseBean.success(map);
-    }
-
-    @Override
-    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,String buildingId,String openid) {
-
-        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
-        buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
-        buildingDynamicQueryWrapper.eq("status",1);
-        TaBuildingDynamic tabuildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
-        // 当前阅读量加1
-
-        buildingDynamicMapper.updateById( tabuildingDynamic.setSaveNum(tabuildingDynamic.getSaveNum()+1));
-        TaBuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
-        TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
-        if (null == taPerson){
-            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-        setExtendInfo(buildingDynamic, taPerson);
-
-        return ResponseBean.success(buildingDynamic);
-    }
-
-    @Override
-    public ResponseBean buildingDynamicAdd(HashMap map) {
-        TaBuildingDynamic buildingDynamic= new TaBuildingDynamic();
-        Date time = (Date)map.get("publishDate");
-        Instant instant = time.toInstant();
-        ZoneId zoneId = ZoneId.systemDefault();
-        LocalDateTime localDateTime = instant.atZone(zoneId).toLocalDateTime();
-
-//        buildingDynamic.setDynamicId(idGen.nextId()+"");
-        buildingDynamic.setBuildingId(map.get("buildingId")+"");
-        buildingDynamic.setImgUrl((String) map.get("imgUrl"));
-        buildingDynamic.setDesc(map.get("desc")+"");
-        buildingDynamic.setUrl(map.get("url")+"");
-        buildingDynamic.setTitle(map.get("title")+"");
-        buildingDynamic.setPublishDate(localDateTime);
-        buildingDynamic.setStatus(1);
-        buildingDynamic.setCreateDate(LocalDateTime.now());
-
-        buildingDynamicMapper.insertBuildingDynamic(buildingDynamic);
-        return ResponseBean.success("成功");
-    }
-
-    @Override
-    public ResponseBean buildingDynamicDelete(String id) {
-        TaBuildingDynamic buildingDynamic= new TaBuildingDynamic();
-        buildingDynamic.setDynamicId(id);
-        buildingDynamic.setStatus(-1);
-        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
-        buildingDynamicQueryWrapper.eq("dynamic_id", id);
-        buildingDynamicMapper.update(buildingDynamic,buildingDynamicQueryWrapper);
-        return ResponseBean.success("成功");
-    }
-
-    @Override
-    public ResponseBean buildingDynamicUpdate(HashMap<Object, Object> map) {
-        TaBuildingDynamic buildingDynamic= new TaBuildingDynamic();
-
-        Date time = (Date)map.get("publishDate");
-        Instant instant = time.toInstant();
-        ZoneId zoneId = ZoneId.systemDefault();
-        LocalDateTime localDateTime = instant.atZone(zoneId).toLocalDateTime();
-
-        buildingDynamic.setDynamicId(map.get("dynamicId")+"");
-        buildingDynamic.setBuildingId(map.get("buildingId")+"");
-        buildingDynamic.setImgUrl((String) map.get("imgUrl"));
-        buildingDynamic.setDesc(map.get("desc")+"");
-        buildingDynamic.setUrl(map.get("url")+"");
-        buildingDynamic.setTitle(map.get("title")+"");
-        buildingDynamic.setPublishDate(localDateTime);
-        buildingDynamic.setStatus(1);
-        buildingDynamic.setCreateDate(LocalDateTime.now());
-
-        buildingDynamicMapper.buildingDynamicUpdate(buildingDynamic);
-        return ResponseBean.success("成功");
-    }
-
-    @Override
-    public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist) {
-        ResponseBean responseBean= new ResponseBean<>();
-        // 查询当前活动属于哪个楼盘
-        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.selectById(taActivityDynamicEnlist.getDynamicId());
-        // 判断当前活动是否满
-        QueryWrapper<TaActivityDynamicEnlist> taBuildingDynamicQuery=  new QueryWrapper<>();
-        taBuildingDynamicQuery.eq("dynamic_id",taBuildingDynamic.getDynamicId());
-        int contActivity = taActivityDynamicEnlistMapper.selectCount(taBuildingDynamicQuery);
-        int personNum= Integer.parseInt(null == taBuildingDynamic.getPersonNum()?"0": taBuildingDynamic.getPersonNum());
-        // 当报名人数已满时，活动为已结束
-        if (contActivity >= personNum){
-            taBuildingDynamic.setIsEnlist("2");
-            buildingDynamicMapper.updateById(taBuildingDynamic);
-            responseBean.addError("当前报名人数已满");
-            return responseBean;
-        }
-        // 判断是否报名根据电话号码校验
-        taBuildingDynamicQuery.eq("phone",taActivityDynamicEnlist.getPhone());
-        TaActivityDynamicEnlist activityDynamicEnlist = taActivityDynamicEnlistMapper.selectOne(taBuildingDynamicQuery);
-        if (null !=activityDynamicEnlist){
-            responseBean.addError("此号码已报名活动");
-            return responseBean;
-        }
-        taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
-                               .setBuildingId(taBuildingDynamic.getDynamicId());
-        int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
-        int joinNum = taBuildingDynamic.getEnlistNum()+1;
-        taBuildingDynamic.setEnlistNum(joinNum);
-        buildingDynamicMapper.updateById(taBuildingDynamic);
-        return ResponseBean.success(state);
-    }
-
-    @Override
-    public ResponseBean signList(Page<TaActivityDynamicEnlist> page, String dynamicId) {
-        List<TaActivityDynamicEnlist> signList= taActivityDynamicEnlistMapper.signList(page,dynamicId);
-        return ResponseBean.success(signList);
-    }
-
-    /**
-     *     根据报名开始时间和结束时间判断当前图标状态
-     */
-    private  TaBuildingDynamic  timeCondition(TaBuildingDynamic taBuildingDynamic){
-        Long currentTime = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
-        if (null == taBuildingDynamic.getEnlistEnd () && null == taBuildingDynamic.getEnlistStart()){
-            return  taBuildingDynamic;
-        }
-        // 报名截止时间
-        Long enlistEnd = taBuildingDynamic.getEnlistEnd ().toInstant(ZoneOffset.of("+8")).toEpochMilli();
-        // 报名开始时间
-        Long enlistStart = taBuildingDynamic.getEnlistStart().toInstant(ZoneOffset.of("+8")).toEpochMilli();
-        // (1:进行中)当前时间小于报名截止时间,并且报名状态为1
-        if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistEnd ) {
-            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_PROCESSING);
-        }
-        //(2:未开始)当前时间是否小于报名时间,并且报名状态为1
-        if (!"1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistStart){
-            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_PREPARE);
-        }
-        //(3:结束)当前时间大于报名结束时间,并且报名状态为1
-        if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime >= enlistEnd){
-            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_FINISH);
-        }
-        return taBuildingDynamic;
-    }
-
-
-    private void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson) {
-        // 是否已报名
-        QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlist = new QueryWrapper<>();
-        activityDynamicEnlist.eq("personId", taPerson.getPersonId());
-        activityDynamicEnlist.eq("dynamic_id", taBuildingDynamic.getDynamicId());
-        TaActivityDynamicEnlist taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectOne(activityDynamicEnlist);
-        if (null == taActivityDynamicEnlistPhone){
-            taBuildingDynamic.setIsSign(1);
-        } else {
-            taBuildingDynamic.setIsSign(0);
-        }
-
-        // 获取报名总数
-        QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist = new QueryWrapper<>();
-        taActivityDynamicEnlist.eq("dynamic_id", taBuildingDynamic.getDynamicId());
-        taActivityDynamicEnlist.eq("building_id", taBuildingDynamic.getBuildingId());
-        int applyCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
-        taBuildingDynamic.setCount(applyCount);
-
-        // 是否收藏
-        TaSave taSave = iTaSaveService.getInfoBy(taPerson.getPersonId(), CommConstant.FAVOR_ACTIVITY, taBuildingDynamic.getDynamicId());
-        if (null == taSave) {
-            taBuildingDynamic.setIsSaved(0);
-        } else {
-            taBuildingDynamic.setIsSaved(1);
-        }
-
-        timeCondition(taBuildingDynamic);
-    }
-}
+package com.huiju.estateagents.service.impl;
+
+
+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.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
+import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
+import com.huiju.estateagents.mapper.TaBuildingMapper;
+import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaSaveService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.ServletRequestDataBinder;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 项目动态表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-21
+ */
+@Service
+public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicMapper, TaBuildingDynamic> implements ITaBuildingDynamicService {
+
+    @Autowired
+    private TaBuildingDynamicMapper buildingDynamicMapper;
+
+    @Autowired
+    private TaBuildingMapper buildingMapper;
+
+    @Autowired
+    private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
+
+    @Autowired
+    private TaPersonMapper taPersonMapper;
+
+    @Autowired
+    private ITaSaveService iTaSaveService;
+
+    protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
+        binder.registerCustomEditor(Date.class, editor);
+    }
+    @Override
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId) {
+        Page<TaBuildingDynamic> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId);
+        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);
+        hashMap.put("total",buildingDynamic.getTotal());
+        hashMap.put("pageNum",buildingDynamic.getCurrent());
+        hashMap.put("pageSize",buildingDynamic.getSize());
+        return ResponseBean.success(hashMap);
+    }
+
+    @Override
+    public ResponseBean iBuildingDynamicSelectId(String id) {
+        TaBuildingDynamic buildingDynamicList= buildingDynamicMapper.iBuildingDynamicSelectId(id);
+        return ResponseBean.success(buildingDynamicList);
+    }
+
+    @Override
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid) {
+        Page<TaBuildingDynamic> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+
+        TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
+        if (null == taPerson){
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
+        buildingDynamicQueryWrapper.eq("status", "1");
+        buildingDynamicQueryWrapper.orderByDesc("create_date");
+        IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
+        List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
+        // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间)，2:未开始（展示活动报名时间）,3:结束（不展示）
+        for (TaBuildingDynamic taBuildingDynamic:records){
+            setExtendInfo(taBuildingDynamic, taPerson);
+        }
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("list", records);
+        map.put("total", buildingDynamicIPage.getTotal());
+        map.put("pageNum", buildingDynamicIPage.getCurrent());
+        map.put("pageSize", buildingDynamicIPage.getSize());
+        return ResponseBean.success(map);
+    }
+
+    @Override
+    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,String buildingId,String openid) {
+
+        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
+        buildingDynamicQueryWrapper.eq("status",1);
+        TaBuildingDynamic tabuildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        // 当前阅读量加1
+        Integer saveNum = tabuildingDynamic.getSaveNum() == null ? 1:tabuildingDynamic.getSaveNum()+1;
+        tabuildingDynamic.setSaveNum(saveNum);
+        buildingDynamicMapper.updateById(tabuildingDynamic);
+        TaBuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
+        if (null == taPerson){
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        setExtendInfo(buildingDynamic, taPerson);
+
+        return ResponseBean.success(buildingDynamic);
+    }
+
+    @Override
+    public ResponseBean buildingDynamicAdd(HashMap map) {
+        TaBuildingDynamic buildingDynamic= new TaBuildingDynamic();
+        Date time = (Date)map.get("publishDate");
+        Instant instant = time.toInstant();
+        ZoneId zoneId = ZoneId.systemDefault();
+        LocalDateTime localDateTime = instant.atZone(zoneId).toLocalDateTime();
+
+//        buildingDynamic.setDynamicId(idGen.nextId()+"");
+        buildingDynamic.setBuildingId(map.get("buildingId")+"");
+        buildingDynamic.setImgUrl((String) map.get("imgUrl"));
+        buildingDynamic.setDesc(map.get("desc")+"");
+        buildingDynamic.setUrl(map.get("url")+"");
+        buildingDynamic.setTitle(map.get("title")+"");
+        buildingDynamic.setPublishDate(localDateTime);
+        buildingDynamic.setStatus(1);
+        buildingDynamic.setCreateDate(LocalDateTime.now());
+
+        buildingDynamicMapper.insertBuildingDynamic(buildingDynamic);
+        return ResponseBean.success("成功");
+    }
+
+    @Override
+    public ResponseBean buildingDynamicDelete(String id) {
+        TaBuildingDynamic buildingDynamic= new TaBuildingDynamic();
+        buildingDynamic.setDynamicId(id);
+        buildingDynamic.setStatus(-1);
+        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        buildingDynamicQueryWrapper.eq("dynamic_id", id);
+        buildingDynamicMapper.update(buildingDynamic,buildingDynamicQueryWrapper);
+        return ResponseBean.success("成功");
+    }
+
+    @Override
+    public ResponseBean buildingDynamicUpdate(HashMap<Object, Object> map) {
+        TaBuildingDynamic buildingDynamic= new TaBuildingDynamic();
+
+        Date time = (Date)map.get("publishDate");
+        Instant instant = time.toInstant();
+        ZoneId zoneId = ZoneId.systemDefault();
+        LocalDateTime localDateTime = instant.atZone(zoneId).toLocalDateTime();
+
+        buildingDynamic.setDynamicId(map.get("dynamicId")+"");
+        buildingDynamic.setBuildingId(map.get("buildingId")+"");
+        buildingDynamic.setImgUrl((String) map.get("imgUrl"));
+        buildingDynamic.setDesc(map.get("desc")+"");
+        buildingDynamic.setUrl(map.get("url")+"");
+        buildingDynamic.setTitle(map.get("title")+"");
+        buildingDynamic.setPublishDate(localDateTime);
+        buildingDynamic.setStatus(1);
+        buildingDynamic.setCreateDate(LocalDateTime.now());
+
+        buildingDynamicMapper.buildingDynamicUpdate(buildingDynamic);
+        return ResponseBean.success("成功");
+    }
+
+    @Override
+    public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist) {
+        ResponseBean responseBean= new ResponseBean<>();
+        // 查询当前活动属于哪个楼盘
+        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.selectById(taActivityDynamicEnlist.getDynamicId());
+        // 判断当前活动是否满
+        QueryWrapper<TaActivityDynamicEnlist> taBuildingDynamicQuery=  new QueryWrapper<>();
+        taBuildingDynamicQuery.eq("dynamic_id",taBuildingDynamic.getDynamicId());
+        int contActivity = taActivityDynamicEnlistMapper.selectCount(taBuildingDynamicQuery);
+        int personNum= Integer.parseInt(null == taBuildingDynamic.getPersonNum()?"0": taBuildingDynamic.getPersonNum());
+        // 当报名人数已满时，活动为已结束
+        if (contActivity >= personNum){
+            taBuildingDynamic.setIsEnlist("2");
+            buildingDynamicMapper.updateById(taBuildingDynamic);
+            responseBean.addError("当前报名人数已满");
+            return responseBean;
+        }
+        // 判断是否报名根据电话号码校验
+        taBuildingDynamicQuery.eq("phone",taActivityDynamicEnlist.getPhone());
+        TaActivityDynamicEnlist activityDynamicEnlist = taActivityDynamicEnlistMapper.selectOne(taBuildingDynamicQuery);
+        if (null !=activityDynamicEnlist){
+            responseBean.addError("此号码已报名活动");
+            return responseBean;
+        }
+        taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
+                .setBuildingId(taBuildingDynamic.getDynamicId());
+        int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
+        int joinNum = taBuildingDynamic.getEnlistNum() == null ? 1:taBuildingDynamic.getEnlistNum()+1;
+        taBuildingDynamic.setEnlistNum(joinNum);
+        buildingDynamicMapper.updateById(taBuildingDynamic);
+        return ResponseBean.success(state);
+    }
+
+    @Override
+    public ResponseBean signList(Page<TaActivityDynamicEnlist> page, String dynamicId) {
+        List<TaActivityDynamicEnlist> signList= taActivityDynamicEnlistMapper.signList(page,dynamicId);
+        return ResponseBean.success(signList);
+    }
+
+    /**
+     *     根据报名开始时间和结束时间判断当前图标状态
+     */
+    private  TaBuildingDynamic  timeCondition(TaBuildingDynamic taBuildingDynamic){
+        Long currentTime = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        if (null == taBuildingDynamic.getEnlistEnd () && null == taBuildingDynamic.getEnlistStart()){
+            return  taBuildingDynamic;
+        }
+        // 报名截止时间
+        Long enlistEnd = taBuildingDynamic.getEnlistEnd ().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        // 报名开始时间
+        Long enlistStart = taBuildingDynamic.getEnlistStart().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        // (1:进行中)当前时间小于报名截止时间,并且报名状态为1
+        if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistEnd ) {
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_PROCESSING);
+        }
+        //(2:未开始)当前时间是否小于报名时间,并且报名状态为1
+        if (!"1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistStart){
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_PREPARE);
+        }
+        //(3:结束)当前时间大于报名结束时间,并且报名状态为1
+        if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime >= enlistEnd){
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_FINISH);
+        }
+        return taBuildingDynamic;
+    }
+
+
+    private void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson) {
+        // 是否已报名
+        QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlist = new QueryWrapper<>();
+        activityDynamicEnlist.eq("personId", taPerson.getPersonId());
+        activityDynamicEnlist.eq("dynamic_id", taBuildingDynamic.getDynamicId());
+        TaActivityDynamicEnlist taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectOne(activityDynamicEnlist);
+        if (null == taActivityDynamicEnlistPhone){
+            taBuildingDynamic.setIsSign(1);
+        } else {
+            taBuildingDynamic.setIsSign(0);
+        }
+
+        // 获取报名总数
+        QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist = new QueryWrapper<>();
+        taActivityDynamicEnlist.eq("dynamic_id", taBuildingDynamic.getDynamicId());
+        taActivityDynamicEnlist.eq("building_id", taBuildingDynamic.getBuildingId());
+        int applyCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
+        taBuildingDynamic.setCount(applyCount);
+
+        // 是否收藏
+        TaSave taSave = iTaSaveService.getInfoBy(taPerson.getPersonId(), CommConstant.FAVOR_ACTIVITY, taBuildingDynamic.getDynamicId());
+        if (null == taSave) {
+            taBuildingDynamic.setIsSaved(0);
+        } else {
+            taBuildingDynamic.setIsSaved(1);
+        }
+
+        timeCondition(taBuildingDynamic);
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaBuildingReport;
+import com.huiju.estateagents.mapper.TaBuildingReportMapper;
+import com.huiju.estateagents.service.ITaBuildingReportService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 项目报表设置  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-08
+ */
+@Service
+public class TaBuildingReportServiceImpl extends ServiceImpl<TaBuildingReportMapper, TaBuildingReport> implements ITaBuildingReportService {
+
+}

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

@@ -0,0 +1,22 @@
+package com.huiju.estateagents.service.impl;
+
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TdReport;
+import com.huiju.estateagents.mapper.TdReportMapper;
+import com.huiju.estateagents.service.ITdReportService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 报表字典  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-08
+ */
+@Service
+public class TdReportServiceImpl extends ServiceImpl<TdReportMapper, TdReport> implements ITdReportService {
+
+}

src/main/resources/mapper/TaBuildingReportMapper.xml

@@ -0,0 +1,5 @@
+<?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.TaBuildingReport.mapper.TaBuildingReportMapper">
+
+</mapper>

src/main/resources/mapper/TdReportMapper.xml

@@ -0,0 +1,5 @@
+<?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.TdReportMapper">
+
+</mapper>