Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

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

@@ -64,8 +64,9 @@ public class StatisticalController {
     public ResponseBean selectUserBehavior(@RequestParam(required = false) Integer pageNum,
                                            @RequestParam(required = false) Integer pageCode,
                                            @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
-                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate) {
-        return iStatisticalService.selectUserBehavior(pageNum, pageCode, startDate, endDate);
+                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
+                                           @RequestParam(value = "buildingId", required = false) String buildingId) {
+        return iStatisticalService.selectUserBehavior(pageNum, pageCode, startDate, endDate, buildingId);
     }
 
     /**
@@ -91,5 +92,51 @@ public class StatisticalController {
     }
 
 
+    /**
+     * 用户总数
+     * @return
+     */
+    @GetMapping(value = "/admin/selectUserCount")
+    public ResponseBean selectUserResource() {
+        return iStatisticalService.selectUserCount();
+    }
+
+    /**
+     * 用户注册数
+     * @return
+     */
+    @GetMapping(value = "/admin/selectRegisteredCount")
+    public ResponseBean selectRegisteredCount() {
+        return iStatisticalService.selectRegisteredCount();
+    }
+
+    /**
+     * 用户最近七天
+     * @return
+     */
+    @GetMapping(value = "/admin/selectRecentlyCount")
+    public ResponseBean selectRecentlyCount(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                            @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate) {
+        return iStatisticalService.selectRecentlyCount(startDate, endDate);
+    }
+
+    /**
+     * 性别比例
+     * @return
+     */
+    @GetMapping(value = "/admin/selectSexUser")
+    public ResponseBean selectSexUser() {
+        return iStatisticalService.selectSexUser();
+    }
+
+    /**
+     * 城市比例
+     * @return
+     */
+    @GetMapping(value = "/admin/selectCityUser")
+    public ResponseBean selectCityUser() {
+        return iStatisticalService.selectCityUser();
+    }
+
 
 }

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

@@ -3,19 +3,19 @@ package com.huiju.estateagents.controller;
 
 import com.alibaba.fastjson.JSONObject;
 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.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 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.entity.*;
 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 com.huiju.estateagents.service.ITaSaveService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.web.bind.ServletRequestDataBinder;
@@ -27,6 +27,7 @@ import javax.swing.*;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -52,6 +53,9 @@ public class TaBuildingDynamicController extends BaseController {
     @Autowired
     private ITaPersonService taPersonService;
 
+    @Autowired
+    private ITaSaveService taSaveService;
+
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -97,7 +101,7 @@ public class TaBuildingDynamicController extends BaseController {
                 return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
             }
             TaPerson person = taPersons.get(0);
-            responseBean.addSuccess(taPersonService.getJoinedActivity(pageNum,pageSize,person.getPhone(),""));
+            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNum,pageSize,"",person));
         }else {
             responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
         }
@@ -105,6 +109,50 @@ public class TaBuildingDynamicController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 活动列表
+     * @param pageNum
+     * @param pageSize
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/wx/save/buildingDynamiceList", method = RequestMethod.GET)
+    public ResponseBean wxSaveBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
+                                               @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
+                                               @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+                                               HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        ResponseBean  responseBean = new ResponseBean();
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
+            saveQueryWrapper.eq("person_id",person.getPersonId());
+            saveQueryWrapper.eq("tagert_type", CommConstant.FAVOR_ACTIVITY);
+            List<TaSave> saveList = taSaveService.list(saveQueryWrapper);
+            if(saveList.size()>0){
+                List<String> ids = new ArrayList<>();
+                for(int i = 0; i<saveList.size();i++){
+                    ids.add(saveList.get(i).getSavedTarget());
+                }
+                IPage<TaBuildingDynamic> page = new Page<>(pageNum, pageSize);
+                QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+                buildingDynamicQueryWrapper.in("dynamic_id",ids);
+                IPage<TaBuildingDynamic> buildingDynamicIPage = iBuildingDynamicService.page(page,buildingDynamicQueryWrapper);
+                for(int j=0;j<buildingDynamicIPage.getRecords().size();j++){
+                    iBuildingDynamicService.setExtendInfo(buildingDynamicIPage.getRecords().get(j),person);
+                }
+                responseBean.addSuccess(buildingDynamicIPage);
+            }else {
+                responseBean.addSuccess("暂无收藏活动");
+            }
+
+
+        return responseBean;
+    }
+
     /**
      * 活动详情
      * @param dynamicId

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

@@ -351,34 +351,7 @@ public class TaPersonController extends BaseController {
 //        }
 //
 //    }
-    /**
-     * 获取我参加过的活动列表
-     * @param pageNumber
-     * @param pageSize
-     * @return
-     */
-    @GetMapping("/wx/joinedActivity/")
-    public ResponseBean getJoinedActivity(@RequestParam(defaultValue = "1") int pageNumber,
-                                             @RequestParam(defaultValue = "10") int pageSize,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 (pageNumber < 0 || pageSize < 0) {
-            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-        try {
-            IPage<TaBuildingDynamic> result = taPersonService.getJoinedActivity(pageNumber,pageSize,person.getPhone(),"");
-            return ResponseBean.success(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            return ResponseBean.error("查询失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-    }
 
 
 }

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

@@ -86,7 +86,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param endDate
      * @return
      */
-    List<PersonPO> selectUserBehavior(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<PersonPO> selectUserBehavior(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate, @Param("buildingId") String buildingId);
 
     /**
      * 活跃用户数 / 最近新增的用户数

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

@@ -30,7 +30,7 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
      * @param page
      * @return
      */
-    IPage<TaPersonVisitRecord> selectAll(IPage<TaPersonVisitRecord> page);
+    IPage<TaPersonVisitRecord> selectAll(IPage<TaPersonVisitRecord> page, String buildingId);
 
 
     /**

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

@@ -16,6 +16,39 @@ public interface IStatisticalService {
      */
     ResponseBean indexStatistical();
 
+    // ----------------   用户统计 start --------------
+    /**
+     * 用户总数
+     * @return
+     */
+    ResponseBean selectUserCount();
+
+    /**
+     * 注册数
+     * @return
+     */
+    ResponseBean selectRegisteredCount();
+
+    /**
+     * 用户最近七天
+     * @return
+     */
+    ResponseBean selectRecentlyCount(LocalDate startDate, LocalDate endDate);
+
+    // ----------------   用户统计 end --------------
+
+    /**
+     * 性别比例
+     * @return
+     */
+    ResponseBean selectSexUser();
+
+    /**
+     * 城市比例
+     * @return
+     */
+    ResponseBean selectCityUser();
+
     /**
      * 活跃用户数
      * @return
@@ -36,7 +69,7 @@ public interface IStatisticalService {
      * @param endDate
      * @return
      */
-    ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, LocalDate startDate,LocalDate endDate);
+    ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, LocalDate startDate,LocalDate endDate, String buildingId);
 
     /**
      * 行为分析的 具体数据列表

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

@@ -1,80 +1,86 @@
-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;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
-
-import java.util.HashMap;
-
-/**
- * <p>
- * 项目动态表 服务类
- * </p>
- *
- * @author jobob
- * @since 2019-03-21
- */
-public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
-
-    /**
-     * 项目动态管理列表
-     * @return
-     */
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId);
-
-    /**
-     * 项目详情
-     * @param id
-     * @return
-     */
-    ResponseBean iBuildingDynamicSelectId(String id);
-
-    /**
-     * 微信小程序 项目动态管理列表
-     * @return
-     */
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid);
-
-    /**
-     * 微信小程序 项目详情
-     * @param dynamicId
-     * @return
-     */
-    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,String buildingId,String openid);
-
-    /**
-     * 动态管理添加
-     * @param map
-     * @return
-     */
-    ResponseBean buildingDynamicAdd(HashMap map);
-
-    /**
-     * 动态删除
-     * @param id
-     * @return
-     */
-    ResponseBean buildingDynamicDelete(String id);
-
-    /**
-     * 动态修改
-     * @param map
-     * @return
-     */
-    ResponseBean buildingDynamicUpdate(HashMap<Object, Object> map);
-
-    /**
-     * 报名活动
-     * @return
-     */
-    ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist);
-
-    /**
-     * 报名列表
-     * @param page
-     * @return
-     */
-    ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId);
-}
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TaPerson;
+
+import java.util.HashMap;
+
+/**
+ * <p>
+ * 项目动态表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-21
+ */
+public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
+
+    /**
+     * 项目动态管理列表
+     * @return
+     */
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId);
+
+    /**
+     * 项目详情
+     * @param id
+     * @return
+     */
+    ResponseBean iBuildingDynamicSelectId(String id);
+
+    /**
+     * 微信小程序 项目动态管理列表
+     * @return
+     */
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid);
+
+    /**
+     * 微信小程序 项目详情
+     * @param dynamicId
+     * @return
+     */
+    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,String buildingId,String openid);
+
+    /**
+     * 动态管理添加
+     * @param map
+     * @return
+     */
+    ResponseBean buildingDynamicAdd(HashMap map);
+
+    /**
+     * 动态删除
+     * @param id
+     * @return
+     */
+    ResponseBean buildingDynamicDelete(String id);
+
+    /**
+     * 动态修改
+     * @param map
+     * @return
+     */
+    ResponseBean buildingDynamicUpdate(HashMap<Object, Object> map);
+
+    /**
+     * 报名活动
+     * @return
+     */
+    ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist);
+
+    /**
+     * 报名列表
+     * @param page
+     * @return
+     */
+    ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId);
+
+    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person);
+
+    void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson);
+}

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

@@ -60,7 +60,6 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     IPage<Map<String,Object>> getSavedConsaultants(int pageNumber, int pageSize,String personId);
 
-    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String phone,String building);
 
     List<TaPersonBuilding> getPersonBuildings(String personId);
 }

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

@@ -10,6 +10,7 @@ import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.po.PersonPO;
 import com.huiju.estateagents.service.IStatisticalService;
 import lombok.extern.slf4j.Slf4j;
+import org.omg.CORBA.OBJECT_NOT_EXIST;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -58,7 +59,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(CommConstant.PERSON_REALTY_CONSULTANT, null, null);
 
         // 用户行为
-        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, null, null);
+        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, null, null, null);
 
         // 用户活跃数
         List<Map<String, Object>> selectActiveUserCount = taPersonMapper.selectActiveUserCount(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.DAY, null, null);
@@ -160,14 +161,14 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, LocalDate startDate, LocalDate endDate) {
+    public ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, LocalDate startDate, LocalDate endDate, String buildingId) {
         ResponseBean responseBean = new ResponseBean();
 
         // 用户行为
-        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
+        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate, buildingId);
 
         IPage<TaPersonVisitRecord> page = new Page<>(pageNum, pageSize);
-        IPage<TaPersonVisitRecord> visitRecordIPage = taPersonVisitRecordMapper.selectAll(page);
+        IPage<TaPersonVisitRecord> visitRecordIPage = taPersonVisitRecordMapper.selectAll(page, buildingId);
 
         Map<String, Object> map = new HashMap<>();
         map.put("selectUserBehavior", selectUserBehavior);
@@ -267,4 +268,74 @@ public class StatisticalServiceImpl implements IStatisticalService {
         responseBean.addSuccess(result);
         return responseBean;
     }
+
+
+    @Override
+    public ResponseBean selectUserCount() {
+        ResponseBean responseBean = new ResponseBean();
+        // 总用户数
+        Integer selectUserCount = taPersonMapper.selectUserCount(CommConstant.PERSON_REALTY_CONSULTANT);
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectUserCount", selectUserCount);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean selectRegisteredCount() {
+        ResponseBean responseBean = new ResponseBean();
+        // 注册数
+        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(CommConstant.PERSON_REALTY_CONSULTANT);
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectRegisteredCount", selectRegisteredCount);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean selectRecentlyCount(LocalDate startDate, LocalDate endDate) {
+        ResponseBean responseBean = new ResponseBean();
+        // 最近七天
+        Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectRecentlyCount", selectRecentlyCount);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean selectSexUser() {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 性别比例
+        // 1 男 2 女
+        Integer selectSexMale = taPersonMapper.selectSexUser(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_MALE);
+        Integer selectSexFemale = taPersonMapper.selectSexUser(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_FEMALE);
+        Map<String, Object> selectSexMaleMap = new HashMap<>();
+        selectSexMaleMap.put("name", "男");
+        selectSexMaleMap.put("value", selectSexMale);
+        Map<String, Object> selectSexFemaleMap = new HashMap<>();
+        selectSexFemaleMap.put("name", "女");
+        selectSexFemaleMap.put("value", selectSexFemale);
+        List<Map<String, Object>> selectSexUser = new ArrayList<>();
+        selectSexUser.add(selectSexMaleMap);
+        selectSexUser.add(selectSexFemaleMap);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectSexUser", selectSexUser);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean selectCityUser() {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 城市比例
+        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(CommConstant.PERSON_REALTY_CONSULTANT);
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectCityUser", selectCityUser);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
 }

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

@@ -27,6 +27,7 @@ import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -267,13 +268,14 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
 
-    private void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson) {
+    @Override
+    public void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson) {
         // 是否已报名
         QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlist = new QueryWrapper<>();
         activityDynamicEnlist.eq("person_id", taPerson.getPersonId());
         activityDynamicEnlist.eq("dynamic_id", taBuildingDynamic.getDynamicId());
-        TaActivityDynamicEnlist taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectOne(activityDynamicEnlist);
-        if (null == taActivityDynamicEnlistPhone){
+        Integer taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectCount(activityDynamicEnlist);
+        if (taActivityDynamicEnlistPhone>0){
             taBuildingDynamic.setIsSign(1);
         } else {
             taBuildingDynamic.setIsSign(0);
@@ -296,4 +298,45 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
 
         timeCondition(taBuildingDynamic);
     }
+
+    @Override
+    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person){
+        QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();
+        activityDynamicEnlistQueryWrapper.eq("phone",person.getPhone());
+        if(!StringUtils.isEmpty(building)){
+            activityDynamicEnlistQueryWrapper.eq("building_id",building);
+        }
+        List<TaActivityDynamicEnlist> activityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(activityDynamicEnlistQueryWrapper);
+        List<String>activityIds = new ArrayList<>();
+        for (int i=0;i<activityDynamicEnlists.size();i++){
+            activityIds.add(activityDynamicEnlists.get(i).getDynamicId());
+        }
+        IPage<TaBuildingDynamic> page = new Page<>(pageNumber, pageSize);
+        QueryWrapper<TaBuildingDynamic> empty = new QueryWrapper<>();
+        if(activityIds.size()>0){
+            empty.in("dynamic_id",activityIds);
+            empty.orderBy(true,false,"start_date");
+            IPage<TaBuildingDynamic> result = buildingDynamicMapper.selectPage(page,empty);
+            for(int i=0;i<result.getRecords().size();i++){
+                result.getRecords().get(i).setIsSign(CommConstant.STATUS_NORMAL);
+                // 获取报名总数
+                QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist = new QueryWrapper<>();
+                taActivityDynamicEnlist.eq("dynamic_id", result.getRecords().get(i).getDynamicId());
+                taActivityDynamicEnlist.eq("building_id", result.getRecords().get(i).getBuildingId());
+                int applyCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
+                result.getRecords().get(i).setCount(applyCount);
+
+                // 是否收藏
+                TaSave taSave = iTaSaveService.getInfoBy(person.getPersonId(), CommConstant.FAVOR_ACTIVITY, result.getRecords().get(i).getDynamicId());
+                if (null == taSave) {
+                    result.getRecords().get(i).setIsSaved(0);
+                } else {
+                    result.getRecords().get(i).setIsSaved(1);
+                }
+            }
+            return result;
+        }else {
+            return null;
+        }
+    }
 }

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

@@ -139,7 +139,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         getBuildingAttaches(building);
         QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
-        saveQueryWrapper.eq("target_type",CommConstant.FAVOR_PROJECT);
+        saveQueryWrapper.eq("tagert_type",CommConstant.FAVOR_PROJECT);
         saveQueryWrapper.eq("person_id",personId);
         saveQueryWrapper.eq("saved_target",building.getBuildingId());
         Integer num = taSaveMapper.selectCount(saveQueryWrapper);
@@ -195,7 +195,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         JSONObject object= JSONObject.parseObject(parameter);
 
         TaBuilding building = JSONObject.parseObject(parameter,TaBuilding.class);
-        building.setOpeningDate(DateUtils.date2LocalDateTime(object.getDate("openingDate")));
+        if(null!= object.getDate("openingDate")){
+            building.setOpeningDate(DateUtils.date2LocalDateTime(object.getDate("openingDate")));
+        }
         building.setCreateDate(LocalDateTime.now());
         building.setStatus(0);
         if (taBuildingMapper.insert(building) < 1) {

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

@@ -167,7 +167,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
             responseBean.addError("数据不存!");
         }else {
             QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
-            saveQueryWrapper.eq("tagret_type", CommConstant.FAVOR_NEWS);
+            saveQueryWrapper.eq("tagert_type", CommConstant.FAVOR_NEWS);
             saveQueryWrapper.eq("person_id",personId);
             saveQueryWrapper.eq("saved_target",taNews.getNewsId());
             Integer num = taSaveMapper.selectCount(saveQueryWrapper);

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

@@ -234,7 +234,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("address", person.getAddress());
         result.put("personTags",person.getPersonTags());
         QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
-        saveQueryWrapper.eq("tagret_type", CommConstant.FAVOR_CONSULTANT);
+        saveQueryWrapper.eq("tagert_type", "card");
         saveQueryWrapper.eq("person_id",personId);
         saveQueryWrapper.eq("saved_target",person.getPersonId());
         Integer num = taSaveMapper.selectCount(saveQueryWrapper);
@@ -630,30 +630,5 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
     }
 
-    @Override
-    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String phone,String building){
-        QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();
-        activityDynamicEnlistQueryWrapper.eq("phone",phone);
-        if(!StringUtils.isEmpty(building)){
-            activityDynamicEnlistQueryWrapper.eq("building_id",building);
-        }
-        List<TaActivityDynamicEnlist> activityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(activityDynamicEnlistQueryWrapper);
-        List<String>activityIds = new ArrayList<>();
-        for (int i=0;i<activityDynamicEnlists.size();i++){
-            activityIds.add(activityDynamicEnlists.get(i).getDynamicId());
-        }
-        IPage<TaBuildingDynamic> page = new Page<>(pageNumber, pageSize);
-        QueryWrapper<TaBuildingDynamic> empty = new QueryWrapper<>();
-        if(activityIds.size()>0){
-            empty.in("dynamic_id",activityIds);
-            empty.orderBy(true,false,"start_date");
-            return taBuildingDynamicMapper.selectPage(page,empty);
-        }else {
-            return null;
-        }
-
 
-
-
-    }
 }

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

@@ -123,7 +123,7 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
 
         // 如果是收藏资讯, 则 - 1
         if (typeOf.equals(CommConstant.FAVOR_NEWS)) {
-            taNewsMapper.setFieldNum(taPerson.getPersonId(),"save_num", -1);
+            taNewsMapper.setFieldNum(like,"save_num", -1);
         }
 
         // 如果是活动收藏, 则 - 1

src/main/resources/mapper/TaPersonMapper.xml

@@ -198,6 +198,9 @@ FROM
         ta_person tp
         INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
         where ifnull(tp.person_type, '') != #{personType}
+        <if test="buildingId != null and buildingId != ''">
+            and tpvr.building_id = #{buildingId}
+        </if>
         GROUP BY  tpvr.event_type, DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' )
         ) AS temp ON temp_date.date = temp.date and temp_date.type_id = temp.event_type
         order by temp_date.date asc

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -14,6 +14,11 @@
         FROM
             ta_person_visit_record tpvr
             LEFT JOIN ta_person tp ON tpvr.person_id = tp.person_id
+            <where>
+                <if test="buildingId != null and buildingId != ''">
+                    tpvr.building_id = #{buildingId}
+                </if>
+            </where>
         GROUP BY tpvr.person_id, tpvr.event
     </select>