fix log4j

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>marketing</artifactId>
-	<version>v1.0.24</version>
+	<version>v1.0.39</version>
 	<name>marketing-cloud</name>
 	<description>新联康营销云</description>
 

src/main/java/com/yunzhi/marketing/base/BaseController.java

@@ -117,7 +117,7 @@ public class BaseController {
     public String getInstitutionId(String buildingId) {
         TaBuilding building = taBuildingService.getById(buildingId);
         if (null == building){
-            return "01";
+            return "1";
         }
         return building.getInstitutionId();
     }
@@ -131,7 +131,11 @@ public class BaseController {
     public List<String> getInstitutionIds(HttpServletRequest request) {
         TaUser taUser = taUserService.getById(getUserId(request));
         List<Institution> list = iInstitutionService.getAllByUser(taUser);
-        return list.stream().map(Institution::getInstitutionId).collect(Collectors.toList());
+        List<String> institutions = list.stream().map(Institution::getInstitutionId).collect(Collectors.toList());
+        if (institutions.contains("01")) {
+            return null;
+        }
+        return institutions;
     }
 
     /**

src/main/java/com/yunzhi/marketing/common/CommConstant.java

@@ -459,8 +459,8 @@ public class CommConstant {
     //分享活动
     public static final Object GROUP_ACTIVITY = "groupActivity";
     public static final String TARGET_TYPE_H5 = "H5";
-    public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
-    public static final String LIVE_ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"onlineSelling/pages/live/index\"}";
+    public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/index/activityDetail/index\"}";
+    public static final String LIVE_ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/video/liveDetail/index\"}";
     public static final String DRAINAGE_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/project/h5Page\"}";
     public static final String HOUSE_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"onlineSelling/pages/houseList/index\"}";
 

src/main/java/com/yunzhi/marketing/common/JWTUtils.java

@@ -97,7 +97,8 @@ public class JWTUtils {
         // 有效期 7 天
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date());
-        calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+7);
+        calendar.add(Calendar.DAY_OF_WEEK, 2);
+//        calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+7);
 
         return Jwts.builder().setClaims(subject).setExpiration(calendar.getTime()).signWith(key).compact();
     }

src/main/java/com/yunzhi/marketing/controller/ExtendContentController.java

@@ -236,7 +236,18 @@ public class ExtendContentController extends BaseController {
     @RequestMapping(value="/admin/extendContent/{id}",method= RequestMethod.PUT)
     public ResponseBean extendContentUpdate(@PathVariable Integer id,
                                         @RequestBody ExtendContent extendContent,HttpServletRequest request){
+
         ResponseBean responseBean = new ResponseBean();
+        ExtendContent origin = iExtendContentService.getById(id);
+        if (null == origin) {
+            responseBean.addError("未找到更新内容");
+            return responseBean;
+        }
+
+        if (null == extendContent.getStatus()) {
+            extendContent.setStatus(origin.getStatus());
+        }
+
         extendContent.setContentId(id);
         try {
             if (extendContent.getCityId() == null){

src/main/java/com/yunzhi/marketing/controller/StatisticalController.java

@@ -77,7 +77,7 @@ public class StatisticalController extends BaseController {
     public ResponseBean changeNewsUserCount(@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,
                                             HttpServletRequest request) {
-        return iStatisticalService.changeNewsUserCount(getOrgId(request), startDate, endDate);
+        return iStatisticalService.changeNewsUserCount(getOrgId(request), startDate, endDate,null);
     }
 
     /**
@@ -198,7 +198,7 @@ public class StatisticalController extends BaseController {
                                             @RequestParam(value = "pageSize", defaultValue = "2") Integer pageSize,
                                             @RequestParam(value = "buildingId", required = false) String buildingId,
                                             HttpServletRequest request) {
-        return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId, getTaPersonBuildingListByUserId(request));
+        return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId, getTaPersonBuildingListByUserId(request), getInstitutionIds(request));
     }
 
     /**
@@ -228,7 +228,7 @@ public class StatisticalController extends BaseController {
     public ResponseBean selectPersonFrom(@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,
                                             HttpServletRequest request) {
-        return iStatisticalService.selectPersonFrom(getOrgId(request), startDate,endDate);
+        return iStatisticalService.selectPersonFrom(getOrgId(request), startDate,endDate,null);
     }
 
     /**
@@ -267,7 +267,7 @@ public class StatisticalController extends BaseController {
                                                 @RequestParam(value = "sortField", required = false) String sortField,
                                                 @RequestParam(value = "sortOrder", required = false) String sortOrder,
                                                 HttpServletRequest request) {
-        return iStatisticalService.getStatsTableList(pageNum,pageSize,getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request),sortField,sortOrder);
+        return iStatisticalService.getStatsTableList(pageNum,pageSize,getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request),sortField,sortOrder,getInstitutionIds(request));
     }
 
     /**
@@ -285,7 +285,7 @@ public class StatisticalController extends BaseController {
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), StatsBuilding.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("项目统计").build();
-        List<StatsBuilding> list = iStatisticalService.getExportTableList(getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request));
+        List<StatsBuilding> list = iStatisticalService.getExportTableList(getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request),getInstitutionIds(request));
         excelWriter.write(list, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();
@@ -354,7 +354,7 @@ public class StatisticalController extends BaseController {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=新增用户.xlsx");
-        ResponseBean responseBean = iStatisticalService.selectPersonFrom(getOrgId(request), startDate, endDate);
+        ResponseBean responseBean = iStatisticalService.selectPersonFrom(getOrgId(request), startDate, endDate,getInstitutionIds(request));
         List<List<String>> headerList = headerList(responseBean.getData());
         List<List<String>> dataList = dataList(responseBean.getData(),userType);
         EasyExcel.write(response.getOutputStream()).head(headerList).sheet("新增用户").doWrite(dataList);

src/main/java/com/yunzhi/marketing/controller/TaBuildingController.java

@@ -1,15 +1,15 @@
 package com.yunzhi.marketing.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
-import com.yunzhi.marketing.entity.TaBuilding;
-import com.yunzhi.marketing.entity.TaOrg;
-import com.yunzhi.marketing.entity.TaPerson;
-import com.yunzhi.marketing.entity.TaPersonBuilding;
+import com.yunzhi.marketing.entity.*;
+import com.yunzhi.marketing.mapper.TaBuildingApartmentMapper;
 import com.yunzhi.marketing.mapper.TaBuildingMapper;
 import com.yunzhi.marketing.mapper.TaOrgMapper;
 import com.yunzhi.marketing.reportCustomerAop.ReportCustomer;
@@ -17,6 +17,7 @@ import com.yunzhi.marketing.service.ITaBuildingService;
 import com.yunzhi.marketing.service.ITaPersonBuildingService;
 import com.yunzhi.marketing.service.ITaPersonService;
 import com.yunzhi.marketing.service.ITaSaveService;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -62,6 +63,11 @@ public class TaBuildingController extends BaseController {
     @Autowired
     ITaPersonBuildingService taPersonBuildingService;
 
+    @Autowired
+    private ISceneLogService iSceneLogService;
+
+    @Autowired
+    TaBuildingApartmentMapper taBuildingApartmentMapper;
 
     /**
      * 楼盘详情
@@ -160,7 +166,27 @@ public class TaBuildingController extends BaseController {
     })
     @PutMapping("/admin/building/update")
     public ResponseBean buildingUpdate(@RequestBody String parameter, HttpServletRequest request) {
-        return taBuildingService.buildingUpdate(parameter, getOrgId(request));
+        ResponseBean responseBean = taBuildingService.buildingUpdate(parameter, getOrgId(request));
+        JSONObject object = JSONObject.parseObject(parameter);
+        TaBuilding building = object.toJavaObject(TaBuilding.class);
+        iSceneLogService.saveLogs(getUserId(request),"building",building.getBuildingId());
+        return responseBean;
+    }
+
+    /**
+     * 获取项目更新日志
+     */
+    @ApiOperation(value = "获取项目更新日志", notes = "获取项目更新日志")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageSize", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "buildingId", value = "项目id"),
+    })
+    @GetMapping("/admin/building/logs")
+    public ResponseBean buildingUpdate(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId, HttpServletRequest request) {
+        return iSceneLogService.getBuildingLogs(pageNum,pageSize,buildingId, getTaPersonBuildingListByUserId(request), getInstitutionIds(request));
     }
 
     /**
@@ -175,7 +201,11 @@ public class TaBuildingController extends BaseController {
     })
     @RequestMapping(value = "/admin/building/add", method = RequestMethod.POST)
     public ResponseBean buildingAdd(@RequestBody String parameter, HttpServletRequest request) {
-        return taBuildingService.buildingAdd(parameter, getOrgId(request), getUserId(request));
+        ResponseBean responseBean = taBuildingService.buildingAdd(parameter, getOrgId(request), getUserId(request));
+        JSONObject object = JSONObject.parseObject(parameter);
+        TaBuilding building = object.toJavaObject(TaBuilding.class);
+        iSceneLogService.saveLogs(getUserId(request),"building",building.getBuildingId());
+        return responseBean;
     }
 
     /**
@@ -190,7 +220,11 @@ public class TaBuildingController extends BaseController {
     })
     @RequestMapping(value = "/admin/building/update/status", method = RequestMethod.PUT)
     public ResponseBean buildingUpdateStatus(@RequestBody String parameter, HttpServletRequest request) {
-        return taBuildingService.buildingUpdateStatus(parameter, getOrgId(request));
+        ResponseBean responseBean = taBuildingService.buildingUpdateStatus(parameter, getOrgId(request));
+        JSONObject jsonobject = JSONObject.parseObject(parameter);
+        String id = jsonobject.getString("id");
+        iSceneLogService.saveLogs(getUserId(request),"building",id);
+        return responseBean;
     }
 
     /**
@@ -206,7 +240,9 @@ public class TaBuildingController extends BaseController {
     })
     @RequestMapping(value = "/admin/building/delete/{id}", method = RequestMethod.DELETE)
     public ResponseBean buildingdelete(@PathVariable("id") String id, HttpServletRequest request) {
-        return taBuildingService.buildingdelete(id, getOrgId(request));
+        ResponseBean buildingdelete = taBuildingService.buildingdelete(id, getOrgId(request));
+        iSceneLogService.saveLogs(getUserId(request),"building",id);
+        return buildingdelete;
     }
 
     /**
@@ -218,8 +254,11 @@ public class TaBuildingController extends BaseController {
      */
     @ApiOperation(value = "添加户型", notes = "添加户型")
     @RequestMapping(value = "/admin/buildingApartment/add", method = RequestMethod.POST)
-    public ResponseBean buildingApartment(@RequestBody String parameter, HttpSession session) {
-        return taBuildingService.buildingApartmentAdd(parameter);
+    public ResponseBean buildingApartment(@RequestBody String parameter, HttpSession session,HttpServletRequest request) {
+        ResponseBean responseBean = taBuildingService.buildingApartmentAdd(parameter);
+        TaBuildingApartment building = JSONObject.parseObject(parameter, TaBuildingApartment.class);
+        iSceneLogService.saveLogs(getUserId(request),"apartment",building.getBuildingId());
+        return responseBean;
     }
 
     /**
@@ -230,8 +269,11 @@ public class TaBuildingController extends BaseController {
      */
     @ApiOperation(value = "户型编辑", notes = "户型编辑")
     @RequestMapping(value = "/admin/buildingApartment/update", method = RequestMethod.PUT)
-    public ResponseBean buildingApartmentUpdate(@RequestBody String parameter) {
-        return taBuildingService.buildingApartmentUpdate(parameter);
+    public ResponseBean buildingApartmentUpdate(@RequestBody String parameter,HttpServletRequest request) {
+        ResponseBean responseBean = taBuildingService.buildingApartmentUpdate(parameter);
+        TaBuildingApartment building = JSONObject.parseObject(parameter, TaBuildingApartment.class);
+        iSceneLogService.saveLogs(getUserId(request),"apartment",building.getBuildingId());
+        return responseBean;
     }
 
     /**
@@ -400,8 +442,13 @@ public class TaBuildingController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/apartment/deleted/{id}", method = RequestMethod.DELETE)
-    public ResponseBean apartmentDeleted(@PathVariable(value = "id") String id) {
-        return taBuildingService.apartmentDel(id);
+    public ResponseBean apartmentDeleted(@PathVariable(value = "id") String id,HttpServletRequest request) {
+        ResponseBean responseBean = taBuildingService.apartmentDel(id);
+        QueryWrapper<TaBuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
+        buildingApartmentQueryWrapper.eq("apartment_id", id);
+        TaBuildingApartment buildingApartment = taBuildingApartmentMapper.selectOne(buildingApartmentQueryWrapper);
+        iSceneLogService.saveLogs(getUserId(request),"apartment",buildingApartment.getBuildingId());
+        return responseBean;
     }
 
     /**
@@ -463,16 +510,24 @@ public class TaBuildingController extends BaseController {
 
     @ApiOperation(value = "admin - 解绑驻场人员", notes = "admin - 解绑驻场人员")
     @DeleteMapping(value = "/admin/marketing/{id}")
-    public  ResponseBean buildingDynamicFinish(@PathVariable String id) {
+    public  ResponseBean buildingDynamicFinish(@PathVariable String id,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         TaPersonBuilding taPersonBuilding = taPersonBuildingService.getById(id);
 
         boolean state = taPersonBuildingService.removeById(id);
         if (state) {
-            TaPerson taPerson = iTaPersonService.getById(taPersonBuilding.getPersonId());
-            // 成为驻场顾问并绑定楼盘
-            taPerson.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
-            iTaPersonService.updateById(taPerson);
+            // 查询下是否还有其他的楼盘驻场
+            LambdaQueryWrapper<TaPersonBuilding> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(TaPersonBuilding::getPersonId,taPersonBuilding.getPersonId());
+            List<TaPersonBuilding> list = taPersonBuildingService.list(lambdaQueryWrapper);
+            if (list.size() < 1) {
+                TaPerson taPerson = iTaPersonService.getById(taPersonBuilding.getPersonId());
+                // 成为驻场顾问并绑定楼盘
+                taPerson.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
+                iTaPersonService.updateById(taPerson);
+                iSceneLogService.saveLogs(getUserId(request),"marketing",taPersonBuilding.getBuildingId());
+            }
+
             responseBean.addSuccess("解绑成功");
         }else {
             responseBean.addError("请检查是否存在驻场人员");

src/main/java/com/yunzhi/marketing/controller/TaBuildingPanoramaController.java

@@ -8,6 +8,7 @@ import com.yunzhi.marketing.entity.TaBuildingApartment;
 import com.yunzhi.marketing.entity.TaBuildingPanorama;
 import com.yunzhi.marketing.service.ITaBuildingApartmentService;
 import com.yunzhi.marketing.service.ITaBuildingPanoramaService;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +41,9 @@ public class TaBuildingPanoramaController extends BaseController {
     @Autowired
     private ITaBuildingApartmentService taBuildingApartmentService;
 
+    @Autowired
+    private ISceneLogService iSceneLogService;
+
     /**
      * 查询列表
      * @return
@@ -126,6 +130,7 @@ public class TaBuildingPanoramaController extends BaseController {
                 taBuildingPanorama.setContent(apartment.getApartmentName());
             }
             if (iTaBuildingPanoramaService.save(taBuildingPanorama)){
+                iSceneLogService.saveLogs(getUserId(request),"panorama",taBuildingPanorama.getBuildingId());
                 responseBean.addSuccess(taBuildingPanorama);
             }else {
                 responseBean.addError("fail");
@@ -144,13 +149,14 @@ public class TaBuildingPanoramaController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value="/admin/panorama/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taBuildingPanoramaDelete(@PathVariable Integer id){
+    public ResponseBean taBuildingPanoramaDelete(@PathVariable Integer id,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             TaBuildingPanorama taBuildingPanorama = new TaBuildingPanorama();
             taBuildingPanorama.setPanoramaId(id);
             taBuildingPanorama.setStatus(CommConstant.STATUS_UNACCALIMED);
             if(iTaBuildingPanoramaService.updateById(taBuildingPanorama)){
+                iSceneLogService.saveLogs(getUserId(request),"panorama",taBuildingPanorama.getBuildingId());
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");
@@ -171,11 +177,12 @@ public class TaBuildingPanoramaController extends BaseController {
      */
     @RequestMapping(value="/admin/panorama/{id}",method= RequestMethod.PUT)
     public ResponseBean taBuildingPanoramaUpdate(@PathVariable Integer id,
-                                        @RequestBody TaBuildingPanorama taBuildingPanorama){
+                                        @RequestBody TaBuildingPanorama taBuildingPanorama,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             taBuildingPanorama.setPanoramaId(id);
             if (iTaBuildingPanoramaService.updateById(taBuildingPanorama)){
+                iSceneLogService.saveLogs(getUserId(request),"panorama",taBuildingPanorama.getBuildingId());
                 responseBean.addSuccess(taBuildingPanorama);
             }else {
                 responseBean.addError("fail");

src/main/java/com/yunzhi/marketing/controller/TaLiveActivityController.java

@@ -224,6 +224,34 @@ public class TaLiveActivityController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 推首页
+     *
+     * @param id             实体ID
+     * @return
+     */
+    @RequestMapping(value = "/admin/home/live/{id}", method = RequestMethod.PUT)
+    public ResponseBean taLiveActivityHome(@PathVariable Integer id,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaLiveActivity taLiveActivity = iTaLiveActivityService.getById(id);
+            if (CommConstant.NOT_PUBLISH.equals(taLiveActivity.getIsHome())) {
+                taLiveActivity.setIsHome(CommConstant.IS_PUBLISH);
+            }else if (CommConstant.IS_PUBLISH.equals(taLiveActivity.getIsHome())) {
+                taLiveActivity.setIsHome(CommConstant.NOT_PUBLISH);
+            }
+            taLiveActivity.setUpdateDate(LocalDateTime.now());
+            taLiveActivity.setUpdateUser(getUserId(request).toString());
+            iTaLiveActivityService.updateById(taLiveActivity);
+            responseBean.addSuccess(taLiveActivity);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taLiveActivityUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 根据id查询对象
      *
@@ -306,6 +334,7 @@ public class TaLiveActivityController extends BaseController {
                                                      @RequestParam(value = "name", required = false) String name,
                                                      @RequestParam(value = "process", required = false) Integer process,
                                                      @RequestParam(value = "newHouse", required = false) Boolean newHouse,
+                                                     @RequestParam(value = "isHome", required = false) Boolean isHome,
                                                      HttpServletRequest request) {
         if (process != null) {
             return getPureLiveActivity(pageNum, pageSize, cityId, buildingId, name, process, request);
@@ -315,7 +344,7 @@ public class TaLiveActivityController extends BaseController {
         try {
             Integer orgId = getOrgId(request);
             IPage<LiveAndVideoVO> pg = new Page<>(pageNum, pageSize);
-            IPage<LiveAndVideoVO> result = iTaLiveActivityService.getWxLiveActivityAndVideo(pg, orgId, cityId, buildingId, name, newHouse);
+            IPage<LiveAndVideoVO> result = iTaLiveActivityService.getWxLiveActivityAndVideo(pg, orgId, cityId, buildingId, name, newHouse, isHome);
             responseBean.addSuccess(result);
 
         } catch (Exception e) {

src/main/java/com/yunzhi/marketing/controller/TaNewsController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
+import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.TaNews;
 import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.reportCustomerAop.ReportCustomer;
@@ -126,10 +127,12 @@ public class TaNewsController extends BaseController {
     })
     @RequestMapping(value="/admin/taNews",method= RequestMethod.POST)
     public ResponseBean taNewsAdd(@RequestBody TaNews taNews, HttpServletRequest request){
-        Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
-        taNews.setCityId(cityId);
         taNews.setOrgId(getOrgId(request));
-        taNews.setInstitutionId(getInstitutionId(taNews.getBuildingId()));
+        if (!StringUtils.isEmpty(taNews.getBuildingId())){
+            Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
+            taNews.setCityId(cityId);
+            taNews.setInstitutionId(getInstitutionId(taNews.getBuildingId()));
+        }
         ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
         return responseBean;
     }
@@ -161,8 +164,11 @@ public class TaNewsController extends BaseController {
                                         @RequestBody TaNews taNews,
                                      HttpServletRequest request){
         taNews.setNewsId(id);
-        Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
-        taNews.setCityId(cityId);
+        if (!StringUtils.isEmpty(taNews.getBuildingId())){
+            Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
+            taNews.setCityId(cityId);
+        }
+
         taNews.setOrgId(getOrgId(request));
         ResponseBean responseBean = iTaNewsService.updateTaNews(taNews);
         if ("1".equals(String.valueOf(taNews.getNewsStatus()))){

src/main/java/com/yunzhi/marketing/controller/TaOrgCityController.java

@@ -0,0 +1,74 @@
+package com.yunzhi.marketing.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.dto.TaOrgCityDTO;
+import com.yunzhi.marketing.entity.TaOrgCity;
+import com.yunzhi.marketing.entity.TaSalesBatch;
+import com.yunzhi.marketing.mapper.TaOrgCityMapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("/api")
+@Api(value = "立森-开城市接口全部用新的以前的不管他了", tags = "立森-开城市接口全部用新的以前的不管他了")
+public class TaOrgCityController extends BaseController {
+
+    @Autowired
+    private TaOrgCityMapper taOrgCityMapper;
+
+    @ApiOperation(value = "获取此项目的城市集合", notes = "获取此项目的城市集合")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageSize", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "parentid", value = "父级id 不传查询所以  100000 查询的是省级机构"),
+    })
+    @GetMapping(value = "/admin/city/list")
+    public ResponseBean adminTdCityList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                        @RequestParam(value = "parentid", required = false) String parentid,
+                                        HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean<>();
+        IPage<TaOrgCity> pg = new Page<>(pageNum, pageSize);
+        Integer orgId = getOrgId(request);
+        LambdaQueryWrapper<TaOrgCity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaOrgCity::getOrgId,orgId);
+        queryWrapper.eq(TaOrgCity::getStatus,1);
+        queryWrapper.eq(!StringUtils.isEmpty(parentid),TaOrgCity::getParentid,parentid);
+        IPage<TaOrgCity> taOrgCityIPage = taOrgCityMapper.selectPage(pg, queryWrapper);
+        responseBean.addSuccess(taOrgCityIPage);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "添加此项目的城市", notes = "添加此项目的城市")
+    @PostMapping(value = "/admin/city/add")
+    public ResponseBean addCity(@RequestBody TaOrgCityDTO taOrgCityDTO, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean<>();
+        TaOrgCity taOrgCity = new TaOrgCity();
+        BeanUtils.copyProperties(taOrgCityDTO,taOrgCity);
+        taOrgCity.setOrgId(getOrgId(request));
+        taOrgCity.setStatus(1);
+        taOrgCityMapper.insert(taOrgCity);
+        responseBean.addSuccess(taOrgCity);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "删除此项目的城市", notes = "添加此项目的城市")
+    @DeleteMapping(value = "/admin/org/city/{id}")
+    public ResponseBean deleteCity(@PathVariable Integer id, HttpServletRequest request) {
+        LambdaQueryWrapper<TaOrgCity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaOrgCity::getCityId,id);
+        return ResponseBean.success(taOrgCityMapper.delete(queryWrapper));
+    }
+}

src/main/java/com/yunzhi/marketing/controller/TaPolicyController.java

@@ -221,10 +221,18 @@ public class TaPolicyController extends BaseController {
     public ResponseBean taPolicyUpdate(@PathVariable Integer id,
                                         @RequestBody TaPolicy taPolicy,
                                        HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
-        try {
 
+        TaPolicy origin = iTaPolicyService.getById(id);
+        if (null == origin || !id.equals(taPolicy.getPolicyId())) {
+            return ResponseBean.error("未找到编辑内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
 
+        if (null == taPolicy.getPublishStatus()) {
+            taPolicy.setPublishStatus(origin.getPublishStatus());
+        }
+
+        ResponseBean responseBean = new ResponseBean();
+        try {
             if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
                 taPolicy.setPublishDate(LocalDateTime.now());
                 String personId = getPersonId(request);

src/main/java/com/yunzhi/marketing/controller/TaPosterController.java

@@ -11,6 +11,7 @@ import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaPoster;
 import com.yunzhi.marketing.service.ITaBuildingService;
 import com.yunzhi.marketing.service.TaPosterService;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +46,8 @@ public class TaPosterController extends BaseController {
     @Autowired
     private ITaBuildingService iTaBuildingService;
 
+    @Autowired
+    private ISceneLogService iSceneLogService;
 
     /**
      * 分页查询列表
@@ -91,6 +94,7 @@ public class TaPosterController extends BaseController {
                 // 为了兼容 小程序3.0 -> v3.4的后端
                 updateBuildingPoster(poster);
                 responseBean.addSuccess(poster);
+                iSceneLogService.saveLogs(getUserId(request),"poster",poster.getTargetId());
             } else {
                 responseBean.addError("fail");
             }
@@ -150,7 +154,7 @@ public class TaPosterController extends BaseController {
      */
     @RequestMapping(value = "/admin/poster/{id}", method = RequestMethod.PUT)
     public ResponseBean posterUpdate(@PathVariable Integer id,
-                                     @RequestBody TaPoster poster) {
+                                     @RequestBody TaPoster poster,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         poster.setPosterId(id);
         try {
@@ -159,6 +163,7 @@ public class TaPosterController extends BaseController {
                 // 为了兼容 小程序3.0 -> v3.4的后端
                 updateBuildingPoster(poster);
                 responseBean.addSuccess(poster);
+                iSceneLogService.saveLogs(getUserId(request),"poster",poster.getTargetId());
             } else {
                 responseBean.addError("fail");
             }

src/main/java/com/yunzhi/marketing/controller/TaShareContentController.java

@@ -8,6 +8,7 @@ import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.entity.TaShareContent;
 import com.yunzhi.marketing.service.TaShareContentService;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +40,8 @@ public class TaShareContentController extends BaseController {
     @Autowired
     public TaShareContentService iShareContentService;
 
+    @Autowired
+    private ISceneLogService iSceneLogService;
 
     /**
      * 分页查询列表
@@ -80,6 +83,7 @@ public class TaShareContentController extends BaseController {
             shareContent.setCreateDate(LocalDateTime.now());
             if (iShareContentService.save(shareContent)){
                 responseBean.addSuccess(shareContent);
+                iSceneLogService.saveLogs(getUserId(request),"shareContent",shareContent.getTargetId());
             }else {
                 responseBean.addError("fail");
             }
@@ -121,12 +125,13 @@ public class TaShareContentController extends BaseController {
      */
     @RequestMapping(value="/admin/shareContent/{id}",method= RequestMethod.PUT)
     public ResponseBean shareContentUpdate(@PathVariable Integer id,
-                                        @RequestBody TaShareContent shareContent){
+                                        @RequestBody TaShareContent shareContent,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         shareContent.setShareContentId(id);
         try {
             if (iShareContentService.updateById(shareContent)){
                 responseBean.addSuccess(shareContent);
+                iSceneLogService.saveLogs(getUserId(request),"shareContent",shareContent.getTargetId());
             }else {
                 responseBean.addError("fail");
             }

src/main/java/com/yunzhi/marketing/dto/AverageReportDTO.java

@@ -33,4 +33,9 @@ public class AverageReportDTO {
      * 性别
      */
     private Integer sex;
+
+    /**
+     * 置业顾问-内场接待
+     */
+    private String realtyConsultant;
 }

src/main/java/com/yunzhi/marketing/dto/TaOrgCityDTO.java

@@ -0,0 +1,40 @@
+package com.yunzhi.marketing.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 菜单表 不同系统,菜单不一致
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaOrgCityDTO implements Serializable {
+
+    /**
+     * 省份id
+     * 城市id
+     */
+    private Integer cityId;
+
+    /**
+     * 省市区名称
+     */
+    private String name;
+
+    /**
+     * 上级ID
+     */
+    private Integer parentid;
+}

src/main/java/com/yunzhi/marketing/entity/TaLiveActivity.java

@@ -96,6 +96,12 @@ public class TaLiveActivity implements Serializable {
 
     private Integer status;
 
+    /**
+     * 是否首页
+     */
+
+    private Integer isHome;
+
     /**
      * 二维码
      */

src/main/java/com/yunzhi/marketing/excel/StatsBuilding.java

@@ -47,8 +47,8 @@ public class StatsBuilding {
      * 观看次数
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "访问次数", index = 5)
-    private Integer pvNum;
+    @ExcelProperty(value = "成交量", index = 5)
+    private Integer cjNum;
 
 
     @ExcelIgnore

src/main/java/com/yunzhi/marketing/excel/searchHouse/AddedValue.java

@@ -0,0 +1,73 @@
+package com.yunzhi.marketing.excel.searchHouse;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class AddedValue {
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickname;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "意向区域", index = 3)
+    private String name;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "客户预算", index = 4)
+    private String maxPrice;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "房屋现状", index = 5)
+    private String houseStatus;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "房屋面积", index = 6)
+    private String area;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "家装模式", index = 7)
+    private String type;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "家装侧重点", index = 8)
+    private String important;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "家装风格", index = 9)
+    private String style;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "关键诉求", index = 10)
+    private String mostImportant;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "特殊功能区", index = 11)
+    private String special;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "是否智能家居", index = 12)
+    private String samrt;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "提交时间", index = 13)
+    private String createdTime;
+
+}

src/main/java/com/yunzhi/marketing/excel/searchHouse/BuyRoom.java

@@ -0,0 +1,84 @@
+package com.yunzhi.marketing.excel.searchHouse;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+public class BuyRoom {
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickname;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "意向区域", index = 3)
+    private String name;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "购房预算", index = 4)
+    private String maxPrice;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "房屋类型", index = 5)
+    private String isNew;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "意向居室", index = 6)
+    private String layout;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "购房目的", index = 7)
+    private String purpose;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "侧重优势", index = 8)
+    private String advantage;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "社区要求", index = 9)
+    private String facility;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "面积要求", index = 10)
+    private String area;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "朝向要求", index = 11)
+    private String orientation;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "楼层要求", index = 12)
+    private String isHigh;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "楼龄要求", index = 13)
+    private String buildingAge;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "客户备注", index = 14)
+    private String remark;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "提交时间", index = 15)
+    private String createdTime;
+
+}

src/main/java/com/yunzhi/marketing/excel/searchHouse/Overseas.java

@@ -0,0 +1,48 @@
+package com.yunzhi.marketing.excel.searchHouse;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class Overseas {
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickname;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "意向区域", index = 3)
+    private String name;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "购房预算", index = 4)
+    private String maxPrice;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "房屋类型", index = 5)
+    private String isNew;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "购房目的", index = 6)
+    private String layout;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "提交时间", index = 7)
+    private String createdTime;
+
+}

src/main/java/com/yunzhi/marketing/excel/searchHouse/Rent.java

@@ -0,0 +1,56 @@
+package com.yunzhi.marketing.excel.searchHouse;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class Rent {
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickname;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "意向区域", index = 3)
+    private String name;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "购房预算", index = 4)
+    private String maxPrice;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "租房偏好", index = 5)
+    private String preference;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "居室要求", index = 6)
+    private String layout;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "其他要求", index = 7)
+    private String purpose;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "客户备注", index = 8)
+    private String remark;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "提交时间", index = 9)
+    private String createdTime;
+
+}

src/main/java/com/yunzhi/marketing/interceptor/AccessInterceptor.java

@@ -1,265 +1,265 @@
-package com.yunzhi.marketing.interceptor;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yunzhi.marketing.base.ResponseBean;
-import com.yunzhi.marketing.center.sysUser.entity.SysToken;
-import com.yunzhi.marketing.center.sysUser.service.ISysTokenService;
-import com.yunzhi.marketing.center.taUser.entity.TaButtonUriMap;
-import com.yunzhi.marketing.center.taUser.entity.TaUserRole;
-import com.yunzhi.marketing.center.taUser.service.ITaButtonUriMapService;
-import com.yunzhi.marketing.center.taUser.service.ITaUserRoleService;
-import com.yunzhi.marketing.common.JWTUtils;
-import com.yunzhi.marketing.common.StringUtils;
-import com.yunzhi.marketing.entity.SysButtonInMenu;
-import com.yunzhi.marketing.entity.TaRoleButton;
-import com.yunzhi.marketing.service.ISysButtonInMenuService;
-import com.yunzhi.marketing.service.ITaRoleButtonService;
-import com.yunzhi.marketing.third.service.ITaThirdPartyMiniappConfigService;
-import io.jsonwebtoken.*;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-
-@Slf4j
-@Component
-public class AccessInterceptor implements HandlerInterceptor {
-    
-    @Autowired
-    private ISysTokenService sysTokenService;
-    
-    @Autowired
-    private ITaUserRoleService taUserRoleService;
-    
-    @Autowired
-    private ITaRoleButtonService taRoleButtonService;
-    
-    @Autowired
-    private ISysButtonInMenuService sysButtonInMenuService;
-    
-    @Autowired
-    private ITaButtonUriMapService taButtonUriMapService;
-    
-    @Autowired
-    private ITaThirdPartyMiniappConfigService taThirdPartyMiniappConfigService;
-    
-    private String[] whiteList = {
-            "/wx/chat", // 聊天暂时不鉴权
-            "/api/wx/login",
-            "/api/wx/tdCity",
-            "/api/wx/preload",
-            "/api/admin/signin",
-            "/api/taCheckin/activity",
-            "/api/wx/qrcode/scene",
-		    "/api/center/signin",
-            "/api/channel/signin",
-		    "/api/admin/taUser/signin",
-            "/swagger-resources/configuration/ui",
-            "/swagger-resources",
-            "/v2/api-docs",
-            "/swagger-resources/configuration",
-            "/swagger-ui.html",
-            "/webjars",
-            "/webjars/springfox-swagger-ui",
-            "/webjars/springfox-swagger-ui/css/typography.css",
-            "/clean/menurole",
-            "/clean/buttonrole",
-            "/api/admin/taPersonFromRecord",
-            "/api/notify",//微信支付所有回调放过
-            "/api/refund/",//微信退款所有回调放过
-            "/api/fadd/",//所有的法大大回调放过
-            "/api/third",
-            "/api/third/redirect/",
-            "/file/",
-            "/api/official/" // 官网接口
-    };
-
-    /*
-     * 视图渲染之后的操作
-     */
-    @Override
-    public void afterCompletion(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, Exception arg3)
-            throws Exception {
-
-    }
-
-    /*
-     * 处理请求完成后视图渲染之前的处理操作
-     */
-    @Override
-    public void postHandle(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, ModelAndView arg3)
-            throws Exception {
-
-    }
-
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object obj) throws Exception {
-        log.info("接口请求路径是{}",request.getRequestURI());
-        //第三方权限校验
-        String tokenHeader = request.getHeader("x-token");
-        if (!StringUtils.isEmpty(tokenHeader)){
-            String appidHeader = request.getHeader("x-appid");
-            String nowHeader = request.getHeader("x-time");
-            String thirdState = taThirdPartyMiniappConfigService.checkToken(tokenHeader,appidHeader,nowHeader);
-            if (thirdState.equals("success")){
-                return true;
-            }
-    
-            ResponseBean resp = ResponseBean.error(thirdState , ResponseBean.ERROR_AUTH_FAIL);
-            response.addHeader("Content-type", "application/json");
-            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
-            return false;
-        }
-
-        // 白名单跳过
-        if (inWhiteList(request)) {
-            return true;
-        }
-
-        // 微信头必须对
-        if (!checkMiniApp(request)) {
-            ResponseBean resp = ResponseBean.error("请使用微信请求接口", ResponseBean.ERROR_ILLEGAL_PARAMS);
-
-            response.addHeader("Content-type", "application/json");
-            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
-            return false;
-        }
-
-        // 消息头必须包含 authorization 字段
-        String jwtHeader = request.getHeader("authorization");
-        if (null == jwtHeader || "".equals(jwtHeader)) {
-            ResponseBean resp = ResponseBean.error("请先进行系统登录操作", ResponseBean.ERROR_AUTH_FAIL);
-
-            response.addHeader("Content-type", "application/json");
-            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
-            return false;
-        }
-
-        String[] jwtAuths = jwtHeader.split("Bearer ");
-        if (null == jwtAuths || jwtAuths.length < 2 || StringUtils.isEmpty(jwtAuths[1])) {
-            ResponseBean resp = ResponseBean.error("权限验证非法, 数据格式不正确", ResponseBean.ERROR_AUTH_FAIL);
-
-            response.addHeader("Content-type", "application/json");
-            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
-            return false;
-        }
-
-        try {
-            // 只尝试去解析
-            Jwts.parser().setSigningKey(JWTUtils.key).parseClaimsJws(jwtAuths[1]);
-        } catch (ExpiredJwtException e) {
-            ResponseBean resp = ResponseBean.error("权限验证非法, 身份信息已过期", ResponseBean.ERROR_AUTH_EXPIRED);
-            response.addHeader("Content-type", "application/json");
-            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
-            return false;
-
-        } catch (JwtException e) {
-            ResponseBean resp = ResponseBean.error("权限验证非法, " + e.getMessage(), ResponseBean.ERROR_AUTH_FAIL);
-
-
-            response.addHeader("Content-type", "application/json");
-            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
-            return false;
-        }
-
-        //添加如果执行了登出操作提示先进行登录
-        SysToken sysToken = sysTokenService.getById(jwtAuths[1]);
-        if (null == sysToken){
-            ResponseBean resp = ResponseBean.error("请先进行系统登录操作", ResponseBean.ERROR_AUTH_FAIL);
-
-            response.addHeader("Content-type", "application/json");
-            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
-            return false;
-        }
-
-//        按钮权限校验
-//        boolean state = checkButtonRole(request);
-//        if (!state){
-//            ResponseBean resp = ResponseBean.error("权限验证非法" , ResponseBean.ERROR_AUTH_FAIL);
-//
-//            response.addHeader("Content-type", "application/json");
-//            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
-//            return false;
-//        }
-        
-        return true;
-    }
-    
-    //检验按钮权限
-    private boolean checkButtonRole(HttpServletRequest request) {
-        String action = request.getHeader("x-action");
-        if(StringUtils.isEmpty(action)){
-            return false;
-        }
-        //根据路径匹配code 一致继续 否则无权限
-        String requestURI = request.getRequestURI();
-        String method = request.getMethod();
-        TaButtonUriMap taButtonUriMap = taButtonUriMapService.getByURI(requestURI+":"+method);
-        if (null == taButtonUriMap){
-            return true;
-        }
-    
-        
-        if (!taButtonUriMap.getButtonCode().equals(action)){
-            return false;
-        }
-        
-        //根据code查询按钮权限
-        Map map = JWTUtils.getUserIdAndOrgId(request);
-        QueryWrapper<SysButtonInMenu> sysButtonInMenuQueryWrapper = new QueryWrapper<>();
-        sysButtonInMenuQueryWrapper.eq("code",action);
-        SysButtonInMenu sysButtonInMenu = sysButtonInMenuService.getOne(sysButtonInMenuQueryWrapper);
-        if (null == sysButtonInMenu){
-            return false;
-        }
-        //查询角色
-        QueryWrapper<TaRoleButton> taRoleButtonQueryWrapper = new QueryWrapper<>();
-        taRoleButtonQueryWrapper.eq("btn_id",sysButtonInMenu.getBtnId());
-        List<TaRoleButton> taRoleButtonList = taRoleButtonService.list(taRoleButtonQueryWrapper);
-        if (taRoleButtonList.size() < 1){
-            return true;
-        }
-        //查询用户
-        QueryWrapper<TaUserRole> taUserRoleQueryWrapper = new QueryWrapper<>();
-        taUserRoleQueryWrapper.eq("user_id",map.get("userId"));
-        TaUserRole taUserRole = taUserRoleService.getOne(taUserRoleQueryWrapper);
-        for (TaRoleButton taRoleButton : taRoleButtonList){
-            if (taRoleButton.getRoleId().equals(taUserRole.getRoleId())){
-                return true;
-            }
-        }
-        
-        return false;
-    }
-    
-    private boolean checkMiniApp(HttpServletRequest request) {
-        String requestURI = request.getRequestURI();
-
-        // 非微信请求
-        if (!requestURI.startsWith("/api/wx")) {
-            return true;
-        }
-
-        String ua = request.getHeader("user-agent");
-        return ua.contains("micromessenger") || ua.contains("MicroMessenger");
-    }
-
-    private boolean inWhiteList(HttpServletRequest request) {
-        String requestURI = request.getRequestURI();
-
-        for (String it : whiteList) {
-            if (requestURI.startsWith(it)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
+package com.yunzhi.marketing.interceptor;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.center.sysUser.entity.SysToken;
+import com.yunzhi.marketing.center.sysUser.service.ISysTokenService;
+import com.yunzhi.marketing.center.taUser.entity.TaButtonUriMap;
+import com.yunzhi.marketing.center.taUser.entity.TaUserRole;
+import com.yunzhi.marketing.center.taUser.service.ITaButtonUriMapService;
+import com.yunzhi.marketing.center.taUser.service.ITaUserRoleService;
+import com.yunzhi.marketing.common.JWTUtils;
+import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.entity.SysButtonInMenu;
+import com.yunzhi.marketing.entity.TaRoleButton;
+import com.yunzhi.marketing.service.ISysButtonInMenuService;
+import com.yunzhi.marketing.service.ITaRoleButtonService;
+import com.yunzhi.marketing.third.service.ITaThirdPartyMiniappConfigService;
+import io.jsonwebtoken.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Component
+public class AccessInterceptor implements HandlerInterceptor {
+    
+    @Autowired
+    private ISysTokenService sysTokenService;
+    
+    @Autowired
+    private ITaUserRoleService taUserRoleService;
+    
+    @Autowired
+    private ITaRoleButtonService taRoleButtonService;
+    
+    @Autowired
+    private ISysButtonInMenuService sysButtonInMenuService;
+    
+    @Autowired
+    private ITaButtonUriMapService taButtonUriMapService;
+    
+    @Autowired
+    private ITaThirdPartyMiniappConfigService taThirdPartyMiniappConfigService;
+    
+    private String[] whiteList = {
+            "/wx/chat", // 聊天暂时不鉴权
+            "/api/wx/login",
+            "/api/wx/tdCity",
+            "/api/wx/preload",
+            "/api/admin/signin",
+            "/api/taCheckin/activity",
+            "/api/wx/qrcode/scene",
+		    "/api/center/signin",
+            "/api/channel/signin",
+		    "/api/admin/taUser/signin",
+            "/swagger-resources/configuration/ui",
+            "/swagger-resources",
+            "/v2/api-docs",
+            "/swagger-resources/configuration",
+            "/swagger-ui.html",
+            "/webjars",
+            "/webjars/springfox-swagger-ui",
+            "/webjars/springfox-swagger-ui/css/typography.css",
+            "/clean/menurole",
+            "/clean/buttonrole",
+            "/api/admin/taPersonFromRecord",
+            "/api/notify",//微信支付所有回调放过
+            "/api/refund/",//微信退款所有回调放过
+            "/api/fadd/",//所有的法大大回调放过
+            "/api/third",
+            "/api/third/redirect/",
+            "/file/",
+            "/api/official/" // 官网接口
+    };
+
+    /*
+     * 视图渲染之后的操作
+     */
+    @Override
+    public void afterCompletion(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, Exception arg3)
+            throws Exception {
+
+    }
+
+    /*
+     * 处理请求完成后视图渲染之前的处理操作
+     */
+    @Override
+    public void postHandle(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, ModelAndView arg3)
+            throws Exception {
+
+    }
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object obj) throws Exception {
+        log.info("接口请求路径是{}",request.getRequestURI());
+        //第三方权限校验
+        String tokenHeader = request.getHeader("x-token");
+        if (!StringUtils.isEmpty(tokenHeader)){
+            String appidHeader = request.getHeader("x-appid");
+            String nowHeader = request.getHeader("x-time");
+            String thirdState = taThirdPartyMiniappConfigService.checkToken(tokenHeader,appidHeader,nowHeader);
+            if (thirdState.equals("success")){
+                return true;
+            }
+    
+            ResponseBean resp = ResponseBean.error(thirdState , ResponseBean.ERROR_AUTH_FAIL);
+            response.addHeader("Content-type", "application/json");
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+            return false;
+        }
+
+        // 白名单跳过
+        if (inWhiteList(request)) {
+            return true;
+        }
+
+        // 微信头必须对
+        if (!checkMiniApp(request)) {
+            ResponseBean resp = ResponseBean.error("请使用微信请求接口", ResponseBean.ERROR_ILLEGAL_PARAMS);
+
+            response.addHeader("Content-type", "application/json");
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+            return false;
+        }
+
+        // 消息头必须包含 authorization 字段
+        String jwtHeader = request.getHeader("authorization");
+        if (null == jwtHeader || "".equals(jwtHeader)) {
+            ResponseBean resp = ResponseBean.error("请先进行系统登录操作", ResponseBean.ERROR_AUTH_FAIL);
+
+            response.addHeader("Content-type", "application/json");
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+            return false;
+        }
+
+        String[] jwtAuths = jwtHeader.split("Bearer ");
+        if (null == jwtAuths || jwtAuths.length < 2 || StringUtils.isEmpty(jwtAuths[1])) {
+            ResponseBean resp = ResponseBean.error("权限验证非法, 数据格式不正确", ResponseBean.ERROR_AUTH_FAIL);
+
+            response.addHeader("Content-type", "application/json");
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+            return false;
+        }
+
+        try {
+            // 只尝试去解析
+            Jwts.parser().setSigningKey(JWTUtils.key).parseClaimsJws(jwtAuths[1]);
+        } catch (ExpiredJwtException e) {
+            ResponseBean resp = ResponseBean.error("身份信息已过期，请刷新网页重新登录", ResponseBean.ERROR_AUTH_EXPIRED);
+            response.addHeader("Content-type", "application/json");
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+            return false;
+
+        } catch (JwtException e) {
+            ResponseBean resp = ResponseBean.error("权限验证非法, " + e.getMessage(), ResponseBean.ERROR_AUTH_FAIL);
+
+
+            response.addHeader("Content-type", "application/json");
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+            return false;
+        }
+
+        //添加如果执行了登出操作提示先进行登录
+        SysToken sysToken = sysTokenService.getById(jwtAuths[1]);
+        if (null == sysToken){
+            ResponseBean resp = ResponseBean.error("请先进行系统登录操作", ResponseBean.ERROR_AUTH_FAIL);
+
+            response.addHeader("Content-type", "application/json");
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+            return false;
+        }
+
+//        按钮权限校验
+//        boolean state = checkButtonRole(request);
+//        if (!state){
+//            ResponseBean resp = ResponseBean.error("权限验证非法" , ResponseBean.ERROR_AUTH_FAIL);
+//
+//            response.addHeader("Content-type", "application/json");
+//            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+//            return false;
+//        }
+        
+        return true;
+    }
+    
+    //检验按钮权限
+    private boolean checkButtonRole(HttpServletRequest request) {
+        String action = request.getHeader("x-action");
+        if(StringUtils.isEmpty(action)){
+            return false;
+        }
+        //根据路径匹配code 一致继续 否则无权限
+        String requestURI = request.getRequestURI();
+        String method = request.getMethod();
+        TaButtonUriMap taButtonUriMap = taButtonUriMapService.getByURI(requestURI+":"+method);
+        if (null == taButtonUriMap){
+            return true;
+        }
+    
+        
+        if (!taButtonUriMap.getButtonCode().equals(action)){
+            return false;
+        }
+        
+        //根据code查询按钮权限
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        QueryWrapper<SysButtonInMenu> sysButtonInMenuQueryWrapper = new QueryWrapper<>();
+        sysButtonInMenuQueryWrapper.eq("code",action);
+        SysButtonInMenu sysButtonInMenu = sysButtonInMenuService.getOne(sysButtonInMenuQueryWrapper);
+        if (null == sysButtonInMenu){
+            return false;
+        }
+        //查询角色
+        QueryWrapper<TaRoleButton> taRoleButtonQueryWrapper = new QueryWrapper<>();
+        taRoleButtonQueryWrapper.eq("btn_id",sysButtonInMenu.getBtnId());
+        List<TaRoleButton> taRoleButtonList = taRoleButtonService.list(taRoleButtonQueryWrapper);
+        if (taRoleButtonList.size() < 1){
+            return true;
+        }
+        //查询用户
+        QueryWrapper<TaUserRole> taUserRoleQueryWrapper = new QueryWrapper<>();
+        taUserRoleQueryWrapper.eq("user_id",map.get("userId"));
+        TaUserRole taUserRole = taUserRoleService.getOne(taUserRoleQueryWrapper);
+        for (TaRoleButton taRoleButton : taRoleButtonList){
+            if (taRoleButton.getRoleId().equals(taUserRole.getRoleId())){
+                return true;
+            }
+        }
+        
+        return false;
+    }
+    
+    private boolean checkMiniApp(HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+
+        // 非微信请求
+        if (!requestURI.startsWith("/api/wx")) {
+            return true;
+        }
+
+        String ua = request.getHeader("user-agent");
+        return ua.contains("micromessenger") || ua.contains("MicroMessenger");
+    }
+
+    private boolean inWhiteList(HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+
+        for (String it : whiteList) {
+            if (requestURI.startsWith(it)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

src/main/java/com/yunzhi/marketing/job/CustomerTimeJob.java

@@ -5,6 +5,7 @@ import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.entity.TaRecommendCustomer;
 import com.yunzhi.marketing.service.ITaRecommendCustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -14,7 +15,7 @@ public class CustomerTimeJob {
     @Autowired
     private ITaRecommendCustomerService taRecommendCustomerService;
 
-    //    @Scheduled(cron = "* 0/1 * * * ?")
+    @Scheduled(cron = "0 0 0 * * ?")
     private void customerTimeJob() {
         LocalDateTime nowDate = LocalDateTime.now();
         LocalDateTime beforeTime = nowDate.plusDays(-15);

src/main/java/com/yunzhi/marketing/mapper/TaBuildingMapper.java

@@ -153,7 +153,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @param personBuildingList
      * @return
      */
-    IPage<StatsBuilding> getStatsTableList(IPage<StatsBuilding> page, @Param("orgId") Integer orgId, @Param("startDate")  LocalDate startDate, @Param("endDate")  LocalDate endDate, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sortField") String sortField,@Param("orderType") String orderType);
+    IPage<StatsBuilding> getStatsTableList(IPage<StatsBuilding> page, @Param("orgId") Integer orgId, @Param("startDate")  LocalDate startDate, @Param("endDate")  LocalDate endDate, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sortField") String sortField,@Param("orderType") String orderType,@Param("institutionIds") List<String> institutionIds);
 
     /**
      * 获取导出的数据
@@ -164,7 +164,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @param personBuildingList
      * @return
      */
-    List<StatsBuilding> getExportTableList(@Param("orgId") Integer orgId, @Param("startDate")  LocalDate startDate, @Param("endDate")  LocalDate endDate, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    List<StatsBuilding> getExportTableList(@Param("orgId") Integer orgId, @Param("startDate")  LocalDate startDate, @Param("endDate")  LocalDate endDate, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("institutionIds") List<String> institutionIds);
 
     /**
      * 获取单独building的折线图数据

src/main/java/com/yunzhi/marketing/mapper/TaLiveActivityMapper.java

@@ -56,9 +56,10 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
                                                     @Param("buildingId") String buildingId,
                                                     @Param("orgId") Integer orgId,
                                                     @Param("name") String name,
-                                                    @Param("newHouse") Boolean newHouse);
+                                                    @Param("newHouse") Boolean newHouse,
+                                                    @Param("isHome") Boolean isHome);
 
-    IPage<TaLiveActivity> getWxPureLiveActivityList(IPage<TaLiveActivity> pg,
+    IPage<LiveAndVideoVO> getWxPureLiveActivityList(IPage<TaLiveActivity> pg,
                                                     @Param("cityId") Integer cityId,
                                                     @Param("buildingId") String buildingId,
                                                     @Param("orgId") Integer orgId,

src/main/java/com/yunzhi/marketing/mapper/TaPersonIntentionRecordMapper.java

@@ -35,7 +35,8 @@ public interface TaPersonIntentionRecordMapper extends BaseMapper<TaPersonIntent
     IPage<Map<String, Object>> selectIntentionUser(IPage<Map<String, Object>> page,
                                                    @Param("orgId") Integer orgId,
                                                    @Param("buildingId") String buildingId,
-                                                   @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+                                                   @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,
+                                                   @Param("institutionIds") List<String> institutions);
 
     List<IntentionUser> selectExportIntentionUser(@Param("orgId") Integer orgId,@Param("buildingId") String buildingId,@Param("personBuildingList") List<TaPersonBuilding> taPersonBuildingListByUserId);
 }

src/main/java/com/yunzhi/marketing/mapper/TaPersonMapper.java

@@ -262,4 +262,6 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     Integer cancelConsulatant(@Param("personId") String personId);
 
     IPage<TaPerson> getMarketingList(Page<TaBuildingDynamic> page,@Param("buildingId") String buildingId);
+
+    TaPerson getByPhone(@Param("phone") String phone);
 }

src/main/java/com/yunzhi/marketing/mapper/TaRecommendCustomerMapper.java

@@ -40,7 +40,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page, @Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
-    IPage<TaPerson> getIndependentAgents(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel, @Param("channelId") String channelId, @Param("orgId") Integer orgId);
+    IPage<TaPerson> getIndependentAgents(IPage<TaPerson> page, @Param("personId") String personId, @Param("name") String name, @Param("tel") String tel, @Param("channelId") String channelId, @Param("orgId") Integer orgId);
 
     /**
      * 公客

src/main/java/com/yunzhi/marketing/po/TaRecommendCustomerPO.java

@@ -47,4 +47,6 @@ public class TaRecommendCustomerPO {
     private Integer channelId;
 
     private String channelName;
+
+    private String recommendPersonType;
 }

src/main/java/com/yunzhi/marketing/service/IStatisticalService.java

@@ -109,7 +109,7 @@ public interface IStatisticalService {
      * @param buildingId
      * @return
      */
-    ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+    ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId,List<String> institutions);
 
     /**
      * 用户来源数据 首页
@@ -118,7 +118,7 @@ public interface IStatisticalService {
      * @param endDate
      * @return
      */
-    ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate);
+    ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate,List<String> institutions);
 
     /**
      * 用户来源数据统计折线图
@@ -148,7 +148,7 @@ public interface IStatisticalService {
      * @param taPersonBuildingListByUserId
      * @return
      */
-    ResponseBean getStatsTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId,String sortField,String sortOrder);
+    ResponseBean getStatsTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId,String sortField,String sortOrder,List<String> inistions);
 
     /**
      * 获取需要导出的数据
@@ -159,7 +159,7 @@ public interface IStatisticalService {
      * @param taPersonBuildingListByUserId
      * @return
      */
-    List<StatsBuilding> getExportTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+    List<StatsBuilding> getExportTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId,List<String> institutionIds);
 
     /**
      * 按时间获取此楼盘的数据折线图
@@ -214,7 +214,7 @@ public interface IStatisticalService {
      * @param endDate
      * @return
      */
-    ResponseBean changeNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate);
+    ResponseBean changeNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate,List<String> institutions);
 
     /**
      * 人员城市分布

src/main/java/com/yunzhi/marketing/service/ITaLiveActivityService.java

@@ -73,7 +73,7 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
      * @param name
      * @return
      */
-    IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg, Integer orgId, Integer cityId, String buildingId, String name, Boolean newHouse);
+    IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg, Integer orgId, Integer cityId, String buildingId, String name, Boolean newHouse,Boolean isHome);
 
-    IPage<TaLiveActivity> getWxPureLiveActivityList(IPage<TaLiveActivity> pg, Integer orgId, Integer cityId, String buildingId, String name, Integer process);
+    IPage<LiveAndVideoVO> getWxPureLiveActivityList(IPage<TaLiveActivity> pg, Integer orgId, Integer cityId, String buildingId, String name, Integer process);
 }

src/main/java/com/yunzhi/marketing/service/ITaRecommendCustomerService.java

@@ -47,7 +47,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
 
-    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, String channelId, Integer orgId);
+    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String personId, String name, String tel, String channelId, Integer orgId);
 
 
     TaRecommendCustomer getCustomerDetail(String customerId, int pageNumber, int pageSize, List<TaPersonBuilding> taPersonBuildingList, String buildingId);

src/main/java/com/yunzhi/marketing/service/impl/StatisticalServiceImpl.java

@@ -320,11 +320,11 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+    public ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId,List<String> institutions) {
         ResponseBean responseBean = new ResponseBean();
 
         IPage<Map<String, Object>> pg = new Page<>(pageNum, pageSize);
-        IPage<Map<String, Object>> page = taPersonIntentionRecordMapper.selectIntentionUser(pg, orgId, buildingId, taPersonBuildingListByUserId);
+        IPage<Map<String, Object>> page = taPersonIntentionRecordMapper.selectIntentionUser(pg, orgId, buildingId, taPersonBuildingListByUserId,institutions);
 
         responseBean.addSuccess(page);
         return responseBean;
@@ -339,9 +339,9 @@ public class StatisticalServiceImpl implements IStatisticalService {
      * @return
      */
     @Override
-    public ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate) {
+    public ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate,List<String> institutions) {
         ResponseBean responseBean = new ResponseBean();
-        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFrom(orgId, startDate, endDate);
+        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFrom(orgId, startDate, endDate,institutions);
         QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
         tdWxDictQueryWrapper.groupBy("scene_type");
         List<TdWxDict> tdWxDicts = tdWxDictMapper.selectList(tdWxDictQueryWrapper);
@@ -353,7 +353,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         });
         Map<String, Object> map = new HashMap<>();
         map.put("tdWxDicts", tdWxDicts);
-        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectPersonFromGroupByData(orgId, startDate, endDate);
+        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectPersonFromGroupByData(orgId, startDate, endDate,institutions);
         map.put("list", tableList);
         responseBean.addSuccess(map);
         return responseBean;
@@ -455,7 +455,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
      * @return
      */
     @Override
-    public ResponseBean getStatsTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> personBuildingList,String sortField,String sortOrder) {
+    public ResponseBean getStatsTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> personBuildingList,String sortField,String sortOrder,List<String> institutionIds) {
         String orderType = "asc";
         if ("descend".equals(sortOrder)){
             orderType = "desc";
@@ -467,7 +467,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
             orderType = "desc";
         }
         IPage<StatsBuilding> pg = new Page<>(pageNum, pageSize);
-        IPage<StatsBuilding> page = taBuildingMapper.getStatsTableList(pg, orgId, startDate, endDate, buildingId, personBuildingList,sortField,orderType);
+        IPage<StatsBuilding> page = taBuildingMapper.getStatsTableList(pg, orgId, startDate, endDate, buildingId, personBuildingList,sortField,orderType,institutionIds);
         return ResponseBean.success(page);
     }
 
@@ -482,8 +482,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
      * @return
      */
     @Override
-    public List<StatsBuilding> getExportTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> personBuildingList) {
-        return taBuildingMapper.getExportTableList(orgId, startDate, endDate, buildingId, personBuildingList);
+    public List<StatsBuilding> getExportTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> personBuildingList,List<String> institutionIds) {
+        return taBuildingMapper.getExportTableList(orgId, startDate, endDate, buildingId, personBuildingList,institutionIds);
     }
 
     /**
@@ -585,8 +585,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
      * @return
      */
     @Override
-    public ResponseBean changeNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate) {
-        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectNewLinePersonFromGroupByData(orgId, startDate, endDate);
+    public ResponseBean changeNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate,List<String> institutions) {
+        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectNewLinePersonFromGroupByData(orgId, startDate, endDate,institutions);
         return ResponseBean.success(tableList);
     }
 

src/main/java/com/yunzhi/marketing/service/impl/TaLiveActivityServiceImpl.java

@@ -210,13 +210,13 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
      * @return
      */
     @Override
-    public IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg, Integer orgId, Integer cityId, String buildingId, String name, Boolean newHouse) {
-        IPage<LiveAndVideoVO> wxLiveActivityAndVideo = taLiveActivityMapper.getWxLiveActivityAndVideo(pg, cityId, buildingId, orgId, name, newHouse);
+    public IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg, Integer orgId, Integer cityId, String buildingId, String name, Boolean newHouse,Boolean isHome) {
+        IPage<LiveAndVideoVO> wxLiveActivityAndVideo = taLiveActivityMapper.getWxLiveActivityAndVideo(pg, cityId, buildingId, orgId, name, newHouse, isHome);
         return wxLiveActivityAndVideo;
     }
 
     @Override
-    public IPage<TaLiveActivity> getWxPureLiveActivityList(IPage<TaLiveActivity> pg, Integer orgId, Integer cityId, String buildingId, String name, Integer process) {
+    public IPage<LiveAndVideoVO> getWxPureLiveActivityList(IPage<TaLiveActivity> pg, Integer orgId, Integer cityId, String buildingId, String name, Integer process) {
         return taLiveActivityMapper.getWxPureLiveActivityList(pg, cityId, buildingId, orgId, name, process);
     }
 }

src/main/java/com/yunzhi/marketing/service/impl/TaNewsServiceImpl.java

@@ -1,235 +1,235 @@
-package com.yunzhi.marketing.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.yunzhi.marketing.base.ResponseBean;
-import com.yunzhi.marketing.common.BeanTools;
-import com.yunzhi.marketing.common.CommConstant;
-import com.yunzhi.marketing.common.StringUtils;
-import com.yunzhi.marketing.exception.EstaException;
-import com.yunzhi.marketing.mapper.TaFavorMapper;
-import com.yunzhi.marketing.mapper.TaNewsMapper;
-import com.yunzhi.marketing.mapper.TaSaveMapper;
-import com.yunzhi.marketing.entity.*;
-import com.yunzhi.marketing.service.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 资讯表  服务实现类
- * </p>
- *
- * @author jobob
- * @since 2019-07-25
- */
-@Service
-public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> implements ITaNewsService {
-
-    @Autowired
-    private ITaNewsTypeService iTaNewsTypeService;
-
-    @Autowired
-    private ITaBuildingService iTaBuildingService;
-
-    @Autowired
-    private TaFavorMapper taFavorMapper;
-
-    @Autowired
-    private TaNewsMapper taNewsMapper;
-
-    @Autowired
-    private TaSaveMapper taSaveMapper;
-
-    @Autowired
-    private TaPosterService taPosterService;
-
-    @Autowired
-    private TaShareContentService taShareContentService;
-
-
-    @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus, String title, Integer cityId, List<TaPersonBuilding> personBuildingList,List<String> institutionIds) {
-        ResponseBean responseBean = new ResponseBean();
-
-        IPage<TaNews> page = new Page<>();
-        page.setCurrent(pageNum);
-        page.setSize(pageSize);
-
-        QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
-        taNewsQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
-        taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
-        taNewsQueryWrapper.eq(newsTypeId != null,"news_type_id", newsTypeId);
-        taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
-        taNewsQueryWrapper.eq("status", 1);
-        taNewsQueryWrapper.eq(cityId != null, "city_id", cityId);
-        taNewsQueryWrapper.like(title!=null,"news_name", title);
-        taNewsQueryWrapper.in("institution_id",institutionIds);
-        taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
-        taNewsQueryWrapper.orderByAsc("news_status");
-        taNewsQueryWrapper.orderByDesc("weight","create_date");
-        IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
-
-//        injectType(taNewsIPage.getRecords());
-
-        responseBean.addSuccess(taNewsIPage);
-        return responseBean;
-    }
-
-    private void injectType(List<TaNews> records) {
-        records.forEach(e -> {
-            TaNewsType newsType = iTaNewsTypeService.getById(e.getNewsTypeId());
-            e.setNewsType(newsType);
-        });
-    }
-
-    @Override
-    public ResponseBean getTaNewsById(Integer newsId) {
-        ResponseBean responseBean = new ResponseBean();
-        if (null == newsId) {
-            responseBean.addError("编号不能为空！");
-        }
-        TaNews data = this.getById(newsId);
-        data.setPosters(taPosterService.getPostersForTarget(newsId.toString(), CommConstant.POSTER_CONTENT_TYPE_NEWS));
-        data.setShareContents(taShareContentService.getPostersForTarget(newsId.toString(),CommConstant.POSTER_CONTENT_TYPE_NEWS));
-        responseBean.addSuccess(data);
-        return  responseBean;
-    }
-
-    @Override
-    public ResponseBean updateTaNews(TaNews taNews) {
-        ResponseBean responseBean = new ResponseBean();
-        TaNews oldNews = this.getById(taNews.getNewsId());
-        if (null == oldNews) {
-            responseBean.addError("资讯不存在！");
-            return responseBean;
-        }
-
-        //-- 校验 公司，楼盘，资讯类型
-        check(taNews);
-
-        BeanTools.copyProperties(taNews, oldNews);
-        this.updateById(oldNews);
-        responseBean.addSuccess(oldNews);
-        return responseBean;
-    }
-
-    @Override
-    public ResponseBean addTaNews(TaNews taNews) {
-        ResponseBean responseBean = new ResponseBean();
-        check(taNews);
-
-        taNews.setCreateDate(LocalDateTime.now());
-        taNews.setStatus(1);
-        taNews.setNewsStatus(1);
-        this.save(taNews);
-        responseBean.addSuccess(taNews);
-        return responseBean;
-    }
-
-    private void check(TaNews taNews) {
-        //-- 校验 公司，楼盘，资讯类型
-        // TODO 公司校验没有写 taNews.getOrgId()
-
-        TaBuilding taBuilding = iTaBuildingService.getById(taNews.getBuildingId());
-        if (null == taBuilding) {
-            throw new EstaException("楼盘不存在！");
-        }
-//        TaNewsType taNewsType = iTaNewsTypeService.getById(taNews.getNewsTypeId());
-//        if (null == taNewsType) {
-//            throw new EstaException("资讯类型不存在！");
-//        }
-    }
-
-    @Override
-    public ResponseBean deleteTaNews(Integer newsId) {
-        ResponseBean responseBean = getTaNewsById(newsId);
-        if (1 == responseBean.getCode()) {
-            return responseBean;
-        }
-        TaNews taNews = (TaNews) responseBean.getData();
-        if (null == taNews) {
-            responseBean.addError("数据不存!");
-        }
-
-        // 修改状态
-        taNews.setStatus(0);
-        this.updateById(taNews);
-
-        responseBean.addSuccess(taNews);
-        return responseBean;
-    }
-
-    @Override
-    public ResponseBean getWxTaNewsById(Integer newsId,String personId) {
-        ResponseBean responseBean = getTaNewsById(newsId);
-        if (1 == responseBean.getCode()) {
-            return responseBean;
-        }
-        TaNews taNews = (TaNews) responseBean.getData();
-        if (null == taNews) {
-            responseBean.addError("数据不存!");
-        }else {
-            QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
-            saveQueryWrapper.eq("tagert_type", CommConstant.FAVOR_NEWS);
-            saveQueryWrapper.eq("person_id",personId);
-            saveQueryWrapper.eq("saved_target",taNews.getNewsId());
-            Integer num = taSaveMapper.selectCount(saveQueryWrapper);
-            if (num>0){
-                taNews.setIsSave(CommConstant.STATUS_NORMAL);
-            }else {
-                taNews.setIsSave(CommConstant.STATUS_UNACCALIMED);
-            }
-        }
-        //阅读量加一
-        taNewsMapper.setFieldNum(String.valueOf(newsId), "pv_num", 1);
-        responseBean.addSuccess(taNews);
-        return responseBean;
-    }
-
-    @Override
-    public ResponseBean wxTaPvNum(Integer id) {
-        ResponseBean responseBean = getTaNewsById(id);
-        if (1 == responseBean.getCode()) {
-            return responseBean;
-        }
-        TaNews taNews = (TaNews) responseBean.getData();
-        if (null == taNews) {
-            responseBean.addError("数据不存!");
-        }
-
-        taNewsMapper.setFieldNum(String.valueOf(id), "pv_num", 1);
-
-        responseBean.addSuccess((Object)"");
-        return responseBean;
-    }
-
-    @Override
-    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId,boolean mine,Integer orgId) {
-        IPage<TaNews> page = new Page<>(pageNum, pageSize);
-
-        QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
-        taNewsQueryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
-        taNewsQueryWrapper.in(null != targets && targets.size() > 0, "news_id", targets);
-        taNewsQueryWrapper.eq(null != cityId && cityId != 0,"city_id",cityId);
-        taNewsQueryWrapper.eq("org_id",orgId);
-        taNewsQueryWrapper.eq("status", 1);
-        taNewsQueryWrapper.eq("news_status", 0);
-        taNewsQueryWrapper.orderByDesc("weight","create_date");
-        IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
-        IPage<TaNews> pageEmpty = new Page<>(pageNum, pageSize);
-//        injectType(taNewsIPage.getRecords());
-        if (targets.size()<=0 && mine){
-            return pageEmpty;
-        }else {
-            return taNewsIPage;
-        }
-
-    }
-}
+package com.yunzhi.marketing.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.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.BeanTools;
+import com.yunzhi.marketing.common.CommConstant;
+import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.exception.EstaException;
+import com.yunzhi.marketing.mapper.TaFavorMapper;
+import com.yunzhi.marketing.mapper.TaNewsMapper;
+import com.yunzhi.marketing.mapper.TaSaveMapper;
+import com.yunzhi.marketing.entity.*;
+import com.yunzhi.marketing.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 资讯表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Service
+public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> implements ITaNewsService {
+
+    @Autowired
+    private ITaNewsTypeService iTaNewsTypeService;
+
+    @Autowired
+    private ITaBuildingService iTaBuildingService;
+
+    @Autowired
+    private TaFavorMapper taFavorMapper;
+
+    @Autowired
+    private TaNewsMapper taNewsMapper;
+
+    @Autowired
+    private TaSaveMapper taSaveMapper;
+
+    @Autowired
+    private TaPosterService taPosterService;
+
+    @Autowired
+    private TaShareContentService taShareContentService;
+
+
+    @Override
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus, String title, Integer cityId, List<TaPersonBuilding> personBuildingList,List<String> institutionIds) {
+        ResponseBean responseBean = new ResponseBean();
+
+        IPage<TaNews> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+
+        QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
+        taNewsQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
+        taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
+        taNewsQueryWrapper.eq(newsTypeId != null,"news_type_id", newsTypeId);
+        taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
+        taNewsQueryWrapper.eq("status", 1);
+        taNewsQueryWrapper.eq(cityId != null, "city_id", cityId);
+        taNewsQueryWrapper.like(title!=null,"news_name", title);
+        taNewsQueryWrapper.in("institution_id",institutionIds);
+        taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
+        taNewsQueryWrapper.orderByAsc("news_status");
+        taNewsQueryWrapper.orderByDesc("weight","create_date");
+        IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
+
+//        injectType(taNewsIPage.getRecords());
+
+        responseBean.addSuccess(taNewsIPage);
+        return responseBean;
+    }
+
+    private void injectType(List<TaNews> records) {
+        records.forEach(e -> {
+            TaNewsType newsType = iTaNewsTypeService.getById(e.getNewsTypeId());
+            e.setNewsType(newsType);
+        });
+    }
+
+    @Override
+    public ResponseBean getTaNewsById(Integer newsId) {
+        ResponseBean responseBean = new ResponseBean();
+        if (null == newsId) {
+            responseBean.addError("编号不能为空！");
+        }
+        TaNews data = this.getById(newsId);
+        data.setPosters(taPosterService.getPostersForTarget(newsId.toString(), CommConstant.POSTER_CONTENT_TYPE_NEWS));
+        data.setShareContents(taShareContentService.getPostersForTarget(newsId.toString(),CommConstant.POSTER_CONTENT_TYPE_NEWS));
+        responseBean.addSuccess(data);
+        return  responseBean;
+    }
+
+    @Override
+    public ResponseBean updateTaNews(TaNews taNews) {
+        ResponseBean responseBean = new ResponseBean();
+        TaNews oldNews = this.getById(taNews.getNewsId());
+        if (null == oldNews) {
+            responseBean.addError("资讯不存在！");
+            return responseBean;
+        }
+
+        //-- 校验 公司，楼盘，资讯类型
+//        check(taNews);
+
+        BeanTools.copyProperties(taNews, oldNews);
+        this.updateById(oldNews);
+        responseBean.addSuccess(oldNews);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean addTaNews(TaNews taNews) {
+        ResponseBean responseBean = new ResponseBean();
+//        check(taNews);
+
+        taNews.setCreateDate(LocalDateTime.now());
+        taNews.setStatus(1);
+        taNews.setNewsStatus(1);
+        this.save(taNews);
+        responseBean.addSuccess(taNews);
+        return responseBean;
+    }
+
+    private void check(TaNews taNews) {
+        //-- 校验 公司，楼盘，资讯类型
+        // TODO 公司校验没有写 taNews.getOrgId()
+
+        TaBuilding taBuilding = iTaBuildingService.getById(taNews.getBuildingId());
+        if (null == taBuilding) {
+            throw new EstaException("楼盘不存在！");
+        }
+//        TaNewsType taNewsType = iTaNewsTypeService.getById(taNews.getNewsTypeId());
+//        if (null == taNewsType) {
+//            throw new EstaException("资讯类型不存在！");
+//        }
+    }
+
+    @Override
+    public ResponseBean deleteTaNews(Integer newsId) {
+        ResponseBean responseBean = getTaNewsById(newsId);
+        if (1 == responseBean.getCode()) {
+            return responseBean;
+        }
+        TaNews taNews = (TaNews) responseBean.getData();
+        if (null == taNews) {
+            responseBean.addError("数据不存!");
+        }
+
+        // 修改状态
+        taNews.setStatus(0);
+        this.updateById(taNews);
+
+        responseBean.addSuccess(taNews);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getWxTaNewsById(Integer newsId,String personId) {
+        ResponseBean responseBean = getTaNewsById(newsId);
+        if (1 == responseBean.getCode()) {
+            return responseBean;
+        }
+        TaNews taNews = (TaNews) responseBean.getData();
+        if (null == taNews) {
+            responseBean.addError("数据不存!");
+        }else {
+            QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
+            saveQueryWrapper.eq("tagert_type", CommConstant.FAVOR_NEWS);
+            saveQueryWrapper.eq("person_id",personId);
+            saveQueryWrapper.eq("saved_target",taNews.getNewsId());
+            Integer num = taSaveMapper.selectCount(saveQueryWrapper);
+            if (num>0){
+                taNews.setIsSave(CommConstant.STATUS_NORMAL);
+            }else {
+                taNews.setIsSave(CommConstant.STATUS_UNACCALIMED);
+            }
+        }
+        //阅读量加一
+        taNewsMapper.setFieldNum(String.valueOf(newsId), "pv_num", 1);
+        responseBean.addSuccess(taNews);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean wxTaPvNum(Integer id) {
+        ResponseBean responseBean = getTaNewsById(id);
+        if (1 == responseBean.getCode()) {
+            return responseBean;
+        }
+        TaNews taNews = (TaNews) responseBean.getData();
+        if (null == taNews) {
+            responseBean.addError("数据不存!");
+        }
+
+        taNewsMapper.setFieldNum(String.valueOf(id), "pv_num", 1);
+
+        responseBean.addSuccess((Object)"");
+        return responseBean;
+    }
+
+    @Override
+    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId,boolean mine,Integer orgId) {
+        IPage<TaNews> page = new Page<>(pageNum, pageSize);
+
+        QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
+        taNewsQueryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
+        taNewsQueryWrapper.in(null != targets && targets.size() > 0, "news_id", targets);
+        taNewsQueryWrapper.eq(null != cityId && cityId != 0,"city_id",cityId);
+        taNewsQueryWrapper.eq("org_id",orgId);
+        taNewsQueryWrapper.eq("status", 1);
+        taNewsQueryWrapper.eq("news_status", 0);
+        taNewsQueryWrapper.orderByDesc("weight","create_date");
+        IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
+        IPage<TaNews> pageEmpty = new Page<>(pageNum, pageSize);
+//        injectType(taNewsIPage.getRecords());
+        if (targets.size()<=0 && mine){
+            return pageEmpty;
+        }else {
+            return taNewsIPage;
+        }
+
+    }
+}

src/main/java/com/yunzhi/marketing/service/impl/TaPersonFromRecordServiceImpl.java

@@ -52,7 +52,7 @@ public class TaPersonFromRecordServiceImpl extends ServiceImpl<TaPersonFromRecor
         taPersonFromRecord.setEventType(taPersonVisitRecord.getEventType());
         taPersonFromRecord.setSceneId(taPersonVisitRecord.getSceneId());
         TdWxDict tdWxDict = tdWxDictMapper.selectById(taPersonVisitRecord.getSceneId());
-        taPersonFromRecord.setSceneType(null == tdWxDict ? "" : tdWxDict.getSceneType());
+        taPersonFromRecord.setSceneType(null == tdWxDict ? "other" : tdWxDict.getSceneType());
         taPersonFromRecord.setSharePersonId(taPersonVisitRecord.getSharePersonId());
         taPersonFromRecord.setTargetId(taPersonVisitRecord.getTargetId());
         QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
@@ -74,6 +74,8 @@ public class TaPersonFromRecordServiceImpl extends ServiceImpl<TaPersonFromRecor
     public void personFromStatistic() {
         List<TsPersonFromStatistic> list =  taPersonFromRecordMapper.getNowDataList();
         tsPersonFromStatisticMapper.deleteByData();
-        tsPersonFromStatisticMapper.insertStatisticList(list);
+        if (list.size() > 0){
+            tsPersonFromStatisticMapper.insertStatisticList(list);
+        }
     }
 }

src/main/java/com/yunzhi/marketing/service/impl/TaPersonServiceImpl.java

@@ -287,7 +287,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public ResponseBean getCardDetail(String openid, String id,String personId) {
+    public ResponseBean getCardDetail(String openid, String id, String personId) {
         // 卡片人员
         TaPerson person = taPersonMapper.selectById(id);
         if (null == person) {
@@ -325,6 +325,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("description", user.getDescription());
         result.put("department", user.getDepartment());
         result.put("picture", user.getPhoto());
+        result.put("photo", user.getPhoto());
         result.put("hotNum", person.getHotNum());
         result.put("likeNum", person.getLikeNum());
         result.put("pvNum", person.getPvNum());

src/main/java/com/yunzhi/marketing/service/impl/TaPersonVisitRecordServiceImpl.java

@@ -9,15 +9,11 @@ import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.drainage.entity.TaDrainage;
 import com.yunzhi.marketing.drainage.mapper.TaDrainageMapper;
-import com.yunzhi.marketing.mapper.HelpActivityMapper;
-import com.yunzhi.marketing.mapper.TaBuildingDynamicMapper;
-import com.yunzhi.marketing.mapper.TaNewsMapper;
-import com.yunzhi.marketing.mapper.TaPersonMapper;
-import com.yunzhi.marketing.mapper.TaPersonVisitRecordMapper;
-import com.yunzhi.marketing.mapper.TaRecommendCustomerMapper;
-import com.yunzhi.marketing.mapper.TaShareActivityMapper;
+import com.yunzhi.marketing.mapper.*;
 import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.service.*;
+import com.yunzhi.marketing.xlk.entity.Video;
+import com.yunzhi.marketing.xlk.mapper.VideoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -43,12 +39,12 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	
 	@Autowired
 	private TaBuildingDynamicMapper taBuildingDynamicMapper;
-	
+
 	@Autowired
-	private TaShareActivityMapper taShareActivityMapper;
-	
+	private TaLiveActivityMapper taLiveActivityMapper;
+
 	@Autowired
-	private HelpActivityMapper helpActivityMapper;
+	private VideoMapper videoMapper;
 	
 	@Autowired
 	private TaNewsMapper taNewsMapper;
@@ -90,39 +86,42 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getPersonVisitRecordList(pg,taRecommendCustomer.getPersonId());
 		List<TaPersonVisitRecord> records = result.getRecords();
 		records.forEach(e -> {
+			if (StringUtils.isEmpty(e.getTargetId())){
+				return;
+			}
 			//获取活动标题
-			if ("activity".equals(e.getEventType()) && null != e.getTargetId()){
+			if ("activity".equals(e.getEventType()) || "house".equals(e.getEventType()) || "dymic".equals(e.getEventType()) || "look".equals(e.getEventType())) {
 				TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
-				if (null != taBuildingDynamic){
+				if (null != taBuildingDynamic) {
 					e.setActivityName(taBuildingDynamic.getTitle());
 				}
-				
+
 			}
 			//获取拼团标题
-			if ("group".equals(e.getEventType()) && null != e.getTargetId()){
-				TaShareActivity taShareActivity = taShareActivityMapper.selectById(e.getTargetId());
-				if (null != taShareActivity){
-					e.setActivityName(taShareActivity.getActivityName());
+			if ("live".equals(e.getEventType()) && null != e.getTargetId()) {
+				TaLiveActivity taLiveActivity = taLiveActivityMapper.selectById(e.getTargetId());
+				if (null != taLiveActivity) {
+					e.setActivityName(taLiveActivity.getLiveActivityTitle());
 				}
 			}
 			//获取助力标题
-			if ("help".equals(e.getEventType()) && null != e.getTargetId()){
-				HelpActivity helpActivity = helpActivityMapper.selectById(e.getTargetId());
-				if (null != helpActivity){
-					e.setActivityName(helpActivity.getTitle());
+			if ("video".equals(e.getEventType()) && null != e.getTargetId()) {
+				Video video = videoMapper.selectById(e.getTargetId());
+				if (null != video) {
+					e.setActivityName(video.getName());
 				}
 			}
 			//获取咨询标题
-			if ("news".equals(e.getEventType()) && null != e.getTargetId()){
+			if ("news".equals(e.getEventType()) && null != e.getTargetId()) {
 				TaNews taNews = taNewsMapper.selectById(e.getTargetId());
-				if (null != taNews){
+				if (null != taNews) {
 					e.setActivityName(taNews.getNewsName());
 				}
 			}
 			//获取H5活动标题
-			if ("h5".equals(e.getEventType()) && null != e.getTargetId()){
+			if ("h5".equals(e.getEventType()) && null != e.getTargetId()) {
 				TaDrainage taDrainage = taDrainageMapper.selectById(e.getTargetId());
-				if (null != taDrainage){
+				if (null != taDrainage) {
 					e.setActivityName(taDrainage.getName());
 				}
 			}

src/main/java/com/yunzhi/marketing/statistic/controller/TsUserBehaviorStatisticController.java

@@ -158,6 +158,6 @@ public class TsUserBehaviorStatisticController extends BaseController {
                                            @RequestParam(value = "org", required = false) String org,
                                            HttpServletRequest request) {
         Integer orgId = StringUtils.isEmpty(org) ? getOrgId(request) : Integer.valueOf(org);
-        return iTsUserBehaviorStatisticService.selectUserBehavior(orgId, startDate, endDate, buildingId);
+        return iTsUserBehaviorStatisticService.selectUserBehavior(orgId, startDate, endDate, buildingId,null);
     }
 }

src/main/java/com/yunzhi/marketing/statistic/entity/TsPersonFromStatistic.java

@@ -66,4 +66,9 @@ public class TsPersonFromStatistic implements Serializable {
      */
     @TableField(exist = false)
     private String createTime;
+
+    /**
+     * 组织机构id
+     */
+    private String institutionId;
 }

src/main/java/com/yunzhi/marketing/statistic/entity/TsUserBehaviorStatistic.java

@@ -60,5 +60,8 @@ public class TsUserBehaviorStatistic implements Serializable {
      */
     private LocalDateTime createDate;
 
-
+    /**
+     * 组织机构id
+     */
+    private String institutionId;
 }

src/main/java/com/yunzhi/marketing/statistic/mapper/TsPersonFromStatisticMapper.java

@@ -21,13 +21,13 @@ public interface TsPersonFromStatisticMapper extends BaseMapper<TsPersonFromStat
 
     void insertStatisticList(List<TsPersonFromStatistic> list);
 
-    List<TsPersonFromStatistic> selectPersonFrom(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
+    List<TsPersonFromStatistic> selectPersonFrom(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate,@Param("institutionIds") List<String> institutions);
 
     List<TsPersonFromStatistic> selectPersonFromGroupByDay(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
-    List<TsPersonFromStatistic> selectPersonFromGroupByData(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
+    List<TsPersonFromStatistic> selectPersonFromGroupByData(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate,@Param("institutionIds") List<String> institutions);
 
     void deleteByData();
 
-    List<TsPersonFromStatistic> selectNewLinePersonFromGroupByData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+    List<TsPersonFromStatistic> selectNewLinePersonFromGroupByData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("institutionIds") List<String> institutions);
 }

src/main/java/com/yunzhi/marketing/statistic/mapper/TsUserBehaviorStatisticMapper.java

@@ -24,5 +24,5 @@ public interface TsUserBehaviorStatisticMapper extends BaseMapper<TsUserBehavior
 
     int deleteByDate();
 
-    List<PersonPO>  seleBehaviorListByDate(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId);
+    List<PersonPO>  seleBehaviorListByDate(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId,@Param("institutionIds") List<String> institutions);
 }

src/main/java/com/yunzhi/marketing/statistic/service/ITsUserBehaviorStatisticService.java

@@ -5,6 +5,7 @@ import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.statistic.entity.TsUserBehaviorStatistic;
 
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * <p>
@@ -26,5 +27,5 @@ public interface ITsUserBehaviorStatisticService extends IService<TsUserBehavior
      * @param buildingId
      * @return
      */
-    ResponseBean selectUserBehavior(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId);
+    ResponseBean selectUserBehavior(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<String> institutionIds);
 }

src/main/java/com/yunzhi/marketing/statistic/service/impl/TsUserBehaviorStatisticServiceImpl.java

@@ -52,9 +52,9 @@ public class TsUserBehaviorStatisticServiceImpl extends ServiceImpl<TsUserBehavi
      * @return
      */
     @Override
-    public ResponseBean selectUserBehavior(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId) {
+    public ResponseBean selectUserBehavior(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<String> institutionIds) {
         ResponseBean responseBean = new ResponseBean();
-        List<PersonPO> tsUserBehaviorStatistics = tsUserBehaviorStatisticMapper.seleBehaviorListByDate(orgId, startDate, endDate, buildingId);
+        List<PersonPO> tsUserBehaviorStatistics = tsUserBehaviorStatisticMapper.seleBehaviorListByDate(orgId, startDate, endDate, buildingId,institutionIds);
         Map<String, Object> map = new HashMap<>();
         map.put("selectUserBehavior", tsUserBehaviorStatistics);
         responseBean.addSuccess(map);

src/main/java/com/yunzhi/marketing/xlk/controller/BuildingChannelController.java

@@ -11,6 +11,7 @@ import com.yunzhi.marketing.xlk.dto.BuildingChannelDTO;
 import com.yunzhi.marketing.xlk.dto.MarkingChannelCustomerDTO;
 import com.yunzhi.marketing.xlk.entity.BuildingChannel;
 import com.yunzhi.marketing.xlk.service.IBuildingChannelService;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -49,6 +50,8 @@ public class BuildingChannelController extends BaseController {
     @Autowired
     private ITaBuildingService taBuildingService;
 
+    @Autowired
+    private ISceneLogService iSceneLogService;
     /**
      * 保存对象
      * @param buildingChannelDTO 实体对象
@@ -62,6 +65,7 @@ public class BuildingChannelController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             if (saveData(buildingChannelDTO, getOrgId(request))){
+                iSceneLogService.saveLogs(getUserId(request),"channel",buildingChannelDTO.getBuildingId());
                 responseBean.addSuccess("添加成功");
             }else {
                 responseBean.addError("fail");
@@ -91,6 +95,7 @@ public class BuildingChannelController extends BaseController {
 
             // 重新添加
             if (saveData(buildingChannelDTO, getOrgId(request))){
+                iSceneLogService.saveLogs(getUserId(request),"channel",buildingChannelDTO.getBuildingId());
                 responseBean.addSuccess("修改成功");
             }else {
                 responseBean.addError("fail");

src/main/java/com/yunzhi/marketing/xlk/controller/BuildingSpecialRoomController.java

@@ -10,6 +10,7 @@ import com.yunzhi.marketing.service.ITaBuildingService;
 import com.yunzhi.marketing.xlk.dto.BuildingSpecialRoomDTO;
 import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
 import com.yunzhi.marketing.xlk.service.IBuildingSpecialRoomService;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -42,6 +43,8 @@ public class BuildingSpecialRoomController extends BaseController {
     @Autowired
     public ITaBuildingService iTaBuildingService;
 
+    @Autowired
+    private ISceneLogService iSceneLogService;
 
     /**
      * 分页查询列表
@@ -105,6 +108,7 @@ public class BuildingSpecialRoomController extends BaseController {
             buildingSpecialRoom.setOrgId(orgId);
             buildingSpecialRoom.setCreateDate(LocalDateTime.now());
             if (iBuildingSpecialRoomService.save(buildingSpecialRoom)){
+                iSceneLogService.saveLogs(getUserId(request),"buildingSpecialRoom",buildingSpecialRoom.getBuildingId());
                 responseBean.addSuccess(buildingSpecialRoom);
             }else {
                 responseBean.addError("fail");
@@ -127,7 +131,9 @@ public class BuildingSpecialRoomController extends BaseController {
     public ResponseBean buildingSpecialRoomDelete(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            BuildingSpecialRoom buildingSpecialRoom = iBuildingSpecialRoomService.getById(id);
             if(iBuildingSpecialRoomService.removeById(id)){
+                iSceneLogService.saveLogs(getUserId(request),"buildingSpecialRoom",buildingSpecialRoom.getBuildingId());
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");
@@ -156,6 +162,7 @@ public class BuildingSpecialRoomController extends BaseController {
             BeanUtils.copyProperties(buildingSpecialRoomDTO,buildingSpecialRoom);
             buildingSpecialRoom.setSpecialRoomId(id);
             if (iBuildingSpecialRoomService.updateById(buildingSpecialRoom)){
+                iSceneLogService.saveLogs(getUserId(request),"buildingSpecialRoom",buildingSpecialRoom.getBuildingId());
                 responseBean.addSuccess(buildingSpecialRoom);
             }else {
                 responseBean.addError("fail");

src/main/java/com/yunzhi/marketing/xlk/controller/CustomerInfoController.java

@@ -194,24 +194,35 @@ public class CustomerInfoController extends BaseController {
             LambdaQueryWrapper<CustomerInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(CustomerInfo::getCustomerId,customerId);
             CustomerInfo oldCustomerInfo = iCustomerInfoService.getOne(lambdaQueryWrapper);
-            if (iCustomerInfoService.updateById(customerInfo)){
-                // 记录到修改记录表中
-                CustomerInfoModifyRecord customerInfoModifyRecord = new CustomerInfoModifyRecord();
-                customerInfoModifyRecord.setCreateDate(LocalDateTime.now());
-                customerInfoModifyRecord.setCustomerInfoId(oldCustomerInfo.getCustomerId());
-                customerInfoModifyRecord.setModifyPersonId(person.getPersonId());
-                customerInfoModifyRecord.setOrgId(orgId);
-                customerInfoModifyRecord.setContent(JSONObject.toJSONString(customerInfo));
-                customerInfoModifyRecordService.save(customerInfoModifyRecord);
-                responseBean.addSuccess(customerInfo);
+            if (oldCustomerInfo == null){
+                iCustomerInfoService.save(customerInfo);
             }else {
-                responseBean.addError("fail");
+                customerInfo.setCustomerInfoId(oldCustomerInfo.getCustomerInfoId());
+                iCustomerInfoService.updateById(customerInfo);
             }
+            // 修改客户性别
+            TaRecommendCustomer customer = iTaRecommendCustomerService.getById(customerId);
+            if (null != customer) {
+                customer.setSex(customerInfo.getSex());
+                customer.setName(customerInfo.getName());
+                customer.setPhone(customerInfo.getPhone());
+                iTaRecommendCustomerService.updateById(customer);
+            }
+
+            // 记录到修改记录表中
+            CustomerInfoModifyRecord customerInfoModifyRecord = new CustomerInfoModifyRecord();
+            customerInfoModifyRecord.setCreateDate(LocalDateTime.now());
+            customerInfoModifyRecord.setCustomerInfoId(oldCustomerInfo.getCustomerId());
+            customerInfoModifyRecord.setModifyPersonId(person.getPersonId());
+            customerInfoModifyRecord.setOrgId(orgId);
+            customerInfoModifyRecord.setContent(JSONObject.toJSONString(customerInfo));
+            customerInfoModifyRecordService.save(customerInfoModifyRecord);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("customerInfoUpdate -=- {}",e.toString());
             responseBean.addError(e.getMessage());
         }
+        responseBean.addSuccess(customerInfo);
         return responseBean;
     }
 
@@ -236,7 +247,7 @@ public class CustomerInfoController extends BaseController {
                 customerInfo = new CustomerInfo();
             }
             customerInfo.setName(customer.getName());
-//            customerInfo.setSex(customer.getSex());
+            customerInfo.setSex(customer.getSex());
             customerInfo.setPhone(customer.getPhone());
             customerInfo.setPicture(customer.getPicture());
 

src/main/java/com/yunzhi/marketing/xlk/controller/CustomerSignatoryController.java

@@ -7,6 +7,7 @@ import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.entity.CustomerSignatory;
 import com.yunzhi.marketing.xlk.service.ICustomerSignatoryService;
+import com.yunzhi.marketing.xlk.vo.CustomerSignatoryVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -48,20 +49,20 @@ public class CustomerSignatoryController extends BaseController {
      * @param pageSize
      * @return
      */
-    @ApiOperation(value = "", notes = "")
-    @RequestMapping(value="/customerSignatory",method= RequestMethod.GET)
+    @ApiOperation(value = "获取成交或者签约数据", notes = "获取成交或者签约数据")
+    @RequestMapping(value="/admin/customerSignatory",method= RequestMethod.GET)
     public ResponseBean customerSignatoryList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                              @RequestParam(value ="buildingId",required = false) String buildingId,
+                                              @RequestParam(value ="name",required = false) String name,
+                                              @RequestParam(value ="phone",required = false) String phone,
+                                              @RequestParam(value ="type",required = false) String type,
                                               @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<CustomerSignatory> pg = new Page<>(pageNum, pageSize);
-            LambdaQueryWrapper<CustomerSignatory> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(CustomerSignatory::getOrgId,getOrgId(request));
-            queryWrapper.orderByDesc(CustomerSignatory::getCreateDate);
-
-            IPage<CustomerSignatory> result = iCustomerSignatoryService.page(pg, queryWrapper);
+		    IPage<CustomerSignatoryVO> pg = new Page<>(pageNum, pageSize);
+            IPage<CustomerSignatoryVO> result = iCustomerSignatoryService.getCustomerSignatoryList(pg, buildingId,name,phone,type,getOrgId(request));
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/yunzhi/marketing/xlk/controller/PcIndexStatisticsController.java

@@ -99,6 +99,7 @@ public class PcIndexStatisticsController extends BaseController {
         pcStatisticsDTO.setStartTime(startDate);
         pcStatisticsDTO.setEndTime(endDate);
         pcStatisticsDTO.setCityId(cityId);
+        pcStatisticsDTO.setInstitutionIds(getInstitutionIds(request));
         return pcStatisticsService.getStatsBarList(taUser, pcStatisticsDTO);
     }
 

src/main/java/com/yunzhi/marketing/xlk/controller/SceneLogController.java

@@ -0,0 +1,153 @@
+package com.yunzhi.marketing.xlk.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.xlk.entity.SceneLog;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+    * 业务日志记录表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-10-08
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "", tags = "xlk-")
+public class SceneLogController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SceneLogController.class);
+
+    @Autowired
+    public ISceneLogService iSceneLogService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "", notes = "")
+    @RequestMapping(value="/sceneLog",method= RequestMethod.GET)
+    public ResponseBean sceneLogList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SceneLog> pg = new Page<>(pageNum, pageSize);
+            LambdaQueryWrapper<SceneLog> queryWrapper = new LambdaQueryWrapper<>();
+
+            IPage<SceneLog> result = iSceneLogService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sceneLogList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sceneLog 实体对象
+     * @return
+     */
+    @ApiOperation(value = "", notes = "")
+    @RequestMapping(value="/sceneLog",method= RequestMethod.POST)
+    public ResponseBean sceneLogAdd(@RequestBody SceneLog sceneLog, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSceneLogService.save(sceneLog)){
+                responseBean.addSuccess(sceneLog);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sceneLogAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "", notes = "")
+    @ResponseBody
+    @RequestMapping(value="/sceneLog/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sceneLogDelete(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSceneLogService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sceneLogDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sceneLog 实体对象
+     * @return
+     */
+    @ApiOperation(value = "", notes = "")
+    @RequestMapping(value="/sceneLog/{id}",method= RequestMethod.PUT)
+    public ResponseBean sceneLogUpdate(@PathVariable String id,
+                                       @RequestBody SceneLog sceneLog, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSceneLogService.updateById(sceneLog)){
+                responseBean.addSuccess(sceneLog);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sceneLogUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "", notes = "")
+    @RequestMapping(value="/sceneLog/{id}",method= RequestMethod.GET)
+    public ResponseBean sceneLogGet(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSceneLogService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sceneLogDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/controller/SearchHouseController.java

@@ -1,5 +1,9 @@
 package com.yunzhi.marketing.xlk.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,12 +13,19 @@ import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.*;
+import com.yunzhi.marketing.excel.IntentionUser;
+import com.yunzhi.marketing.excel.handler.CustomCellWriteHandler;
+import com.yunzhi.marketing.excel.searchHouse.AddedValue;
+import com.yunzhi.marketing.excel.searchHouse.BuyRoom;
+import com.yunzhi.marketing.excel.searchHouse.Overseas;
+import com.yunzhi.marketing.excel.searchHouse.Rent;
 import com.yunzhi.marketing.service.*;
 import com.yunzhi.marketing.xlk.dto.SearchHouseDTO;
 import com.yunzhi.marketing.xlk.dto.SearchHouseReplayDTO;
 import com.yunzhi.marketing.xlk.entity.Curriculum;
 import com.yunzhi.marketing.xlk.entity.SearchHouse;
 import com.yunzhi.marketing.xlk.service.ISearchHouseService;
+import com.yunzhi.marketing.xlk.vo.ExportSearchHouseVO;
 import com.yunzhi.marketing.xlk.vo.SearchHouseVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,7 +37,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -98,6 +113,109 @@ public class SearchHouseController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 导出数据列表
+     * @return
+     */
+    @ApiOperation(value = "admin-导出帮我找房列表", notes = "admin-导出帮我找房列表")
+    @RequestMapping(value="/admin/exportHouse",method= RequestMethod.GET)
+    public void exportHouse(@RequestParam(value ="type") Integer type,
+                                    @RequestParam(value ="name", required = false) String name,
+                                    @RequestParam(value ="phone", required = false) String phone,
+                                    @RequestParam(value ="status", required = false) String status,
+                                    @RequestHeader("authorization") String token, HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=帮我找房.xlsx");
+        SearchHouseVO searchHouse = new SearchHouseVO();
+        searchHouse.setOrgId(getOrgId(request));
+        searchHouse.setType(type);
+        searchHouse.setNickname(name);
+        searchHouse.setPhone(phone);
+        searchHouse.setStatus(status);
+        List<ExportSearchHouseVO> result = iSearchHouseService.selectExportHouseList(searchHouse);
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        if (searchHouse.getType() == 4) {
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), AddedValue.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("帮我找房").build();
+            List<AddedValue> list = new ArrayList<>();
+            result.forEach(e -> {
+                AddedValue addedValue = new AddedValue();
+                String format = formatter.format(e.getCreatedTime());
+                addedValue.setCreatedTime(format);
+                e.setGender("未知");
+                if (StringUtils.isEmpty(e.getGender())) {
+                    e.setGender(e.getGender().equals("1") ? "男" : e.getGender().equals("2") ? "女" : "未知");
+                }
+                BeanUtils.copyProperties(e,addedValue);
+                list.add(addedValue);
+            });
+            excelWriter.write(list, writeSheet);
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }else if (searchHouse.getType() == 1) {
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), BuyRoom.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("帮我找房").build();
+            List<BuyRoom> list = new ArrayList<>();
+            result.forEach(e -> {
+                BuyRoom buyRoom = new BuyRoom();
+                String format = formatter.format(e.getCreatedTime());
+                buyRoom.setCreatedTime(format);
+                e.setGender("未知");
+                if (StringUtils.isEmpty(e.getGender())) {
+                    e.setGender(e.getGender().equals("1") ? "男" : e.getGender().equals("2") ? "女" : "未知");
+                }
+
+                BeanUtils.copyProperties(e,buyRoom);
+                list.add(buyRoom);
+            });
+            excelWriter.write(list, writeSheet);
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }else if (searchHouse.getType() == 3) {
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), Overseas.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("帮我找房").build();
+            List<Overseas> list = new ArrayList<>();
+            result.forEach(e -> {
+                Overseas overseas = new Overseas();
+                String format = formatter.format(e.getCreatedTime());
+                overseas.setCreatedTime(format);
+                e.setGender("未知");
+                if (StringUtils.isEmpty(e.getGender())) {
+                    e.setGender(e.getGender().equals("1") ? "男" : e.getGender().equals("2") ? "女" : "未知");
+                }
+                BeanUtils.copyProperties(e,overseas);
+                list.add(overseas);
+            });
+            excelWriter.write(list, writeSheet);
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }else if (searchHouse.getType() == 2) {
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), Rent.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("帮我找房").build();
+            List<Rent> list = new ArrayList<>();
+            result.forEach(e -> {
+                Rent rent = new Rent();
+                String format = formatter.format(e.getCreatedTime());
+                rent.setCreatedTime(format);
+                e.setGender("未知");
+                if (StringUtils.isEmpty(e.getGender())) {
+                    e.setGender(e.getGender().equals("1") ? "男" : e.getGender().equals("2") ? "女" : "未知");
+                }
+                BeanUtils.copyProperties(e,rent);
+                list.add(rent);
+            });
+            excelWriter.write(list, writeSheet);
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }
+    }
+
     /**
      * 保存对象
      * @param searchHouseDTO 实体对象

src/main/java/com/yunzhi/marketing/xlk/controller/TrendController.java

@@ -7,6 +7,7 @@ import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.dto.TrendDTO;
 import com.yunzhi.marketing.xlk.entity.Trend;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
 import com.yunzhi.marketing.xlk.service.ITrendService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,6 +45,8 @@ public class TrendController extends BaseController {
     @Autowired
     public ITrendService iTrendService;
 
+    @Autowired
+    private ISceneLogService iSceneLogService;
 
     /**
      * 分页查询列表
@@ -93,6 +96,7 @@ public class TrendController extends BaseController {
             trend.setOrgId(getOrgId(request));
             trend.setCreateDate(LocalDateTime.now());
             if (iTrendService.save(trend)){
+                iSceneLogService.saveLogs(getUserId(request),"trend",trend.getBuildingId());
                 responseBean.addSuccess(trend);
             }else {
                 responseBean.addError("fail");
@@ -116,6 +120,8 @@ public class TrendController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             if(iTrendService.removeById(id)){
+                Trend trend = iTrendService.getById(id);
+                iSceneLogService.saveLogs(getUserId(request),"trend",trend.getBuildingId());
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");
@@ -144,6 +150,7 @@ public class TrendController extends BaseController {
             BeanUtils.copyProperties(trendDTO,trend);
             trend.setTrendId(id);
             if (iTrendService.updateById(trend)){
+                iSceneLogService.saveLogs(getUserId(request),"trend",trend.getBuildingId());
                 responseBean.addSuccess(trend);
             }else {
                 responseBean.addError("fail");

src/main/java/com/yunzhi/marketing/xlk/controller/VideoController.java

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.TaBuilding;
+import com.yunzhi.marketing.entity.TaLiveActivity;
 import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.service.ITaBuildingService;
 import com.yunzhi.marketing.xlk.dto.SearchHouseDTO;
@@ -75,7 +77,7 @@ public class VideoController extends BaseController {
             //使用分页插件
 		    IPage<Video> pg = new Page<>(pageNum, pageSize);
             LambdaQueryWrapper<Video> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(!StringUtils.isEmpty(name),Video::getName,name);
+            queryWrapper.like(!StringUtils.isEmpty(name),Video::getName, "%" + name + "%");
             queryWrapper.eq(Video::getOrgId,getOrgId(request));
             queryWrapper.in(Video::getInstitutionId,getInstitutionIds(request));
             queryWrapper.orderByDesc(Video::getWeight);
@@ -178,6 +180,34 @@ public class VideoController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 推首页
+     *
+     * @param id             实体ID
+     * @return
+     */
+    @RequestMapping(value = "/admin/home/video/{id}", method = RequestMethod.PUT)
+    public ResponseBean taLiveActivityHome(@PathVariable String id,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Video video = iVideoService.getById(id);
+            if (CommConstant.NOT_PUBLISH.equals(video.getIsHome())) {
+                video.setIsHome(CommConstant.IS_PUBLISH);
+            }else if (CommConstant.IS_PUBLISH.equals(video.getIsHome())) {
+                video.setIsHome(CommConstant.NOT_PUBLISH);
+            }
+            video.setUpdatedTime(LocalDateTime.now());
+            video.setUpdatedBy(getUserId(request).toString());
+            iVideoService.updateById(video);
+            responseBean.addSuccess(video);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taLiveActivityUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 根据id查询对象
      * @param id  实体ID

src/main/java/com/yunzhi/marketing/xlk/entity/CustomerPreparatory.java

@@ -91,4 +91,6 @@ public class CustomerPreparatory implements Serializable {
      * 渠道ID
      */
     private Integer channelId;
+
+    private String channelCustomerId;
 }

src/main/java/com/yunzhi/marketing/xlk/entity/CustomerSignatory.java

@@ -114,4 +114,6 @@ public class CustomerSignatory implements Serializable {
     private LocalDateTime successDate ;
     /** 类型 */
     private String type ;
+
+    private String channelCustomerId;
 }

src/main/java/com/yunzhi/marketing/xlk/entity/CustomerVisit.java

@@ -93,4 +93,6 @@ public class CustomerVisit implements Serializable {
     private Integer channelId;
 
     private LocalDateTime visitDate;
+
+    private String channelCustomerId;
 }

src/main/java/com/yunzhi/marketing/xlk/entity/SceneLog.java

@@ -0,0 +1,66 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 业务日志记录表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_scene_log")
+public class SceneLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 组织结构id
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+
+    /**
+     * 日志类型
+     */
+    private String type;
+
+    /**
+     * 日志主键
+     */
+    private String uuid;
+
+    /**
+     * 更新人
+     */
+    private String updateId;
+
+    /**
+     * 更新人姓名
+     */
+    private String updateName;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新内容
+     */
+    private String content;
+
+
+}

src/main/java/com/yunzhi/marketing/xlk/entity/Video.java

@@ -97,6 +97,11 @@ public class Video implements Serializable {
      */
     private String remark;
 
+    /**
+     * 是否推首页
+     */
+    private Integer isHome;
+
     /**
      * 视频地址
      */

src/main/java/com/yunzhi/marketing/xlk/mapper/CustomerSignatoryMapper.java

@@ -1,8 +1,11 @@
 package com.yunzhi.marketing.xlk.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.xlk.entity.CustomerSignatory;
+import com.yunzhi.marketing.xlk.vo.CustomerSignatoryVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +18,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface CustomerSignatoryMapper extends BaseMapper<CustomerSignatory> {
 
+    IPage<CustomerSignatoryVO> getCustomerSignatoryList(IPage<CustomerSignatoryVO> pg, @Param("buildingId") String buildingId,@Param("name") String name,
+                                                        @Param("phone") String phone,@Param("type") String type, @Param("orgId") Integer orgId);
 }

src/main/java/com/yunzhi/marketing/xlk/mapper/SceneLogMapper.java

@@ -0,0 +1,28 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.entity.TaBuilding;
+import com.yunzhi.marketing.entity.TaPersonBuilding;
+import com.yunzhi.marketing.xlk.entity.SceneLog;
+import com.yunzhi.marketing.xlk.vo.BuildingLogVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 业务日志记录表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-10-08
+ */
+@Mapper
+public interface SceneLogMapper extends BaseMapper<SceneLog> {
+
+    IPage<BuildingLogVO> getBuildingLogs(Page<BuildingLogVO> page, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> taPersonBuildingList, @Param("institutionIds") List<String> institutionIds);
+}

src/main/java/com/yunzhi/marketing/xlk/mapper/SearchHouseMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.xlk.entity.SearchHouse;
+import com.yunzhi.marketing.xlk.vo.ExportSearchHouseVO;
 import com.yunzhi.marketing.xlk.vo.SearchHouseVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -33,4 +34,6 @@ public interface SearchHouseMapper extends BaseMapper<SearchHouse> {
                                            @Param("minPrice") Integer minPrice,
                                            @Param("maxPrice") Integer maxPrice,
                                            @Param("limit") Integer limit);
+
+    List<ExportSearchHouseVO> selectExportHouseList(@Param("params") SearchHouseVO searchHouse);
 }

src/main/java/com/yunzhi/marketing/xlk/service/ICustomerSignatoryService.java

@@ -1,7 +1,9 @@
 package com.yunzhi.marketing.xlk.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.marketing.xlk.entity.CustomerSignatory;
+import com.yunzhi.marketing.xlk.vo.CustomerSignatoryVO;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.yunzhi.marketing.xlk.entity.CustomerSignatory;
  */
 public interface ICustomerSignatoryService extends IService<CustomerSignatory> {
 
+    IPage<CustomerSignatoryVO> getCustomerSignatoryList(IPage<CustomerSignatoryVO> pg, String buildingId, String name, String phone, String type, Integer orgId);
 }

src/main/java/com/yunzhi/marketing/xlk/service/ISceneLogService.java

@@ -0,0 +1,23 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.entity.TaPersonBuilding;
+import com.yunzhi.marketing.xlk.entity.SceneLog;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 业务日志记录表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-10-08
+ */
+public interface ISceneLogService extends IService<SceneLog> {
+
+    void saveLogs(Integer userId, String type, String uuid);
+
+    ResponseBean getBuildingLogs(Integer pageNum, Integer pageSize, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId, List<String> institutionIds);
+}

src/main/java/com/yunzhi/marketing/xlk/service/ISearchHouseService.java

@@ -6,6 +6,7 @@ import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.xlk.dto.SearchHouseDTO;
 import com.yunzhi.marketing.xlk.entity.SearchHouse;
+import com.yunzhi.marketing.xlk.vo.ExportSearchHouseVO;
 import com.yunzhi.marketing.xlk.vo.SearchHouseVO;
 
 import java.util.List;
@@ -37,4 +38,11 @@ public interface ISearchHouseService extends IService<SearchHouse> {
      * @return
      */
     List<TaBuilding> getRecommendBuildings(Integer orgId, SearchHouseDTO searchHouseDTO);
+
+    /**
+     * 获取导出的数据集合
+     * @param searchHouse
+     * @return
+     */
+    List<ExportSearchHouseVO> selectExportHouseList(SearchHouseVO searchHouse);
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/ChannelCustomerServiceImpl.java

@@ -155,6 +155,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
 
 
         customerVisit.setCreateDate(LocalDateTime.now());
+        customerVisit.setChannelCustomerId(channelCustomerDTO.getChannelCustomerId());
         customerVisitMapper.insert(customerVisit);
 
         return ResponseBean.success("审核成功");
@@ -242,6 +243,8 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 recommendCustomer.setCirculationTime(LocalDateTime.now());
                 recommendCustomer.setName(customerVisit.getName());
                 taRecommendCustomerMapper.updateById(recommendCustomer);
+            }else {
+                return ResponseBean.error("该客户已到访", ResponseBean.ERROR_UNAVAILABLE);
             }
         }else if ("customer".equals(params.getType())) {
             // 置业顾问 经纪人推荐的客户
@@ -340,8 +343,10 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
      */
     @Override
     public ResponseBean preparatoryCustomer(MarkingPreparatoryCustomerDTO params) {
+        CustomerPreparatory customerPreparatory = params.getCustomerPreparatory();
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(params.getCustomerId());
         taRecommendCustomer.setStatus(CommConstant.CUSTOMER_PREPARATORY);
+        taRecommendCustomer.setRealtyConsultant(customerPreparatory.getRealtyConsultant());
         taRecommendCustomerMapper.updateById(taRecommendCustomer);
 
         LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -352,7 +357,6 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             channelCustomerMapper.updateById(customer);
         }
 
-        CustomerPreparatory customerPreparatory = params.getCustomerPreparatory();
         customerPreparatory.setCreateDate(LocalDateTime.now());
         customerPreparatory.setBuildingId(taRecommendCustomer.getBuildingId());
         customerPreparatory.setRecommendPerson(taRecommendCustomer.getRecommendPerson());
@@ -387,6 +391,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         CustomerSignatory customerSignatory = params.getCustomerSignatory();
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(params.getCustomerId());
         taRecommendCustomer.setStatus(CommConstant.CUSTOMER_COMMISSION);
+        taRecommendCustomer.setRealtyConsultant(customerSignatory.getRealtyConsultant());
         taRecommendCustomerMapper.updateById(taRecommendCustomer);
 
         LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();

src/main/java/com/yunzhi/marketing/xlk/service/impl/CustomerInfoServiceImpl.java

@@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.drainage.entity.TaDrainage;
+import com.yunzhi.marketing.drainage.mapper.TaDrainageMapper;
 import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.mapper.*;
 import com.yunzhi.marketing.service.IMiniAppService;
 import com.yunzhi.marketing.xlk.entity.CustomerInfo;
+import com.yunzhi.marketing.xlk.entity.Video;
 import com.yunzhi.marketing.xlk.mapper.CustomerInfoMapper;
+import com.yunzhi.marketing.xlk.mapper.VideoMapper;
 import com.yunzhi.marketing.xlk.service.ICustomerInfoService;
 import com.yunzhi.marketing.xlk.vo.CustomerInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +50,19 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
     @Autowired
     private TaBuildingDynamicMapper taBuildingDynamicMapper;
 
+    @Autowired
+    private TaLiveActivityMapper taLiveActivityMapper;
+
+    @Autowired
+    private VideoMapper videoMapper;
+
+    @Autowired
+    private TaNewsMapper taNewsMapper;
+
+    @Autowired
+    private TaDrainageMapper taDrainageMapper;
+
+
     /**
      * 获取其他信息
      *
@@ -65,14 +81,45 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
         if (!StringUtils.isEmpty(personId)) {
             List<TaPersonVisitRecord> records = taPersonVisitRecordMapper.visitRecordByPersonIdNew(personId);
             records.forEach(e -> {
+                if (StringUtils.isEmpty(e.getTargetId())){
+                    return;
+                }
                 //获取活动标题
-                if ("activity".equals(e.getEventType()) && null != e.getTargetId()) {
+                if ("activity".equals(e.getEventType()) || "house".equals(e.getEventType()) || "dymic".equals(e.getEventType()) || "look".equals(e.getEventType())) {
                     TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
                     if (null != taBuildingDynamic) {
                         e.setActivityName(taBuildingDynamic.getTitle());
                     }
 
                 }
+                //获取拼团标题
+                if ("live".equals(e.getEventType()) && null != e.getTargetId()) {
+                    TaLiveActivity taLiveActivity = taLiveActivityMapper.selectById(e.getTargetId());
+                    if (null != taLiveActivity) {
+                        e.setActivityName(taLiveActivity.getLiveActivityTitle());
+                    }
+                }
+                //获取助力标题
+                if ("video".equals(e.getEventType()) && null != e.getTargetId()) {
+                    Video video = videoMapper.selectById(e.getTargetId());
+                    if (null != video) {
+                        e.setActivityName(video.getName());
+                    }
+                }
+                //获取咨询标题
+                if ("news".equals(e.getEventType()) && null != e.getTargetId()) {
+                    TaNews taNews = taNewsMapper.selectById(e.getTargetId());
+                    if (null != taNews) {
+                        e.setActivityName(taNews.getNewsName());
+                    }
+                }
+                //获取H5活动标题
+                if ("h5".equals(e.getEventType()) && null != e.getTargetId()) {
+                    TaDrainage taDrainage = taDrainageMapper.selectById(e.getTargetId());
+                    if (null != taDrainage) {
+                        e.setActivityName(taDrainage.getName());
+                    }
+                }
             });
             customerInfoVO.setPersonVisitRecords(records);
             customerInfoVO.setVisitTimes(records.size());

src/main/java/com/yunzhi/marketing/xlk/service/impl/CustomerSignatoryServiceImpl.java

@@ -1,9 +1,11 @@
 package com.yunzhi.marketing.xlk.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.xlk.entity.CustomerSignatory;
 import com.yunzhi.marketing.xlk.mapper.CustomerSignatoryMapper;
 import com.yunzhi.marketing.xlk.service.ICustomerSignatoryService;
+import com.yunzhi.marketing.xlk.vo.CustomerSignatoryVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +19,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class CustomerSignatoryServiceImpl extends ServiceImpl<CustomerSignatoryMapper, CustomerSignatory> implements ICustomerSignatoryService {
 
+    @Override
+    public IPage<CustomerSignatoryVO> getCustomerSignatoryList(IPage<CustomerSignatoryVO> pg, String buildingId, String name, String phone, String type, Integer orgId) {
+        return this.baseMapper.getCustomerSignatoryList(pg,buildingId,name,phone,type,orgId);
+    }
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/IPcStatisticsServiceimpl.java

@@ -88,6 +88,15 @@ public class IPcStatisticsServiceimpl implements IPcStatisticsService {
         PcStatisticsDTO statisticsDTO = new PcStatisticsDTO();
         statisticsDTO.setOrgId(taUser.getOrgId());
         PcStatisticsVO userOriginStatistics = pcStatisticsMapper.getUserOriginStatistics(statisticsDTO);
+        if (null == userOriginStatistics.getConsultantNum()){
+            userOriginStatistics.setConsultantNum(0);
+        }
+        if (null == userOriginStatistics.getCustomerNum()){
+            userOriginStatistics.setCustomerNum(0);
+        }
+        if (null == userOriginStatistics.getEstageNum()){
+            userOriginStatistics.setEstageNum(0);
+        }
         Integer otherNum = userOriginStatistics.getAllPersonNum() - userOriginStatistics.getConsultantNum() - userOriginStatistics.getCustomerNum() -userOriginStatistics.getEstageNum();
         userOriginStatistics.setOrherNum(otherNum);
         return ResponseBean.success(userOriginStatistics);

src/main/java/com/yunzhi/marketing/xlk/service/impl/InstitutionServiceImpl.java

@@ -74,7 +74,7 @@ public class InstitutionServiceImpl extends ServiceImpl<InstitutionMapper, Insti
     public ResponseBean deleteByinstitutionCode(String id) {
         Institution institution = institutionMapper.selectById(id);
         LambdaQueryWrapper<Institution> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.likeLeft(Institution::getInstitutionCode,institution.getInstitutionCode());
+        queryWrapper.likeRight(Institution::getInstitutionCode,institution.getInstitutionCode());
         List<Institution> institutions = institutionMapper.selectList(queryWrapper);
         if (institutions.size() > 1) {
             return ResponseBean.error("请先删除子公司", ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/yunzhi/marketing/xlk/service/impl/SceneLogServiceImpl.java

@@ -0,0 +1,54 @@
+package com.yunzhi.marketing.xlk.service.impl;
+
+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.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.center.taUser.mapper.TaUserMapper;
+import com.yunzhi.marketing.entity.TaBuilding;
+import com.yunzhi.marketing.entity.TaPersonBuilding;
+import com.yunzhi.marketing.xlk.entity.SceneLog;
+import com.yunzhi.marketing.xlk.mapper.SceneLogMapper;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
+import com.yunzhi.marketing.xlk.vo.BuildingLogVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 业务日志记录表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-10-08
+ */
+@Service
+public class SceneLogServiceImpl extends ServiceImpl<SceneLogMapper, SceneLog> implements ISceneLogService {
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Override
+    public void saveLogs(Integer userId, String type, String uuid) {
+        TaUser taUser = taUserMapper.selectById(userId);
+        SceneLog sceneLog = new SceneLog();
+        sceneLog.setType(type);
+        sceneLog.setUuid(uuid);
+        sceneLog.setUpdateId(String.valueOf(userId));
+        sceneLog.setUpdateName(taUser.getUserName());
+        sceneLog.setUpdateTime(LocalDateTime.now());
+        this.baseMapper.insert(sceneLog);
+    }
+
+    @Override
+    public ResponseBean getBuildingLogs(Integer pageNum, Integer pageSize, String buildingId, List<TaPersonBuilding> taPersonBuildingList, List<String> InstitutionIds) {
+        Page<BuildingLogVO> page = new Page<>(pageNum, pageSize);
+        IPage<BuildingLogVO> buildings = this.baseMapper.getBuildingLogs(page, buildingId, taPersonBuildingList, InstitutionIds);
+        return ResponseBean.success(buildings);
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/service/impl/SearchHouseServiceImpl.java

@@ -1,5 +1,8 @@
 package com.yunzhi.marketing.xlk.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.base.ResponseBean;
@@ -12,11 +15,15 @@ import com.yunzhi.marketing.xlk.dto.SearchHouseDTO;
 import com.yunzhi.marketing.xlk.entity.SearchHouse;
 import com.yunzhi.marketing.xlk.mapper.SearchHouseMapper;
 import com.yunzhi.marketing.xlk.service.ISearchHouseService;
+import com.yunzhi.marketing.xlk.vo.ExportSearchHouseVO;
+import com.yunzhi.marketing.xlk.vo.QuestionnaireVO;
 import com.yunzhi.marketing.xlk.vo.SearchHouseVO;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.List;
 
 /**
@@ -117,6 +124,66 @@ public class SearchHouseServiceImpl extends ServiceImpl<SearchHouseMapper, Searc
         return searchHouseMapper.getRecommendBuildings(orgId, cityId, null, minPriceW, maxPriceW, minPrice, maxPrice, limit);
     }
 
+    /**
+     * 获取导出的数据集合
+     *
+     * @param searchHouse
+     * @return
+     */
+    @Override
+    public List<ExportSearchHouseVO> selectExportHouseList(SearchHouseVO searchHouse) {
+        List<ExportSearchHouseVO> searchHouseVOS = searchHouseMapper.selectExportHouseList(searchHouse);
+        searchHouseVOS.forEach(e -> {
+            String questionnaire = e.getQuestionnaire();
+            List<QuestionnaireVO> questionnaireVO = JSON.parseArray(questionnaire,QuestionnaireVO.class);
+            questionnaireVO.forEach(s -> {
+                try {
+                    Field declaredField = e.getClass().getDeclaredField(s.getKey());
+                    String name = declaredField.getName();
+                    String subName = name.substring(0, 1).toUpperCase() + name.substring(1);
+                    Method method = e.getClass().getMethod("set" + subName,String.class);
+                    String result = String.valueOf(s.getResult());
+                    String type = s.getType();
+                    String resultId = null == s.getResultId() ? null : String.valueOf(s.getResultId());
+                    if (searchHouse.getType() == 4) {
+                        if (name == "maxPrice"){
+                            Integer price = Integer.valueOf(result) / 10000;
+                            result = String.valueOf(price);
+                        }
+                    }else if (searchHouse.getType() == 1) {
+                        if (name == "maxPrice"){
+                            Integer price = Integer.valueOf(result) / 10000;
+                            result = String.valueOf(price);
+                        }
+                        if (type == "checkbox") {
+                            result = resultId;
+                        }
+                        if (type == "checkboxs") {
+                            JSONArray optionArr = JSONArray.parseArray(String.valueOf(s.getOptions()));
+                        }
+                    }else if (searchHouse.getType() == 3) {
+                        if (name == "maxPrice"){
+                            Integer price = Integer.valueOf(result) / 10000;
+                            result = String.valueOf(price);
+                        }
+                        if (type == "checkbox") {
+                            result = resultId;
+                        }
+                    }
+                    if ("purpose".equals(name)|| "advantage".equals(name)|| "facility".equals(name)|| "important".equals(name)||
+                    "style".equals(name)|| "mostImportant".equals(name)|| "special".equals(name)) {
+                        result = result.replace("[","").replace("]","");
+                    }
+                    method.invoke(e,result);
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                }
+            });
+
+        });
+        return searchHouseVOS;
+    }
+
     private Integer[] getUnitPriceRange(Integer minPriceW, Integer maxPriceW, Integer areaResultId) {
         long minPrice = minPriceW * 10000;
         long maxPrice = maxPriceW * 10000;

src/main/java/com/yunzhi/marketing/xlk/vo/BuildingLogVO.java

@@ -0,0 +1,41 @@
+package com.yunzhi.marketing.xlk.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class BuildingLogVO {
+
+    /**
+     * 组织结构id
+     */
+    private String id;
+
+    /**
+     * 更新人
+     */
+    private String updateId;
+
+    /**
+     * 更新人姓名
+     */
+    private String updateName;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 楼盘名称
+     */
+    private String buildingName;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+}

src/main/java/com/yunzhi/marketing/xlk/vo/CustomerSignatoryVO.java

@@ -0,0 +1,101 @@
+package com.yunzhi.marketing.xlk.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yunzhi.marketing.entity.TaBuildingApartment;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 客户签约单 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-30
+ */
+@Data
+public class CustomerSignatoryVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String customerSignatoryId;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 客户姓名
+     */
+    private String name;
+
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 业绩分成人
+     */
+    private String dividendsName;
+
+    /**
+     * 比例
+     */
+    private String proportion;
+
+    /**
+     * 户型
+     */
+    private String houseType;
+    /**
+     * 户型
+     */
+    private String houseTypeName;
+
+    /** 房屋信息 */
+    private String houseInfo;
+
+    /**
+     * 金额
+     */
+    private String price;
+
+
+    /** 类型 */
+    private String type ;
+
+    private String picture;
+
+    private String  sex;
+    private String  phone;
+    private String  buildingName;
+
+    private String recommendName;
+    private String recommendTel;
+    private String realtyConsultantName;
+    private String realtyConsultantTel;
+}

src/main/java/com/yunzhi/marketing/xlk/vo/ExportSearchHouseVO.java

@@ -0,0 +1,196 @@
+package com.yunzhi.marketing.xlk.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yunzhi.marketing.entity.TaBuilding;
+import com.yunzhi.marketing.xlk.entity.SearchHouse;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 帮我找房 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_search_house")
+public class ExportSearchHouseVO implements Serializable {
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+
+    /**
+     * 创建人小程序人员
+     */
+    private String personId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CREATED_TIME")
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    @TableField("UPDATED_BY")
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField("UPDATED_TIME")
+    private LocalDateTime updatedTime;
+
+    /**
+     * 公司id
+     */
+    @TableField("ORG_ID")
+    private Integer orgId;
+
+    /**
+     * 意向区域
+     */
+    private String intentArea;
+
+    /**
+     * 总预算范围最小价格
+     */
+    private String minPrice;
+
+    /**
+     * 总预算范围最大价格
+     */
+    private String maxPrice;
+
+
+    /**
+     * 0待回访，1已回访，2无效
+     */
+    private String status;
+
+    /**
+     * 审核结果
+     */
+    private String auditRemark;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 问卷json字符串
+     */
+    private String questionnaire;
+
+    private String avatarurl;
+
+    private String nickname;
+
+    private String phone;
+
+    private String gender;
+
+    private String name;
+
+    /**
+     * 房屋现状
+     */
+    private String houseStatus;
+
+    /**
+     * 房屋面积
+     */
+    private String area;
+
+    /**
+     * 家装模式
+     */
+    private String type;
+
+    /**
+     * 家装侧重点
+     */
+    private String important;
+    /**
+     * 家装风格
+     */
+    private String style;
+    /**
+     * 关键诉求
+     */
+    private String mostImportant;
+
+    /**
+     * 特殊功能区
+     */
+    private String special;
+
+    /**
+     * 是否智能家居
+     */
+    private String samrt;
+
+    /**
+     * 房屋类型
+     */
+    private String isNew;
+
+    /**
+     * 意向居室
+     */
+    private String layout;
+
+    /***
+     * 购房目的
+     */
+    private String purpose;
+
+    /**
+     * 侧重优势
+     */
+    private String advantage;
+
+    /**
+     * 社区要求
+     */
+    private String facility;
+
+    /**
+     * 朝向要求
+     */
+    private String orientation;
+
+    /**
+     * 楼层要求
+     */
+    private String isHigh;
+
+    /**
+     * 楼龄要求
+     */
+    private String buildingAge;
+
+    /**
+     * 租房偏好
+     */
+    private String preference;
+
+
+}

src/main/java/com/yunzhi/marketing/xlk/vo/QuestionnaireVO.java

@@ -0,0 +1,17 @@
+package com.yunzhi.marketing.xlk.vo;
+
+import lombok.Data;
+
+@Data
+public class QuestionnaireVO {
+
+    private String key;
+
+    private String type;
+
+    private Object result;
+
+    private Object resultId;
+
+    private Object options;
+}

src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
   datasource:
     username: marketing
     password: u@cSFJ5*kS9hGP7a
-    url: jdbc:mysql://localhost:3306/marketing-cloud?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://210.13.107.60:3306/marketing-cloud?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数
@@ -14,8 +14,8 @@ spring:
     max-idle: 8 # 最大空闲数
   servlet:
     multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
+      max-file-size: 1024MB
+      max-request-size: 4096MB
 
 #日志配置
 logging:

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -46,7 +46,8 @@
             and tbd.org_id = #{orgId}
         </if>
         <if test="time != null">
-            and TO_DAYS(tbd.create_date) = TO_DAYS(#{time})
+            and TO_DAYS(tbd.start_date) &lt;= TO_DAYS(#{time})
+            and TO_DAYS(tbd.end_date) &gt;= TO_DAYS(#{time})
         </if>
         <if test="institutionIds != null and institutionIds.size > 0">
             AND tbd.institution_id in

src/main/resources/mapper/TaChannelMapper.xml

@@ -163,14 +163,12 @@
         WHERE
         t.`event` in ( 'detail', 'house_list' , 'poster')
         AND t.event_type IN (
-        'activity',
-        'help',
-        'group',
-        'h5',
-        'news',
-        'building',
+        'dymic',
+        'house',
+        'look',
         'live',
-        'house'
+        'news',
+        'building'
         )
         <if test="targetId != null and targetId != ''">
             and t.target_id = #{targetId}
@@ -225,14 +223,12 @@
         WHERE
         t.`event` in ( 'detail', 'house_list' , 'poster')
         AND t.event_type IN (
-        'activity',
-        'help',
-        'group',
-        'h5',
-        'news',
-        'building',
+        'dymic',
+        'house',
+        'look',
         'live',
-        'house'
+        'news',
+        'building'
         )
         AND t.org_id = #{orgId}
         AND DATE_FORMAT(t.visit_time, '%Y-%m-%d' ) >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
@@ -359,14 +355,12 @@
         WHERE
         t.`event` in ( 'detail', 'house_list', 'poster' )
         AND t.event_type IN (
-        'activity',
-        'help',
-        'group',
-        'h5',
-        'news',
-        'building',
+        'dymic',
+        'house',
+        'look',
         'live',
-        'house'
+        'news',
+        'building'
         )
         <if test="targetId != null and targetId != ''">
             and t.target_id = #{targetId}
@@ -421,14 +415,12 @@
         WHERE
         t.`event` in ( 'detail', 'house_list', 'poster' )
         AND t.event_type IN (
-        'activity',
-        'help',
-        'group',
-        'h5',
-        'news',
-        'building',
+        'dymic',
+        'house',
+        'look',
         'live',
-        'house'
+        'news',
+        'building'
         )
         AND t.org_id = #{orgId}
         AND DATE_FORMAT( t.visit_time, '%Y-%m-%d' ) >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -106,6 +106,9 @@
         <if test="newHouse">
             and t.is_new_house = #{newHouse}
         </if>
+        <if test="isHome">
+            and t.is_home = #{isHome}
+        </if>
     UNION
         SELECT
             t.video_id as id,
@@ -134,10 +137,20 @@
         <if test="newHouse">
             and t.is_new_house = #{newHouse}
         </if>
+        <if test="isHome">
+            and t.is_home = #{isHome}
+        </if>
     </select>
-    <select id="getWxPureLiveActivityList" resultType="com.yunzhi.marketing.entity.TaLiveActivity">
+    <select id="getWxPureLiveActivityList" resultType="com.yunzhi.marketing.po.LiveAndVideoVO">
         SELECT
-         t.*
+            t.live_activity_id as id,
+            t.live_activity_title AS title,
+            t.live_start_date AS start_time,
+            t.live_end_date AS end_time,
+            IFNULL(t.list_img, t.detail_img) as images,
+            a.building_name,
+            b.NAME AS city_name,
+            "live" as type
         FROM
         ta_live_activity t
         LEFT JOIN ta_building a ON t.building_id = a.building_id
@@ -154,10 +167,10 @@
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
-        <if test="process = 1">
+        <if test="process == 1">
             and t.live_start_date &gt; now()
         </if>
-        <if test="process = 2">
+        <if test="process == 2">
             and t.live_start_date &lt; now()
             and t.live_end_date &gt; now()
         </if>

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -23,6 +23,7 @@
         FROM
             ta_person_intention_record tpir
             LEFT JOIN ta_person tp on tpir.person_id = tp.person_id
+            Left join ta_building tb on tpir.building_id = tb.building_id
             <trim prefix="where" prefixOverrides="and | or">
                 <if test="buildingId != null and buildingId != ''">
                     tpir.building_id = #{buildingId}
@@ -37,6 +38,12 @@
                         #{personBuilding.buildingId}
                     </foreach>
                 </if>
+                <if test="institutionIds != null and institutionIds.size > 0">
+                    AND tb.institution_id in
+                    <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
             </trim>
         GROUP BY
             tpir.person_id, tpir.building_id

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -1,455 +1,459 @@
-<?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.yunzhi.marketing.mapper.TaPersonVisitRecordMapper">
-
-    <sql id="columnSql">
-        <trim suffixOverrides=",">
-            t.record_id,
-            t.person_id,
-            c.person_type,
-            t.visit_time,
-            t.leave_time,
-            t.visit_duration,
-            t.event,
-            t.data,
-            t.activity,
-            t.org_id,
-            t.building_id,
-            t.event_type,
-            t.target_id,
-            t.consultant_id,
-            t.share_person_id,
-        </trim>
-    </sql>
-
-    <select id="visitRecordByPersonId" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
-        select
-            t.* ,
-            b.parent_type_id from ta_person_visit_record t
-        left join td_biz_event_type b on t.event_type = b.type_id
-        where t.person_id = #{personId}
-        <if test="personBuildingList != null and personBuildingList.size > 0">
-            AND (b.parent_type_id = 'public' or t.building_id in
-            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
-                #{personBuilding.buildingId}
-            </foreach>
-            )
-        </if>
-        <if test="buildingId != null and buildingId != ''">
-            AND (b.parent_type_id = 'public' or t.building_id = #{buildingId} )
-        </if>
-        order by t.visit_time desc
-    </select>
-
-    <select id="visitRecordByPersonIdNew" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
-        select
-        t.* ,
-        b.parent_type_id from ta_person_visit_record t
-        left join td_biz_event_type b on t.event_type = b.type_id
-        where t.person_id = #{personId}
-        order by t.visit_time desc
-    </select>
-
-    <select id="selectAll" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
-        SELECT
-            tpvr.record_id as recordId,
-            tpvr.person_id as personId,
-            tpvr.person_type as personType,
-            tpvr.building_id as buildingId,
-            tpvr.activity as activity,
-            tpvr.event as event,
-            tpvr.event_type as eventType,
-            tpvr.visit_duration as visitDuration,
-            (SELECT MIN(t.visit_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event and t.org_id = #{orgId} ) as visitTime,
-            (SELECT MAX(t.leave_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event and t.org_id = #{orgId} ) as leaveTime,
-            ifnull(tp.name, tp.nickname) as userName,
-            tbe.event_name as eventName,
-            COUNT(1) as accessCount
-        FROM
-            ta_person_visit_record tpvr
-            LEFT JOIN ta_person tp ON tpvr.person_id = tp.person_id
-            LEFT JOIN td_biz_event tbe on tpvr.event = tbe.event_code
-            <trim prefix="where" prefixOverrides="and | or">
-                tpvr.org_id = #{orgId}
-                and tp.org_id = #{orgId}
-                <if test="startDate != null and endDate != null">
-                    and tpvr.visit_time between #{startDate} and #{endDate}
-                </if>
-                <if test="buildingId != null and buildingId != ''">
-                    and tpvr.building_id = #{buildingId}
-                </if>
-                <if test="eventType != null and eventType != ''">
-                    and tpvr.event_type = #{eventType}
-                </if>
-                <if test="event != null and event != ''">
-                    and tpvr.event = #{event}
-                </if>
-                <if test="activity != null and activity != ''">
-                    and tpvr.activity = #{activity}
-                </if>
-            </trim>
-
-        GROUP BY tpvr.person_id, tpvr.event
-        ORDER BY 	accessCount DESC,tpvr.visit_time DESC
-    </select>
-    <select id="getPersonVisitRecordList" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
-        SELECT
-            t.*,
-            b.building_name
-        FROM
-            ta_person_visit_record t
-            LEFT JOIN ta_building b ON t.building_id = b.building_id
-        WHERE
-            t.person_id = #{personId}
-        ORDER BY
-            t.visit_time DESC
-    </select>
-
-    <select id="getDurationByPersonId" resultType="java.lang.Integer">
-        select SUM(visit_duration) from ta_person_visit_record where person_id = #{personId}
-    </select>
-
-    <select id="getFirstVisitTimeByPersonId" resultType="java.time.LocalDateTime">
-        select visit_time from ta_person_visit_record where person_id = #{personId} order by visit_time asc limit 1
-    </select>
-    <select id="getWxVisitRecordList" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
-        SELECT
-            t.* ,
-	        p.`name` as user_name,
-	        p.`nickname` as nickname,
-	        p.avatarurl,
-	        d.name as activity_name,
-	        d.create_date
-        FROM
-            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and event_type = #{eventType} AND consultant_id = #{userId} and person_id != #{personId} ORDER BY visit_time DESC LIMIT 999) t
-            left JOIN ta_person p on t.person_id = p.person_id
-            LEFT join ta_drainage d on t.target_id = d.drainage_id
-        GROUP BY
-            t.person_id
-        ORDER BY
-	        t.visit_time DESC
-    </select>
-
-    <select id="getWxActivityVisitRecordList" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
-        SELECT
-            t.share_from_id, t.share_person as consultant_id, t.share_person_type, t.person_id, t.target_type, t.target_id, t.create_date as visit_time, t.org_id ,t.building_id, t.status, t.is_first_time,
-	        p.`name` as user_name,
-	        p.`nickname` as nickname,
-	        p.avatarurl
-        FROM
-            ( SELECT * FROM ta_share_person_from WHERE org_id = #{orgId} and target_id = #{targetId} AND (share_person = #{userId} or share_person = #{personId}) and target_type = #{eventType} ORDER BY create_date DESC LIMIT 999) t
-            left JOIN ta_person p on t.person_id = p.person_id
-            where t.person_id != #{personId}
-        GROUP BY
-            t.person_id
-        ORDER BY
-	        t.create_date DESC
-    </select>
-
-
-    <select id="getWxVisitRecordActivityList" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
-            SELECT
-                t.*,
-                d.NAME AS activity_name,
-                d.create_date
-            FROM
-                ( SELECT * FROM ta_person_visit_record WHERE event_type = #{eventType} AND consultant_id = #{userId} AND person_id = #{personId} ORDER BY visit_time DESC ) t
-                LEFT JOIN ta_drainage d ON t.target_id = d.drainage_id
-            GROUP BY
-                t.target_id
-            ORDER BY
-	            t.visit_time DESC
-    </select>
-
-    <select id="getDrainageVisitRecord" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
-        select * from (
-            select
-            t.share_person as share_person_id,
-            t.person_id,
-            c.person_type,
-            t.create_date as visit_time,
-            t.target_type as event_type,
-            t.target_id as target_id,
-            b.name as drainageName,
-            d.building_name as buildingName,
-            tn.news_name as newsName,
-            tha.title as helpActivityName,
-            tsa.activity_name as groupActivityName,
-            tbd.title as activityName,
-            b.drainage_id
-            from ta_share_person_from t
-            left join ta_drainage b on t.target_id = b.drainage_id
-            left join ta_building d on t.target_id = d.building_id
-            left join ta_news tn on t.target_id = tn.news_id
-            left join ta_help_activity tha on t.target_id = tha.help_activity_id
-            left join ta_share_activity tsa on t.target_id = tsa.group_activity_id
-            left join ta_building_dynamic tbd on t.target_id = tbd.dynamic_id
-            left join ta_person c on t.org_id = c.org_id and (t.share_person = c.person_id or t.share_person = c.user_id)
-            where t.org_id = #{orgId}
-            and t.target_type in ('h5_share','group_share','help_share','news_share','dynamic_share','building_share')
-            <if test="eventType !=null and eventType != ''">
-                and t.target_type = #{eventType}
-            </if>
-            <if test="activityName !=null and activityName != ''">
-                and (
-                (b.name like concat('%',#{activityName},'%') and t.target_type = 'h5_share')or (d.name like concat('%',#{activityName},'%') and t.target_type = 'building_share') or (tn.news_name like concat('%',#{activityName},'%') and t.target_type = 'news_share')
-                or (tha.title like concat( '%', #{activityName}, '%' ) and t.target_type = 'help_share')  or (tsa.activity_name like concat('%',#{activityName},'%') and t.target_type = 'group_share') or (tbd.title like concat('%',#{activityName},'%') and t.target_type = 'dynamic_share')
-                )
-            </if>
-            <if test="shareName !=null and shareName != ''">
-                and c.nickname like concat('%',#{shareName},'%')
-            </if>
-            <if test="shareTel !=null and shareTel != ''">
-                and c.phone = #{shareTel}
-            </if>
-            <if test="personType == 'Realty Consultant'">
-                and c.person_type = 'Realty Consultant'
-            </if>
-            <if test="personType == 'customer'">
-                and c.person_type != 'Realty Consultant'
-            </if>
-            <if test="buildingId !=null and buildingId != ''">
-                and d.building_id = #{buildingId}
-            </if>
-            <if test="personBuildingList != null and personBuildingList.size > 0">
-                AND d.building_id in
-                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
-                    #{personBuilding.buildingId}
-                </foreach>
-            </if>
-            order by t.create_date desc
-        ) t
-        group by t.person_id, t.target_id,t.event_type, t.share_person_id
-        order by t.visit_time desc
-    </select>
-
-    <select id="getConsultantShareInfoList" resultType="com.yunzhi.marketing.entity.TaConsultantInfo">
-        select * From (
-            select * from (
-                select
-                t.be_share as target_id,
-                a.url as activity_img,
-                a.building_name as activity_name,
-                a.building_name,
-                a.address,
-                a.price,
-                a.building_type_id,
-                t.tagert_type as eventType,
-				t.create_date as visit_time
-                from ta_share t
-                left join (select b.url, a.building_name,a.address,a.price,a.building_id,a.building_type_id from ta_building a left join ta_building_img b on a.building_id = b.building_id where b.img_type = 'list') a on t.be_share = a.building_id
-                where t.tagert_type = 'building'
-                and t.person_id = #{personId} order by t.create_date desc limit 9999
-            ) t
-            group by t.target_id
-
-        union all
-
-        select * from (
-        select
-        t.be_share as target_id,
-        b.list_img_url as activity_img,
-        b.title as activity_name,
-        '1' as price,
-        '2' as building_name,
-        '3' as address,
-        1 as building_type_id,
-        t.tagert_type as eventType,
-		t.create_date as visit_time
-        from ta_share t
-        left join ta_building_dynamic b on t.be_share = b.dynamic_id
-        where t.tagert_type = 'activity'
-        and t.person_id = #{personId} order by t.create_date desc limit 9999
-        ) t
-        group by t.target_id
-
-        union all
-
-        select * from (
-        select
-        t.be_share as target_id,
-        c.list_img as activity_img,
-        c.title as activity_name,
-        '1' as price,
-        '2' as building_name,
-        '3' as address,
-        1 as building_type_id,
-        t.tagert_type as eventType,
-		t.create_date as visit_time
-        from ta_share t
-        left join ta_help_activity c on t.be_share = c.help_activity_id
-        where t.tagert_type = 'help'
-        and t.person_id = #{personId} order by t.create_date desc limit 9999
-        ) t
-        group by t.target_id
-
-        union all
-
-        select * from (
-        select
-        t.be_share as target_id,
-        d.list_img as activity_img,
-        d.activity_name as activity_name,
-        '1' as price,
-        '2' as building_name,
-        '3' as address,
-        1 as building_type_id,
-        t.tagert_type as eventType,
-		t.create_date as visit_time
-        from ta_share t
-        left join ta_share_activity d on t.be_share = d.group_activity_id
-        where t.tagert_type = 'group'
-        and t.person_id = #{personId} order by t.create_date desc limit 9999
-        ) t
-		group by t.target_id
-
-        union all
-
-        select * from (
-        select
-        t.be_share as target_id,
-        e.news_img as activity_img,
-        e.news_name as activity_name,
-        '1' as price,
-        '2' as building_name,
-        '3' as address,
-        1 as building_type_id,
-        t.tagert_type as eventType,
-		t.create_date as visit_time
-        from ta_share t
-        left join ta_news e on t.be_share = e.news_id
-        where t.tagert_type = 'news'
-        and t.person_id = #{personId} order by t.create_date desc limit 9999
-        ) t
-        group by t.target_id
-
-        union all
-
-        select * from (
-            select
-            t.be_share as target_id,
-            f.share_img as activity_img,
-            f.`name` as activity_name,
-            '1' as price,
-            '2' as building_name,
-            '3' as address,
-            1 as building_type_id,
-			t.tagert_type as eventType,
-			t.create_date as visit_time
-            from ta_share t
-            left join ta_drainage f on t.be_share = f.drainage_id
-            where t.tagert_type = 'h5'
-            and t.person_id = #{personId} order by t.create_date desc limit 9999
-            ) t
-            group by t.target_id
-         union all
-
-        select * from (
-            select
-            t.be_share as target_id,
-            g.aerial_view_img as activity_img,
-            g.sales_batch_name as activity_name,
-            '1' as price,
-            '2' as building_name,
-            '3' as address,
-            1 as building_type_id,
-			left(t.tagert_type,5) as eventType,
-			t.create_date as visit_time
-            from ta_share t
-            left join ta_sales_batch g on t.be_share = g.sales_batch_id
-            where t.tagert_type like CONCAT('house' , '%')
-            and t.person_id = #{personId} order by t.create_date desc limit 9999
-            ) t
-            group by t.target_id
-
-			union all
-				select * from (
-					SELECT
-						t.be_share AS target_id,
-						g.list_img AS activity_img,
-						g.live_activity_title AS activity_name,
-						'1' AS price,
-						'2' AS building_name,
-						'3' AS address,
-						1 AS building_type_id,
-						LEFT ( t.tagert_type, 4 ) AS eventType,
-						t.create_date AS visit_time
-					FROM
-						ta_share t
-						LEFT JOIN ta_live_activity g ON t.be_share = g.live_activity_id
-					WHERE
-						t.tagert_type LIKE CONCAT( 'live', '%' )
-							AND t.person_id = #{personId}
-						ORDER BY
-							t.create_date DESC
-							LIMIT 9999
-					) t
-				group by t.target_id
-        ) t
-        order by t.visit_time desc
-    </select>
-
-    <select id="countShareNumByEventType" resultType="java.lang.Integer">
-        select count(DISTINCT t.person_id)  from ta_share_person_from t
-        left join ta_person a on t.person_id = a.person_id
-        where
-        (t.share_person = #{personId}
-        <if test="userId != null and userId != ''">
-            or t.share_person = #{userId}
-        </if>
-        )
-        and t.org_id = #{orgId}
-        and t.target_type = #{eventType}
-        and t.target_id = #{targetId}
-        and t.status = 1
-        and t.person_id != #{personId}
-        group by t.target_type
-    </select>
-
-    <select id="selectData" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
-		select t.share_person_id, t.target_id,
-		if(t.target_type = 'help' and t.event_type = 'activity', 'help', if(t.target_type = 'group' and t.event_type = 'activity' , 'group', t.event_type)) as target_type,
-		a.nickname, a.avatarurl FROM
-        ta_person_visit_record t
-        LEFT JOIN ta_person a ON t.share_person_id = a.person_id
-        LEFT JOIN ta_share_person_from b ON t.target_id = b.target_id  and t.event_type = b.target_type + '_share'
-        WHERE
-        (
-            ( t.consultant_id IS NOT NULL AND t.consultant_id != '' )
-            OR ( t.share_person_id IS NOT NULL AND t.share_person_id != '' )
-        )
-        AND t.person_id != t.share_person_id
-        AND t.`event` = 'detail'
-        AND ( t.share_person_id != b.share_person OR t.consultant_id != b.share_person )
-        GROUP BY
-        t.target_id, t.event_type;
-    </select>
-
-    <select id="selectTapersonFromShare" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
-        select t.share_person_id, if (t.consultant_id != '' and t.consultant_id is not null, 'Realty Consultant', 'customer') as person_type, t.person_id, b.target_type, t.target_id,t.org_id, t.building_id  From ta_person_visit_record t
-        left join ta_person a on t.share_person_id = a.person_id
-        LEFT JOIN ta_share_person_from b ON t.target_id = b.target_id  and t.event_type = b.target_type + '_share'
-        where
-        (
-            ( t.consultant_id IS NOT NULL AND t.consultant_id != '' )
-            OR ( t.share_person_id IS NOT NULL AND t.share_person_id != '' )
-            )
-            AND t.person_id != t.share_person_id
-            AND t.`event` = 'detail'
-            AND ( t.share_person_id != b.share_person OR t.consultant_id != b.share_person )
-        GROUP BY
-            t.target_id, t.event_type;
-    </select>
-
-    <select id="selectTodayVisitCount" resultType="java.lang.Integer">
-        SELECT
-        COUNT(1) as visit_count
-        FROM
-        ta_person_visit_record tp
-        where tp.org_id = #{orgId} AND
-        tp.event  = 'start'
-        AND DATE_FORMAT(tp.visit_time,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
-    </select>
-
-
-</mapper>
+<?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.yunzhi.marketing.mapper.TaPersonVisitRecordMapper">
+
+    <sql id="columnSql">
+        <trim suffixOverrides=",">
+            t.record_id,
+            t.person_id,
+            c.person_type,
+            t.visit_time,
+            t.leave_time,
+            t.visit_duration,
+            t.event,
+            t.data,
+            t.activity,
+            t.org_id,
+            t.building_id,
+            t.event_type,
+            t.target_id,
+            t.consultant_id,
+            t.share_person_id,
+        </trim>
+    </sql>
+
+    <select id="visitRecordByPersonId" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
+        select
+            t.* ,
+            b.parent_type_id from ta_person_visit_record t
+        left join td_biz_event_type b on t.event_type = b.type_id
+        where t.person_id = #{personId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND (b.parent_type_id = 'public' or t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+            )
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            AND (b.parent_type_id = 'public' or t.building_id = #{buildingId} )
+        </if>
+        order by t.visit_time desc
+    </select>
+
+    <select id="visitRecordByPersonIdNew" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
+        SELECT
+        t.*,
+        b.building_name
+        FROM
+        ta_person_visit_record t
+        LEFT JOIN ta_building b ON t.building_id = b.building_id
+        WHERE
+        t.person_id = #{personId}
+        ORDER BY
+        t.visit_time DESC
+    </select>
+
+    <select id="selectAll" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
+        SELECT
+            tpvr.record_id as recordId,
+            tpvr.person_id as personId,
+            tpvr.person_type as personType,
+            tpvr.building_id as buildingId,
+            tpvr.activity as activity,
+            tpvr.event as event,
+            tpvr.event_type as eventType,
+            tpvr.visit_duration as visitDuration,
+            (SELECT MIN(t.visit_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event and t.org_id = #{orgId} ) as visitTime,
+            (SELECT MAX(t.leave_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event and t.org_id = #{orgId} ) as leaveTime,
+            ifnull(tp.name, tp.nickname) as userName,
+            tbe.event_name as eventName,
+            COUNT(1) as accessCount
+        FROM
+            ta_person_visit_record tpvr
+            LEFT JOIN ta_person tp ON tpvr.person_id = tp.person_id
+            LEFT JOIN td_biz_event tbe on tpvr.event = tbe.event_code
+            <trim prefix="where" prefixOverrides="and | or">
+                tpvr.org_id = #{orgId}
+                and tp.org_id = #{orgId}
+                <if test="startDate != null and endDate != null">
+                    and tpvr.visit_time between #{startDate} and #{endDate}
+                </if>
+                <if test="buildingId != null and buildingId != ''">
+                    and tpvr.building_id = #{buildingId}
+                </if>
+                <if test="eventType != null and eventType != ''">
+                    and tpvr.event_type = #{eventType}
+                </if>
+                <if test="event != null and event != ''">
+                    and tpvr.event = #{event}
+                </if>
+                <if test="activity != null and activity != ''">
+                    and tpvr.activity = #{activity}
+                </if>
+            </trim>
+
+        GROUP BY tpvr.person_id, tpvr.event
+        ORDER BY 	accessCount DESC,tpvr.visit_time DESC
+    </select>
+    <select id="getPersonVisitRecordList" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
+        SELECT
+            t.*,
+            b.building_name
+        FROM
+            ta_person_visit_record t
+            LEFT JOIN ta_building b ON t.building_id = b.building_id
+        WHERE
+            t.person_id = #{personId}
+        ORDER BY
+            t.visit_time DESC
+    </select>
+
+    <select id="getDurationByPersonId" resultType="java.lang.Integer">
+        select SUM(visit_duration) from ta_person_visit_record where person_id = #{personId}
+    </select>
+
+    <select id="getFirstVisitTimeByPersonId" resultType="java.time.LocalDateTime">
+        select visit_time from ta_person_visit_record where person_id = #{personId} order by visit_time asc limit 1
+    </select>
+    <select id="getWxVisitRecordList" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
+        SELECT
+            t.* ,
+	        p.`name` as user_name,
+	        p.`nickname` as nickname,
+	        p.avatarurl,
+	        d.name as activity_name,
+	        d.create_date
+        FROM
+            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and event_type = #{eventType} AND consultant_id = #{userId} and person_id != #{personId} ORDER BY visit_time DESC LIMIT 999) t
+            left JOIN ta_person p on t.person_id = p.person_id
+            LEFT join ta_drainage d on t.target_id = d.drainage_id
+        GROUP BY
+            t.person_id
+        ORDER BY
+	        t.visit_time DESC
+    </select>
+
+    <select id="getWxActivityVisitRecordList" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
+        SELECT
+            t.share_from_id, t.share_person as consultant_id, t.share_person_type, t.person_id, t.target_type, t.target_id, t.create_date as visit_time, t.org_id ,t.building_id, t.status, t.is_first_time,
+	        p.`name` as user_name,
+	        p.`nickname` as nickname,
+	        p.avatarurl
+        FROM
+            ( SELECT * FROM ta_share_person_from WHERE org_id = #{orgId} and target_id = #{targetId} AND (share_person = #{userId} or share_person = #{personId}) and target_type = #{eventType} ORDER BY create_date DESC LIMIT 999) t
+            left JOIN ta_person p on t.person_id = p.person_id
+            where t.person_id != #{personId}
+        GROUP BY
+            t.person_id
+        ORDER BY
+	        t.create_date DESC
+    </select>
+
+
+    <select id="getWxVisitRecordActivityList" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
+            SELECT
+                t.*,
+                d.NAME AS activity_name,
+                d.create_date
+            FROM
+                ( SELECT * FROM ta_person_visit_record WHERE event_type = #{eventType} AND consultant_id = #{userId} AND person_id = #{personId} ORDER BY visit_time DESC ) t
+                LEFT JOIN ta_drainage d ON t.target_id = d.drainage_id
+            GROUP BY
+                t.target_id
+            ORDER BY
+	            t.visit_time DESC
+    </select>
+
+    <select id="getDrainageVisitRecord" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
+        select * from (
+            select
+            t.share_person as share_person_id,
+            t.person_id,
+            c.person_type,
+            t.create_date as visit_time,
+            t.target_type as event_type,
+            t.target_id as target_id,
+            b.name as drainageName,
+            d.building_name as buildingName,
+            tn.news_name as newsName,
+            tha.title as helpActivityName,
+            tsa.activity_name as groupActivityName,
+            tbd.title as activityName,
+            b.drainage_id
+            from ta_share_person_from t
+            left join ta_drainage b on t.target_id = b.drainage_id
+            left join ta_building d on t.target_id = d.building_id
+            left join ta_news tn on t.target_id = tn.news_id
+            left join ta_help_activity tha on t.target_id = tha.help_activity_id
+            left join ta_share_activity tsa on t.target_id = tsa.group_activity_id
+            left join ta_building_dynamic tbd on t.target_id = tbd.dynamic_id
+            left join ta_person c on t.org_id = c.org_id and (t.share_person = c.person_id or t.share_person = c.user_id)
+            where t.org_id = #{orgId}
+            and t.target_type in ('h5_share','group_share','help_share','news_share','dynamic_share','building_share')
+            <if test="eventType !=null and eventType != ''">
+                and t.target_type = #{eventType}
+            </if>
+            <if test="activityName !=null and activityName != ''">
+                and (
+                (b.name like concat('%',#{activityName},'%') and t.target_type = 'h5_share')or (d.name like concat('%',#{activityName},'%') and t.target_type = 'building_share') or (tn.news_name like concat('%',#{activityName},'%') and t.target_type = 'news_share')
+                or (tha.title like concat( '%', #{activityName}, '%' ) and t.target_type = 'help_share')  or (tsa.activity_name like concat('%',#{activityName},'%') and t.target_type = 'group_share') or (tbd.title like concat('%',#{activityName},'%') and t.target_type = 'dynamic_share')
+                )
+            </if>
+            <if test="shareName !=null and shareName != ''">
+                and c.nickname like concat('%',#{shareName},'%')
+            </if>
+            <if test="shareTel !=null and shareTel != ''">
+                and c.phone = #{shareTel}
+            </if>
+            <if test="personType == 'Realty Consultant'">
+                and c.person_type = 'Realty Consultant'
+            </if>
+            <if test="personType == 'customer'">
+                and c.person_type != 'Realty Consultant'
+            </if>
+            <if test="buildingId !=null and buildingId != ''">
+                and d.building_id = #{buildingId}
+            </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND d.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
+            order by t.create_date desc
+        ) t
+        group by t.person_id, t.target_id,t.event_type, t.share_person_id
+        order by t.visit_time desc
+    </select>
+
+    <select id="getConsultantShareInfoList" resultType="com.yunzhi.marketing.entity.TaConsultantInfo">
+        select * From (
+            select * from (
+                select
+                t.be_share as target_id,
+                a.url as activity_img,
+                a.building_name as activity_name,
+                a.building_name,
+                a.address,
+                a.price,
+                a.building_type_id,
+                t.tagert_type as eventType,
+				t.create_date as visit_time
+                from ta_share t
+                left join (select b.url, a.building_name,a.address,a.price,a.building_id,a.building_type_id from ta_building a left join ta_building_img b on a.building_id = b.building_id where b.img_type = 'list') a on t.be_share = a.building_id
+                where t.tagert_type = 'building'
+                and t.person_id = #{personId} order by t.create_date desc limit 9999
+            ) t
+            group by t.target_id
+
+        union all
+
+        select * from (
+        select
+        t.be_share as target_id,
+        b.list_img_url as activity_img,
+        b.title as activity_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        1 as building_type_id,
+        t.tagert_type as eventType,
+		t.create_date as visit_time
+        from ta_share t
+        left join ta_building_dynamic b on t.be_share = b.dynamic_id
+        where t.tagert_type = 'activity'
+        and t.person_id = #{personId} order by t.create_date desc limit 9999
+        ) t
+        group by t.target_id
+
+        union all
+
+        select * from (
+        select
+        t.be_share as target_id,
+        c.list_img as activity_img,
+        c.title as activity_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        1 as building_type_id,
+        t.tagert_type as eventType,
+		t.create_date as visit_time
+        from ta_share t
+        left join ta_help_activity c on t.be_share = c.help_activity_id
+        where t.tagert_type = 'help'
+        and t.person_id = #{personId} order by t.create_date desc limit 9999
+        ) t
+        group by t.target_id
+
+        union all
+
+        select * from (
+        select
+        t.be_share as target_id,
+        d.list_img as activity_img,
+        d.activity_name as activity_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        1 as building_type_id,
+        t.tagert_type as eventType,
+		t.create_date as visit_time
+        from ta_share t
+        left join ta_share_activity d on t.be_share = d.group_activity_id
+        where t.tagert_type = 'group'
+        and t.person_id = #{personId} order by t.create_date desc limit 9999
+        ) t
+		group by t.target_id
+
+        union all
+
+        select * from (
+        select
+        t.be_share as target_id,
+        e.news_img as activity_img,
+        e.news_name as activity_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        1 as building_type_id,
+        t.tagert_type as eventType,
+		t.create_date as visit_time
+        from ta_share t
+        left join ta_news e on t.be_share = e.news_id
+        where t.tagert_type = 'news'
+        and t.person_id = #{personId} order by t.create_date desc limit 9999
+        ) t
+        group by t.target_id
+
+        union all
+
+        select * from (
+            select
+            t.be_share as target_id,
+            f.share_img as activity_img,
+            f.`name` as activity_name,
+            '1' as price,
+            '2' as building_name,
+            '3' as address,
+            1 as building_type_id,
+			t.tagert_type as eventType,
+			t.create_date as visit_time
+            from ta_share t
+            left join ta_drainage f on t.be_share = f.drainage_id
+            where t.tagert_type = 'h5'
+            and t.person_id = #{personId} order by t.create_date desc limit 9999
+            ) t
+            group by t.target_id
+         union all
+
+        select * from (
+            select
+            t.be_share as target_id,
+            g.aerial_view_img as activity_img,
+            g.sales_batch_name as activity_name,
+            '1' as price,
+            '2' as building_name,
+            '3' as address,
+            1 as building_type_id,
+			left(t.tagert_type,5) as eventType,
+			t.create_date as visit_time
+            from ta_share t
+            left join ta_sales_batch g on t.be_share = g.sales_batch_id
+            where t.tagert_type like CONCAT('house' , '%')
+            and t.person_id = #{personId} order by t.create_date desc limit 9999
+            ) t
+            group by t.target_id
+
+			union all
+				select * from (
+					SELECT
+						t.be_share AS target_id,
+						g.list_img AS activity_img,
+						g.live_activity_title AS activity_name,
+						'1' AS price,
+						'2' AS building_name,
+						'3' AS address,
+						1 AS building_type_id,
+						LEFT ( t.tagert_type, 4 ) AS eventType,
+						t.create_date AS visit_time
+					FROM
+						ta_share t
+						LEFT JOIN ta_live_activity g ON t.be_share = g.live_activity_id
+					WHERE
+						t.tagert_type LIKE CONCAT( 'live', '%' )
+							AND t.person_id = #{personId}
+						ORDER BY
+							t.create_date DESC
+							LIMIT 9999
+					) t
+				group by t.target_id
+        ) t
+        order by t.visit_time desc
+    </select>
+
+    <select id="countShareNumByEventType" resultType="java.lang.Integer">
+        select count(DISTINCT t.person_id)  from ta_share_person_from t
+        left join ta_person a on t.person_id = a.person_id
+        where
+        (t.share_person = #{personId}
+        <if test="userId != null and userId != ''">
+            or t.share_person = #{userId}
+        </if>
+        )
+        and t.org_id = #{orgId}
+        and t.target_type = #{eventType}
+        and t.target_id = #{targetId}
+        and t.status = 1
+        and t.person_id != #{personId}
+        group by t.target_type
+    </select>
+
+    <select id="selectData" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
+		select t.share_person_id, t.target_id,
+		if(t.target_type = 'help' and t.event_type = 'activity', 'help', if(t.target_type = 'group' and t.event_type = 'activity' , 'group', t.event_type)) as target_type,
+		a.nickname, a.avatarurl FROM
+        ta_person_visit_record t
+        LEFT JOIN ta_person a ON t.share_person_id = a.person_id
+        LEFT JOIN ta_share_person_from b ON t.target_id = b.target_id  and t.event_type = b.target_type + '_share'
+        WHERE
+        (
+            ( t.consultant_id IS NOT NULL AND t.consultant_id != '' )
+            OR ( t.share_person_id IS NOT NULL AND t.share_person_id != '' )
+        )
+        AND t.person_id != t.share_person_id
+        AND t.`event` = 'detail'
+        AND ( t.share_person_id != b.share_person OR t.consultant_id != b.share_person )
+        GROUP BY
+        t.target_id, t.event_type;
+    </select>
+
+    <select id="selectTapersonFromShare" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
+        select t.share_person_id, if (t.consultant_id != '' and t.consultant_id is not null, 'Realty Consultant', 'customer') as person_type, t.person_id, b.target_type, t.target_id,t.org_id, t.building_id  From ta_person_visit_record t
+        left join ta_person a on t.share_person_id = a.person_id
+        LEFT JOIN ta_share_person_from b ON t.target_id = b.target_id  and t.event_type = b.target_type + '_share'
+        where
+        (
+            ( t.consultant_id IS NOT NULL AND t.consultant_id != '' )
+            OR ( t.share_person_id IS NOT NULL AND t.share_person_id != '' )
+            )
+            AND t.person_id != t.share_person_id
+            AND t.`event` = 'detail'
+            AND ( t.share_person_id != b.share_person OR t.consultant_id != b.share_person )
+        GROUP BY
+            t.target_id, t.event_type;
+    </select>
+
+    <select id="selectTodayVisitCount" resultType="java.lang.Integer">
+        SELECT
+        COUNT(1) as visit_count
+        FROM
+        ta_person_visit_record tp
+        where tp.org_id = #{orgId} AND
+        tp.event  = 'start'
+        AND DATE_FORMAT(tp.visit_time,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
+    </select>
+
+
+</mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -88,14 +88,20 @@ FROM
         ta_person a
         left join ta_channel_person tcp on a.person_id = tcp.person_id
         left join ta_channel tc on tc.channel_id = tcp.channel_id
-        <where>
-            a.person_type in ('channel agent')
+        <where> 1=1
+            <if test="personId != null and personId !=''">
+                and a.person_id = #{personId}
+            </if>
+            <if test="channelId != null and channelId !=''">
+                and tc.channel_id = #{channelId}
+            </if>
+            and a.person_type in ('channel agent', 'estate agent')
             and a.status >0
             <if test="name != null and name !=''">
-                and a.nickname = #{name}
+                and a.nickname like concat('%', #{name} ,'%')
             </if>
             <if test="tel != null and tel!=''">
-                and a.phone = #{tel}
+                and a.phone like concat('%', #{tel} ,'%')
             </if>
             <if test="orgId != null">
                 and a.org_id = #{orgId}
@@ -808,39 +814,42 @@ FROM
 
     <select id="getMyCustFollowOrClinch" resultType="com.yunzhi.marketing.entity.TaRecommendCustomer">
         SELECT
-        *
+        IFNULL( p.nickname, t.NAME ) AS NAME,
+        IFNULL( p.avatarurl, t.picture ) AS picture,
+        t.*
         FROM
-        ta_recommend_customer
+        ta_recommend_customer t
+        LEFT JOIN ta_person p ON t.person_id = p.person_id
         WHERE
-        org_id = #{orgId}
-        AND ( realty_consultant = #{personId} OR realty_consultant = #{userId} )
+        t.org_id = #{orgId}
+        AND ( t.realty_consultant = #{personId} OR t.realty_consultant = #{userId} )
         <if test="type == 'follow'">
-            AND STATUS != 4
-            AND verify_status = 1
+            AND t.STATUS != 4
+            AND t.verify_status = 1
             <if test="name != null and name !=''">
-                and (`name` like CONCAT('%',#{name}, '%') or phone like CONCAT('%',#{name}, '%'))
+                and (p.nickname like CONCAT('%',#{name}, '%') or t.`name` like CONCAT('%',#{name}, '%') or t.phone like CONCAT('%',#{name}, '%'))
             </if>
             <if test="phone != null and phone !=''">
-                and phone like CONCAT('%',#{phone}, '%')
+                and t.phone like CONCAT('%',#{phone}, '%')
             </if>
             <if test="status != null and status !=''">
-                and status = #{status}
+                and t.status = #{status}
             </if>
             <if test="startReportDate != null and startReportDate !=''">
-                and date_format( report_date, '%Y-%m-%d' ) >= #{startReportDate}
+                and date_format( t.report_date, '%Y-%m-%d' ) >= #{startReportDate}
             </if>
             <if test="endReportDate != null and endReportDate !=''">
-                and date_format( report_date, '%Y-%m-%d' ) &lt;= #{endReportDate}
+                and date_format( t.report_date, '%Y-%m-%d' ) &lt;= #{endReportDate}
             </if>
             <if test="startArrivalDate != null and startArrivalDate !=''">
-                and date_format( arrival_date, '%Y-%m-%d' ) >= #{startArrivalDate}
+                and date_format( t.arrival_date, '%Y-%m-%d' ) >= #{startArrivalDate}
             </if>
             <if test="endArrivalDate != null and endArrivalDate !=''">
-                and date_format( arrival_date, '%Y-%m-%d' ) &lt;= #{endArrivalDate}
+                and date_format( t.arrival_date, '%Y-%m-%d' ) &lt;= #{endArrivalDate}
             </if>
         </if>
         <if test="type == 'clinch'">
-            AND STATUS = 4
+            AND t.STATUS in (4,5)
         </if>
     </select>
 

src/main/resources/mapper/TsConsultantKpiMapper.xml

@@ -6,8 +6,8 @@
     <select id="stsKPIDaily" resultType="com.yunzhi.marketing.entity.TsConsultantKpi">
         SELECT * FROM (
             SELECT
-                1 AS serial_no,
-                '2020' AS statis_date,
+                t.serial_no,
+                SUBSTR(t.statis_date,1,4),
                 t.org_id,
                 t.building_id,
                 t.building_name,
@@ -27,15 +27,13 @@
                  where s.org_id = t.org_id and (s.realty_consultant = t.user_id or s.realty_consultant = m.person_id)
                  and (s.building_id = t.building_id or IFNULL(t.building_id, '') = '')
                  and s.status > 0
-<!--                 AND s.create_date BETWEEN STR_TO_DATE( #{startDate}, '%Y%m%d' )-->
-<!--                 AND  STR_TO_DATE(concat(#{endDate}, '235959'), '%Y%m%d%H%i%s')-->
                 ) as total_persons
             FROM
                 ts_consultant_kpi t
             LEFT JOIN ta_person m on m.org_id = #{orgId} and m.user_id = t.user_id
             WHERE
                 t.org_id = #{orgId}
-                AND t.statis_date BETWEEN #{startDate} AND #{endDate}
+                AND t.statis_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
             <if test="buildingIds != null">
                 AND t.building_id in
                 <foreach item="buildingId" index="index" collection="buildingIds"
@@ -59,8 +57,8 @@
     <!-- 按照小程序分组统计, 注意查询与分组条件, 必须与之前的汇总，导出一致 -->
     <select id="stsKPITotalByOrg" resultType="com.yunzhi.marketing.entity.TsConsultantKpi">
         SELECT
-            1 AS serial_no,
-            '2020' AS statis_date,
+            t.serial_no,
+            SUBSTR(t.statis_date,1,4),
             t.org_id,
             '' as building_id,
             '-' as building_name,
@@ -82,7 +80,7 @@
             ts_consultant_kpi t
         WHERE
             t.org_id = #{orgId}
-            AND t.statis_date BETWEEN #{startDate} AND #{endDate}
+            AND t.statis_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
         <if test="buildingIds != null">
             AND t.building_id in
             <foreach item="buildingId" index="index" collection="buildingIds"
@@ -95,8 +93,8 @@
     <!-- 导出 -->
     <select id="stsKPIDailyExport" resultType="com.yunzhi.marketing.excel.ConsultantKPIExport">
         SELECT
-            1 AS serial_no,
-            '2020' AS statis_date,
+            t.serial_no,
+            SUBSTR(t.statis_date,1,4),
             t.org_id,
             t.building_id,
             t.building_name,
@@ -119,7 +117,7 @@
         LEFT JOIN ta_person m on m.org_id = #{orgId} and m.user_id = t.user_id
         WHERE
             t.org_id = #{orgId}
-        AND t.statis_date BETWEEN #{startDate} AND #{endDate}
+        AND t.statis_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
     <if test="buildingIds != null">
         AND t.building_id in
         <foreach item="buildingId" index="index" collection="buildingIds"
@@ -146,8 +144,6 @@
         WHERE
             p.org_id = #{orgId}
             AND p.`status` > 0
-<!--            AND p.create_date BETWEEN STR_TO_DATE( #{startDate}, '%Y%m%d')-->
-<!--            AND  STR_TO_DATE(concat(#{endDate}, '235959'), '%Y%m%d%H%i%s')-->
         <if test="buildingIds != null">
             AND t.building_id in
             <foreach item="buildingId" index="index" collection="buildingIds"
@@ -169,7 +165,7 @@
             AND e.building_id = #{buildingId}
         </if>
         AND e.target_type is not null
-        AND e.create_date BETWEEN #{startDate} and #{endDate}
+        AND e.create_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
         AND e.is_project_first = 1
         AND s.user_id = #{userId}
 
@@ -197,7 +193,7 @@
             AND f.building_id = #{buildingId}
         </if>
             AND f.event_type = 'card'
-            AND f.visit_time BETWEEN #{startDate} and #{endDate}
+            AND f.visit_time BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
             AND s.user_id = #{userId}
 
 <!--        为了与存储过程一致 -->
@@ -222,7 +218,7 @@
             AND f.building_id = #{buildingId}
         </if>
             AND f.event_type = 'card'
-            AND f.visit_time BETWEEN #{startDate} and #{endDate}
+            AND f.visit_time BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
             AND s.user_id = #{userId}
 
 <!--        为了与存储过程一致 -->
@@ -245,7 +241,7 @@
 
 <!--        为了与存储过程一致 -->
 <!--            AND t.`status` = 1-->
-            AND h.create_date BETWEEN #{startDate} and #{endDate}
+            AND h.create_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
             AND s.user_id = #{userId}
 
 <!--        为了与存储过程一致 -->
@@ -269,7 +265,7 @@
 <!--        为了与存储过程一致 -->
 <!--            AND t.`status` = 1-->
             AND i.tagert_type = 'consultant'
-            AND i.create_date BETWEEN #{startDate} and #{endDate}
+            AND i.create_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
             AND s.user_id = #{userId}
 
 <!--        为了与存储过程一致 -->
@@ -306,7 +302,7 @@
             AND t.tagert_type like concat(#{targetType}, '%')
         </if>
 
-            AND t.create_date BETWEEN #{startDate} and #{endDate}
+            AND t.create_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
         <if test="targetName != null and targetName !=''">
             AND t.target_name LIKE concat('%', #{targetName}, '%')
         </if>
@@ -326,7 +322,7 @@
         INNER JOIN ta_person t ON t.person_id = e.person_id
         WHERE e.org_id = #{orgId}
             AND e.share_person = #{userId}
-            AND e.create_date BETWEEN #{startDate} and #{endDate}
+            AND e.create_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
             AND (
                 e.target_type IN ( 'card_share', 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
                 OR ( e.target_type = 'share' AND e.target_id = 'index' )
@@ -371,7 +367,7 @@
             AND e.target_name like concat('%', #{targetName} ,'%')
         </if>
 
-            AND e.create_date BETWEEN #{startDate} and #{endDate}
+            AND e.create_date BETWEEN DATE_FORMAT(#{startDate}, '%Y%m%d' )  AND DATE_FORMAT(#{endDate}, '%Y%m%d' )
 
         <if test="buildingId != null and buildingId !=''">
             AND e.building_id = #{buildingId}

src/main/resources/mapper/statistic/TsCustomerGenderStatisticMapper.xml

@@ -4,18 +4,23 @@
 
     <select id="getNewCustomerSexCount" resultType="com.yunzhi.marketing.statistic.entity.GenderStatistic">
         SELECT
-            org_id,realty_consultant,
-            sum(if(sex = 1,1,0)) as man_sum,
-            sum(if(sex = 1,1,0))/count(*) as man_pct,
-            sum(if(sex = 2,1,0)) as woman_sum,
-            sum(if(sex = 2,1,0))/count(*) as woman_pct,
-            sum(if(sex != 1 and sex != 2,1,0)) as unknown_sum,
-            sum(if(sex != 1 and sex != 2,1,0))/count(*) as unknown_pct
+            t.org_id,
+            s.person_id AS realty_consultant,
+            sum( IF ( t.sex = 1, 1, 0 ) ) AS man_sum,
+            sum( IF ( t.sex = 1, 1, 0 ) ) / count( * ) AS man_pct,
+            sum( IF ( t.sex = 2, 1, 0 ) ) AS woman_sum,
+            sum( IF ( t.sex = 2, 1, 0 ) ) / count( * ) AS woman_pct,
+            sum( IF ( t.sex != 1 AND t.sex != 2, 1, 0 ) ) AS unknown_sum,
+            sum( IF ( t.sex != 1 AND t.sex != 2, 1, 0 ) ) / count( * ) AS unknown_pct
         FROM
-            ta_recommend_customer
+            ta_recommend_customer t
+                LEFT JOIN ta_person s ON s.person_id = t.realty_consultant
+                    OR s.user_id = t.realty_consultant
         WHERE
-            verify_status = 1
-            GROUP BY org_id,realty_consultant
+            t.verify_status = 1
+        GROUP BY
+            t.org_id,
+            s.person_id
     </select>
     <select id="getFollowUpSexCount" resultType="com.yunzhi.marketing.statistic.entity.GenderStatistic">
         SELECT
@@ -35,7 +40,7 @@
     <select id="getVisiteSexCount" resultType="com.yunzhi.marketing.statistic.entity.GenderStatistic">
         SELECT
             d.org_id,
-            d.realty_consultant,
+            d.realty_consultant_person as realty_consultant,
             sum( IF ( d.sex = 1, 1, 0 ) ) AS manSum,
             sum( IF ( d.sex = 1, 1, 0 ) ) / count( * ) AS manPct,
             sum( IF ( d.sex = 2, 1, 0 ) ) AS womanSum,
@@ -46,19 +51,22 @@
             (
                 SELECT
                     t.enlist_id,
-                    c.*
+                    c.*,
+                    s.person_id as realty_consultant_person
                 FROM
                     ta_activity_dynamic_enlist t
                     LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
-                    AND t.building_id = c.building_id
-                    AND t.org_id = c.org_id
-                    AND c.verify_status = 1
+                        AND t.building_id = c.building_id
+                        AND t.org_id = c.org_id
+                        AND c.verify_status = 1
+                    LEFT JOIN ta_person s ON s.person_id = c.realty_consultant
+                        OR s.user_id = c.realty_consultant
                 WHERE
                     t.is_checkin = 1
                 GROUP BY
                     c.customer_id
             ) d
         GROUP BY
-            d.org_id,d.realty_consultant
+            d.org_id,d.realty_consultant_person
     </select>
 </mapper>

src/main/resources/mapper/statistic/TsCustomerStatisticDailyMapper.xml

@@ -23,33 +23,38 @@
 
     <select id="getNewCustomerData" resultType="com.yunzhi.marketing.statistic.entity.TsCustomerStatisticDaily">
         SELECT
-            org_id,
-            count( customer_id ) as customer_num,
-			realty_consultant
+            t.org_id,
+            count( DISTINCT ( t.customer_id ) ) AS customer_num,
+            s.person_id AS realty_consultant
         FROM
-            ta_recommend_customer
+            ta_recommend_customer t
+                LEFT JOIN ta_person s ON s.person_id = t.realty_consultant
+                OR s.user_id = t.realty_consultant
         WHERE
-             date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
-             AND verify_status = 1
+                date_format( t.create_date, '%Y-%m-%d' ) = date_format(#{nowDate}, '%Y-%m-%d' )
+          AND t.verify_status = 1
         GROUP BY
-            org_id,realty_consultant
+            t.org_id,
+            s.person_id
     </select>
     <select id="getVisiteCustomerData" resultType="com.yunzhi.marketing.statistic.entity.TsCustomerStatisticDaily">
         SELECT
             count( DISTINCT ( c.customer_id ) ) as customer_num,
             c.org_id,
-			c.realty_consultant
+            s.person_id as realty_consultant
         FROM
             ta_activity_dynamic_enlist t
             LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
-            AND t.building_id = c.building_id
-            AND t.org_id = c.org_id
-            AND c.verify_status = 1
+                AND t.building_id = c.building_id
+                AND t.org_id = c.org_id
+                AND c.verify_status = 1
+            LEFT JOIN ta_person s ON s.person_id = c.realty_consultant
+                OR s.user_id = c.realty_consultant
         WHERE
             t.is_checkin = #{checkin}
             AND date_format( t.create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
         GROUP BY
-            c.org_id,c.realty_consultant
+            c.org_id, s.person_id
     </select>
     <select id="getDailyList" resultType="com.yunzhi.marketing.statistic.entity.TsCustomerStatisticDaily">
         SELECT

src/main/resources/mapper/statistic/TsPersonFromStatisticMapper.xml

@@ -3,10 +3,10 @@
 <mapper namespace="com.yunzhi.marketing.statistic.mapper.TsPersonFromStatisticMapper">
 
     <insert id="insertStatisticList">
-        INSERT INTO ts_person_from_statistic(scene_type,event_type,from_num,org_id,create_date,registered_num)
+        INSERT INTO ts_person_from_statistic(scene_type,event_type,from_num,org_id,create_date,registered_num,institution_id)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.sceneType},#{item.eventType},#{item.fromNum},#{item.orgId},#{item.createDate},#{item.registeredNum})
+            (#{item.sceneType},#{item.eventType},#{item.fromNum},#{item.orgId},#{item.createDate},#{item.registeredNum},#{item.institutionId})
         </foreach>
     </insert>
     <delete id="deleteByData">
@@ -24,7 +24,12 @@
         <if test="startDate == null or endDate == null">
             AND DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-
+        <if test="institutionIds != null and institutionIds.size > 0">
+            AND tp.institution_id in
+            <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </select>
     <select id="selectPersonFromGroupByDay"
             resultType="com.yunzhi.marketing.statistic.entity.TsPersonFromStatistic">
@@ -63,6 +68,12 @@
         <if test="startDate == null or endDate == null">
             AND DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
+        <if test="institutionIds != null and institutionIds.size > 0">
+            AND tp.institution_id in
+            <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY DATE_FORMAT( tp.create_date, '%Y-%m-%d' ), tp.scene_type ORDER BY tp.create_date
         ) as tp on date.date = tp.create_time
 
@@ -93,6 +104,12 @@
         <if test="startDate == null or endDate == null">
             AND DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
+        <if test="institutionIds != null and institutionIds.size > 0">
+            AND tp.institution_id in
+            <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY
         DATE_FORMAT( tp.create_date, '%Y-%m-%d' )
         ORDER BY tp.create_date

src/main/resources/mapper/statistic/TsUserBehaviorStatisticMapper.xml

@@ -7,15 +7,16 @@
 
     <select id="seleUserBehaviorList"
             resultType="com.yunzhi.marketing.statistic.entity.TsUserBehaviorStatistic">
-                SELECT
+        SELECT
             temp_date.date AS create_date,
             temp_date.type_name AS event_name,
             temp_date.type_id AS event_type,
             temp.activityCount AS behavior_num,
             temp.building_id,
-            temp.org_id
+            temp.org_id,
+            temp.institution_id
         FROM
-            (
+        (
         SELECT
             DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date,
             b.type_id,
@@ -24,26 +25,30 @@
         FROM
             sequence a,
             td_biz_event_type b
-            ) AS temp_date
-            LEFT JOIN (
-        SELECT
-            COUNT( 1 ) AS activityCount,
-            tpvr.event_type,
-            DATE_FORMAT( tpvr.visit_time, '%Y-%m-%d' ) AS date,
-            tpvr.building_id,
-            tp.org_id
-        FROM
-            ta_person tp
+        ) AS temp_date
+        LEFT JOIN (
+            SELECT
+                COUNT( 1 ) AS activityCount,
+                tpvr.event_type,
+                DATE_FORMAT( tpvr.visit_time, '%Y-%m-%d' ) AS date,
+                tpvr.building_id,
+                tp.org_id,
+                tb.institution_id
+            FROM
+                ta_person tp
             INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
+            LEFT JOIN ta_building tb on tpvr.building_id = tb.building_id
+            WHERE
+                tp.person_type IN ( 'customer', 'drift', 'estate agent' )
+            GROUP BY
+                tpvr.event_type,
+                DATE_FORMAT( tpvr.visit_time, '%Y-%m-%d' ),
+                tp.org_id,
+                tpvr.building_id
+        ) AS temp ON temp_date.date = temp.date
+        AND temp_date.type_id = temp.event_type
         WHERE
-            tp.person_type IN ( 'customer', 'drift', 'estate agent' )
-        GROUP BY
-            tpvr.event_type,
-            DATE_FORMAT( tpvr.visit_time, '%Y-%m-%d' ),
-            tp.org_id,
-            tpvr.building_id
-            ) AS temp ON temp_date.date = temp.date
-            AND temp_date.type_id = temp.event_type where temp_date.date = DATE_FORMAT( now( ), '%Y-%m-%d' )
+        temp_date.date = DATE_FORMAT( now( ), '%Y-%m-%d' )
     </select>
     <select id="seleBehaviorListByDate"
             resultType="com.yunzhi.marketing.po.PersonPO">
@@ -84,6 +89,12 @@
             <if test="buildingId != null and buildingId != ''">
                 and tp.building_id = #{buildingId}
             </if>
+            <if test="institutionIds != null and institutionIds.size > 0">
+                AND tp.institution_id in
+                <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             GROUP BY
             DATE_FORMAT( tp.create_date, '%Y-%m-%d' ),
             tp.event_type

src/main/resources/mapper/xlk/BuildingChannelMapper.xml

@@ -8,8 +8,9 @@
         FROM
             xlk_building_channel t
             INNER JOIN ta_channel_person c ON t.channel_id = c.channel_id
-            LEFT JOIN ta_building b ON t.building_id = b.building_id
+            INNER JOIN ta_building b ON t.building_id = b.building_id
         WHERE
             c.person_id = #{personId}
+            AND b.status = 1
     </select>
 </mapper>