Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5.1

src/main/java/com/huiju/estateagents/activity/controller/ActivityController.java

@@ -75,6 +75,9 @@ public class ActivityController extends BaseController {
 		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
 		taPersonQueryWrapper.eq("person_id",taRecommendCustomer.getPersonId());
 		TaPerson person = taPersonService.getOne(taPersonQueryWrapper);
+		if (null == person){
+			return ResponseBean.error("验证人员信息失败",ResponseBean.ERROR_UNAVAILABLE);
+		}
 		responseBean = activityService.getCustomerActivityList(pageNumber,pageSize,orgId,person);
 		return responseBean;
 	}

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -184,4 +184,10 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private Integer cityId;
+
+    /**
+     * 默认城市
+     */
+    @TableField(exist = false)
+    private Integer defaultCityId;
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -100,6 +100,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taUser.setLoginName(taUser.getPhone());
 		}
 
+		//判断默认城市是否在维护城市内
+		verificationCity(taUser.getSelectCityTree(),taUser.getDefaultCityId());
+
 		QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
 		wrapper.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName());
 		List<TaUser> taUserList = this.list(wrapper);
@@ -113,7 +116,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		taOrg.setWaterMark(taUser.getWaterMark());
 		taOrg.setCreateDate(LocalDateTime.now());
 		taOrg.setBuildingNum(taUser.getOrgNum());
-		taOrg.setDefaultCityId(taUser.getCityId());
+		taOrg.setDefaultCityId(taUser.getDefaultCityId());
 		if (taOrgMapper.insert(taOrg) < 1) {
 			throw new Exception("生成用户公司信息失败");
 		}
@@ -165,30 +168,51 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 	// 维护公司所在城市
 	public void addAndupdate(ArrayList<Integer> selectCityTree,boolean isA,Integer orgid){
-
+			// 查询当前所有的市
 			QueryWrapper<TdCity> tdCityQuery= new QueryWrapper<>();
-			tdCityQuery.eq("leveltype",1);
-			 List<TdCity> tdCityList= tdCityMapper.selectList(tdCityQuery);
+			tdCityQuery.eq("leveltype",2);
+			List<TdCity> tdCityList= tdCityMapper.selectList(tdCityQuery);
 
 		// isA=true删除所有城市重新添加
 		if (isA == true){
-			for(Integer city:selectCityTree) {
-				taOrgCityMapper.deleteById(city);
-			}
+			QueryWrapper<TaOrgCity> taOrgCity= new  QueryWrapper<>();
+			taOrgCity.eq("org_id",orgid);
+			taOrgCityMapper.delete(taOrgCity);
 		}
+		TaOrgCity  taOrgCity = new TaOrgCity();
 			 // 对比现在的城市ID
 			 for(Integer city:selectCityTree){
 				for (TdCity tdCity : tdCityList){
+						// 入库城市
 					if (city.equals(tdCity.getId())){
-						TaOrgCity  taOrgCity = new TaOrgCity();
-						taOrgCity.setId(city).setName(tdCity.getName()).setOrgId(orgid).setStatus(1).setParentid(tdCity.getParentid());
+						taOrgCity.setCityId(city).setName(tdCity.getName()).setOrgId(orgid).setStatus(1).setParentid(tdCity.getParentid());
+						taOrgCityMapper.insert(taOrgCity);
+						// 查询当前公司选择省份是否存在
+                       QueryWrapper<TaOrgCity> taOrgCityParent = new QueryWrapper<>();
+                        taOrgCityParent.eq("city_id",tdCity.getParentid());
+                        taOrgCityParent.eq("org_id",orgid);
+						TaOrgCity taOrgParent = taOrgCityMapper.selectOne(taOrgCityParent);
+						// 如果为空，查询行政表
+						if (null == taOrgParent){
+							TdCity  tdCityParent = tdCityMapper.selectById(tdCity.getParentid());
+							taOrgCity.setCityId(tdCityParent.getId()).setName(tdCityParent.getName()).setOrgId(orgid).setStatus(1).setParentid(100000);
+							taOrgCityMapper.insert(taOrgCity);
+						}
 					}
 
 				}
 			 }
 
 	}
-
+	// 判断当前城市是否存在
+	public void  verificationCity(ArrayList<Integer> selectCityTree,Integer city)throws Exception{
+		for (Integer id: selectCityTree) {
+			if (id.equals(city)) {
+				return;
+				}
+			}
+		throw new Exception("当前默认城市不在维护城市内");
+	}
 	@Override
 	public TaUser getInfoWithOrg(Integer id) {
 		TaUser taUser = this.getById(id);
@@ -201,7 +225,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taUser.setOrgName(taOrg.getName());
 			taUser.setWaterMark(taOrg.getWaterMark());
 			taUser.setOrgNum(taOrg.getBuildingNum());
-			taOrg.setDefaultCityId(taUser.getCityId());
+			taUser.setDefaultCityId(taOrg.getDefaultCityId());
 		}
 
 		QueryWrapper<TaMiniapp> wrapper = new QueryWrapper<>();
@@ -216,17 +240,23 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 		taUser.setMiniapp(taMiniapp);
 		taUser.setLoginPassword(null);
+		// 查询所有城市id
+		ArrayList<Integer> taOrgCityList= taOrgCityMapper.selectByIdCity(taUser.getOrgId());
+		taUser.setSelectCityTree(taOrgCityList);
 		return taUser;
 	}
 
 	@Override
 	public void updateInfoWithOrg(TaUser taUser) throws Exception {
+		//判断默认城市是否在维护城市内
+		verificationCity(taUser.getSelectCityTree(),taUser.getDefaultCityId());
+
 		TaOrg taOrg = taOrgMapper.selectById(taUser.getOrgId());
 		if (null != taOrg) {
 			taOrg.setName(taUser.getOrgName());
 			taOrg.setWaterMark(taUser.getWaterMark());
 			taOrg.setBuildingNum(taUser.getOrgNum());
-
+			taOrg.setDefaultCityId(taUser.getDefaultCityId());
 			if (taOrgMapper.updateById(taOrg) < 1) {
 				throw new Exception("更新用户公司信息失败");
 			}

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

@@ -204,12 +204,13 @@ public class MiniAppController extends BaseController {
 
             // 获取其余信息
             Map<String, Object> extraInfo = taPersonService.getExtraInfo(taPerson.getPersonId());
-            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
+            // 所有人员都返回 org yansen 2019-11-13 19:56:18
+//            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
                 QueryWrapper<TaOrg>orgQueryWrapper = new QueryWrapper<>();
                 orgQueryWrapper.eq("org_id",taPerson.getOrgId());
                 TaOrg org = taOrgService.getOne(orgQueryWrapper);
                 taPerson.setOrg(org);
-            }
+//            }
             Map<String, Object> result = new HashMap<>();
             result.put("miniApp", miniResp);
             result.put("person", taPerson);

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

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaBuildingMapRelation;
+import com.huiju.estateagents.service.ITaBuildingMapRelationService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    *  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-11-13
+ */
+@RestController
+@RequestMapping("/")
+public class TaBuildingMapRelationController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaBuildingMapRelationController.class);
+
+    @Autowired
+    public ITaBuildingMapRelationService iTaBuildingMapRelationService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/buildingMapRelation",method= RequestMethod.GET)
+    public ResponseBean buildingMapRelationList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaBuildingMapRelation> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaBuildingMapRelation> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaBuildingMapRelation> result = iTaBuildingMapRelationService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingMapRelationList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taBuildingMapRelation 实体对象
+     * @return
+     */
+    @RequestMapping(value="/buildingMapRelation",method= RequestMethod.POST)
+    public ResponseBean buildingMapRelationAdd(@RequestBody TaBuildingMapRelation taBuildingMapRelation){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaBuildingMapRelationService.save(taBuildingMapRelation)){
+                responseBean.addSuccess(taBuildingMapRelation);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingMapRelationAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/buildingMapRelation/{id}", method= RequestMethod.DELETE)
+    public ResponseBean buildingMapRelationDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaBuildingMapRelationService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingMapRelationDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taBuildingMapRelation 实体对象
+     * @return
+     */
+    @RequestMapping(value="/buildingMapRelation/{id}",method= RequestMethod.PUT)
+    public ResponseBean buildingMapRelationUpdate(@PathVariable Integer id,
+                                        @RequestBody TaBuildingMapRelation taBuildingMapRelation){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaBuildingMapRelationService.updateById(taBuildingMapRelation)){
+                responseBean.addSuccess(taBuildingMapRelation);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingMapRelationUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/buildingMapRelation/{id}",method= RequestMethod.GET)
+    public ResponseBean buildingMapRelationGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaBuildingMapRelationService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("buildingMapRelationDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -203,17 +203,17 @@ public class TaPersonVisitRecordController extends BaseController {
     
     /**
      * 盘客工具分页获取访问记录
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @return
      */
     @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.GET)
-    public ResponseBean wxPersonVisitRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean wxPersonVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                 @RequestParam(value = "customerId") String customerId){
         try {
             //使用分页插件
-            IPage<TaPersonVisitRecord> pg = new Page<>(pageNum, pageSize);
+            IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
             IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getPersonVisitRecordList(pg, customerId);
             return ResponseBean.success(result);
         }catch (Exception e){

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

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaOrgCity;
 import com.huiju.estateagents.entity.TdCity;
+import com.huiju.estateagents.mapper.TaOrgCityMapper;
 import com.huiju.estateagents.service.ITdCityService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.huiju.estateagents.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -38,12 +41,15 @@ public class TdCityController extends BaseController {
     @Autowired
     public ITdCityService iTdCityService;
 
+    @Autowired
+    private TaOrgCityMapper taOrgCityMapper;
+
 
     /**
-     * 查询列表
+     * 中心端城市
      * @return
      */
-    @RequestMapping(value="/admin/tdCity",method= RequestMethod.GET)
+    @RequestMapping(value="/center/tdCity",method= RequestMethod.GET)
     public ResponseBean tdCityList(@RequestParam(value = "leveltype", required = false) String leveltype){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -56,15 +62,28 @@ public class TdCityController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 业务端城市
+     */
+    @RequestMapping(value="/admin/tdCityList/tdCity",method= RequestMethod.GET)
+    public ResponseBean adminTdCityList(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean<>();
+        List<TaOrgCity> taOrgCityList = taOrgCityMapper.selectAdminTdCityList(getOrgId(request));
+        responseBean.addSuccess(taOrgCityList);
+        return responseBean;
+    }
+
+
     /**
      * 查询列表
      * @return
      */
     @RequestMapping(value="/wx/tdCity",method= RequestMethod.GET)
-    public ResponseBean tdCityListWx(@RequestParam(value = "leveltype", required = false) String leveltype){
+    public ResponseBean tdCityListWx(@RequestParam(value = "leveltype", required = false) String leveltype,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            List<TdCity> result = iTdCityService.selectCity(leveltype, "1");
+            /**leveltype,暂时保留*/
+            List<TdCity> result = iTdCityService.selectWxCity(leveltype,getOrgId(request));
             responseBean.addSuccess(result);
         }catch (Exception e){
             logger.error("tdCityList -=- {}",e.toString());

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

@@ -201,6 +201,7 @@ public class TaBuilding implements Serializable {
     /**
      * 地图数据
      */
+    @TableField(exist = false)
     private String mapJson;
 
     /**

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

@@ -0,0 +1,51 @@
+package com.huiju.estateagents.entity;
+
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_building_map_relation")
+public class TaBuildingMapRelation implements Serializable {
+
+    @TableId(value = "map_id", type = IdType.AUTO)
+    private Integer mapId;
+
+    private static final long serialVersionUID = 1L;
+
+    private String buildingId;
+
+    private Integer orgId;
+
+    private String types;
+
+    private String data;
+
+    private String label;
+
+    @TableField(value = "`key`")
+    private String key;
+
+    private Integer status;
+
+    private LocalDateTime createDate;
+
+
+}

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

@@ -24,11 +24,18 @@ import java.util.List;
 public class TaOrgCity implements Serializable {
 
     private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
     /**
      * 省份id
      * 城市id
      */
-    private Integer id;
+    private Integer cityId;
 
     /**
      * 省市区名称
@@ -49,4 +56,10 @@ public class TaOrgCity implements Serializable {
      * 上级ID
      */
     private Integer parentid;
+
+    /**
+     * 城市首字母
+     */
+    @TableField(exist = false)
+    private String initial;
 }

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

@@ -107,5 +107,11 @@ public class TaPersonVisitRecord implements Serializable {
      */
     @TableField(exist = false)
     private String buildingName;
+    
+    /**
+     * 活动名称
+     */
+    @TableField(exist = false)
+    private String activityName;
 
 }

src/main/java/com/huiju/estateagents/job/CustomerStatisticTimeJob.java

@@ -1,17 +1,9 @@
 package com.huiju.estateagents.job;
 
 import com.huiju.estateagents.base.BaseController;
-import com.huiju.estateagents.common.DateUtils;
-import com.huiju.estateagents.service.IHelpActivityService;
-import com.huiju.estateagents.service.IHelpInitiateRecordService;
-import com.huiju.estateagents.service.IHelpRecordService;
-import com.huiju.estateagents.service.ITaBuildingDynamicService;
-import com.huiju.estateagents.service.ITaShareActivityService;
-import com.huiju.estateagents.service.ITaShareChildRecordService;
-import com.huiju.estateagents.service.ITaShareRecordService;
-import com.huiju.estateagents.statistic.service.ITaCustomerGenderStatisticService;
-import com.huiju.estateagents.statistic.service.ITaCustomerStatisticDailyService;
-import com.huiju.estateagents.statistic.service.ITaCustomerStatisticMonthlyService;
+import com.huiju.estateagents.statistic.service.ITsCustomerGenderStatisticService;
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticDailyService;
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticMonthlyService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,13 +28,13 @@ public class CustomerStatisticTimeJob extends BaseController {
     private final Logger logger = LoggerFactory.getLogger(CustomerStatisticTimeJob.class);
 
     @Autowired
-    private ITaCustomerStatisticDailyService customerStatisticDailyService;
+    private ITsCustomerStatisticDailyService customerStatisticDailyService;
     
     @Autowired
-    private ITaCustomerGenderStatisticService taCustomerGenderStatisticService;
+    private ITsCustomerGenderStatisticService taCustomerGenderStatisticService;
     
     @Autowired
-    private ITaCustomerStatisticMonthlyService customerStatisticMonthlyService;
+    private ITsCustomerStatisticMonthlyService customerStatisticMonthlyService;
 
     /**
      *

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaBuildingMapRelation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-13
+ */
+@Mapper
+public interface TaBuildingMapRelationMapper extends BaseMapper<TaBuildingMapRelation> {
+
+}

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

@@ -3,6 +3,10 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaOrgCity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -14,4 +18,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaOrgCityMapper extends BaseMapper<TaOrgCity> {
+    // 查询所有的城市排除省份
+    ArrayList<Integer> selectByIdCity(@Param("orgId") Integer orgId);
+
+    /**
+     * 根据orgid查询城市并排除省份
+     * @param orgId
+     * @return
+     */
+    List<TaOrgCity> selectAdminTdCityList(Integer orgId);
 }

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

@@ -20,4 +20,10 @@ import java.util.List;
 public interface TdCityMapper extends BaseMapper<TdCity> {
     List<TdCity> selectCity(@Param("leveltype")String leveltype,@Param("status") String status);
 
+    /**
+     *查出当前ta_org_city下的城市
+     * @param orgId
+     * @return
+     */
+    List<TdCity> selectWxCity(@Param("orgId") Integer orgId);
 }

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaBuildingMapRelation;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-13
+ */
+public interface ITaBuildingMapRelationService extends IService<TaBuildingMapRelation> {
+
+}

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

@@ -17,4 +17,6 @@ import java.util.List;
 public interface ITdCityService extends IService<TdCity> {
     List<TdCity> selectCity(String leveltype,String status);
 
+    // 微信端城市
+    List<TdCity> selectWxCity(String leveltype,Integer orgId);
 }

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaBuildingMapRelation;
+import com.huiju.estateagents.mapper.TaBuildingMapRelationMapper;
+import com.huiju.estateagents.service.ITaBuildingMapRelationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-13
+ */
+@Service
+public class TaBuildingMapRelationServiceImpl extends ServiceImpl<TaBuildingMapRelationMapper, TaBuildingMapRelation> implements ITaBuildingMapRelationService {
+
+}

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

@@ -13,6 +13,7 @@ import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.service.ITaBuildingMapRelationService;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.service.TaPosterService;
@@ -86,6 +87,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private  TaOrgMapper  taOrgMapper;
 
+    @Autowired
+    private ITaBuildingMapRelationService iTaBuildingMapRelationService;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId) {
         Page<TaBuilding> page = new Page<>();
@@ -168,6 +172,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setPosters(taPosterService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
         building.setShareContents(taShareContentService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
 
+        // 查询 周边数据
+        QueryWrapper<TaBuildingMapRelation> mapRelationQueryWrapper = new QueryWrapper<>();
+        mapRelationQueryWrapper.eq("building_id", building.getBuildingId());
+        mapRelationQueryWrapper.eq("org_id", building.getOrgId());
+        List<TaBuildingMapRelation> mapRelationList = iTaBuildingMapRelationService.list(mapRelationQueryWrapper);
+        building.setMapJson(mapRelationList.size() > 0 ? JSONObject.toJSONString(mapRelationList) : null);
+
         return ResponseBean.success(building);
     }
 
@@ -247,9 +258,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         shareActivityQueryWrapper.eq("status", 1);
         shareActivityQueryWrapper.in("activity_status", 0, 1);
         List<TaShareActivity> shareActivityList = taShareActivityMapper.selectList(shareActivityQueryWrapper);
-
         building.setShareActivityList(shareActivityList);
 
+        // 查询 周边数据
+        QueryWrapper<TaBuildingMapRelation> mapRelationQueryWrapper = new QueryWrapper<>();
+        mapRelationQueryWrapper.eq("building_id", building.getBuildingId());
+        mapRelationQueryWrapper.eq("org_id", building.getOrgId());
+        List<TaBuildingMapRelation> mapRelationList = iTaBuildingMapRelationService.list(mapRelationQueryWrapper);
+        building.setMapJson(mapRelationList.size() > 0 ? JSONObject.toJSONString(mapRelationList) : null);
 
         return ResponseBean.success(building);
     }
@@ -258,7 +274,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     public ResponseBean buildingUpdate(String parameter, Integer orgId) {
         JSONObject object= JSONObject.parseObject(parameter);
 
-        TaBuilding building = JSONObject.parseObject(parameter,TaBuilding.class);
+        TaBuilding building = object.toJavaObject(TaBuilding.class);
 
         // 先删除视频
         UpdateWrapper<TaBuilding> updateWrapper = new UpdateWrapper<>();
@@ -328,6 +344,20 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         if (CollectionUtils.isNotEmpty(buildingProjectTypeArray)) {
             taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray, building.getBuildingId());
         }
+
+        // 地图周边
+        JSONArray mapJson = object.getJSONArray("mapJson");
+        if (null != mapJson) {
+            // 先删除
+            QueryWrapper<TaBuildingMapRelation> mapRelationQueryWrapper = new QueryWrapper<>();
+            mapRelationQueryWrapper.eq("building_id", building.getBuildingId());
+            mapRelationQueryWrapper.eq("org_id", orgId);
+            iTaBuildingMapRelationService.remove(mapRelationQueryWrapper);
+
+            List<TaBuildingMapRelation> taBuildingMapRelations = mapJson.toJavaList(TaBuildingMapRelation.class);
+            insertBuildingMapRelationBeach(taBuildingMapRelations, building.getBuildingId(), orgId);
+        }
+
         return ResponseBean.success(building);
     }
 
@@ -350,7 +380,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             return ResponseBean.error("楼盘已超过最大限制", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-        TaBuilding building = JSONObject.parseObject(parameter,TaBuilding.class);
+        TaBuilding building = object.toJavaObject(TaBuilding.class);
         if(null!= object.getDate("openingDate")){
             building.setOpeningDate(DateUtils.date2LocalDateTime(object.getDate("openingDate")));
         }
@@ -401,9 +431,37 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray, building.getBuildingId());
         }
 
+        // 地图周边
+        JSONArray mapJson = object.getJSONArray("mapJson");
+        if (null != mapJson) {
+            List<TaBuildingMapRelation> taBuildingMapRelations = mapJson.toJavaList(TaBuildingMapRelation.class);
+            insertBuildingMapRelationBeach(taBuildingMapRelations, building.getBuildingId(), orgId);
+        }
+
+
         return ResponseBean.success(building);
     }
 
+    /**
+     * 批量插入 周边地图数据
+     * @param list
+     * @param buildingId
+     * @param orgId
+     * @return
+     */
+    private List<TaBuildingMapRelation> insertBuildingMapRelationBeach(List<TaBuildingMapRelation> list, String buildingId, Integer orgId) {
+        List<TaBuildingMapRelation> newList = list.stream().map(e -> {
+            e.setBuildingId(buildingId);
+            e.setOrgId(orgId);
+            e.setStatus(1);
+            e.setCreateDate(LocalDateTime.now());
+            return e;
+        }).collect(Collectors.toList());
+
+        iTaBuildingMapRelationService.saveBatch(newList);
+        return newList;
+    }
+
     @Override
     public ResponseBean buildingUpdateStatus(String parameter, Integer orgId) {
         TaBuilding  building = new TaBuilding();
@@ -449,6 +507,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         }
 
         JSONObject jsonobject = JSONObject.parseObject(parameter);
+
         //图片数组
         String imgStr = jsonobject.getString("img");
         //转集合

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

@@ -2,12 +2,18 @@ package com.huiju.estateagents.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.HelpActivity;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.mapper.HelpActivityMapper;
+import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
+import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.service.ITaPersonVisitRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +37,15 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	@Autowired
 	private TaPersonVisitRecordMapper personVisitRecordMapper;
 	
+	@Autowired
+	private TaBuildingDynamicMapper taBuildingDynamicMapper;
+	
+	@Autowired
+	private TaShareActivityMapper taShareActivityMapper;
+	
+	@Autowired
+	private HelpActivityMapper helpActivityMapper;
+	
 	/**
 	 * 分页获取客户访问记录
 	 *
@@ -42,6 +57,33 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	public IPage<TaPersonVisitRecord> getPersonVisitRecordList(IPage<TaPersonVisitRecord> pg, String customerId) {
 		TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(customerId);
 		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getPersonVisitRecordList(pg,taRecommendCustomer.getPersonId());
+		List<TaPersonVisitRecord> records = result.getRecords();
+		records.forEach(e -> {
+			//获取活动标题
+			if (e.getEventType().equals("activity") && null != e.getTargetId()){
+				TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
+				if (null != taBuildingDynamic){
+					e.setActivityName(taBuildingDynamic.getTitle());
+				}
+				
+			}
+			//获取拼团标题
+			if (e.getEventType().equals("group") && null != e.getTargetId()){
+				TaShareActivity taShareActivity = taShareActivityMapper.selectById(e.getTargetId());
+				if (null != taShareActivity){
+					e.setActivityName(taShareActivity.getActivityName());
+				}
+			}
+			//获取助力标题
+			if (e.getEventType().equals("help") && null != e.getTargetId()){
+				HelpActivity helpActivity = helpActivityMapper.selectById(e.getTargetId());
+				if (null != helpActivity){
+					e.setActivityName(helpActivity.getTitle());
+				}
+				
+			}
+		});
+		result.setRecords(records);
 		return result;
 	}
 //    @Autowired

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.TdCity;
+import com.huiju.estateagents.mapper.TaOrgCityMapper;
 import com.huiju.estateagents.mapper.TdCityMapper;
 import com.huiju.estateagents.service.ITdCityService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,4 +27,11 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
         return tdCityMapper.selectCity(leveltype, status);
     }
 
+
+    @Override
+    public List<TdCity> selectWxCity(String leveltype, Integer orgId) {
+        List<TdCity>  tdCityList= tdCityMapper.selectWxCity(orgId);
+        return tdCityList;
+    }
+
 }

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerFollowUpRecordController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -171,6 +172,8 @@ public class TaCustomerFollowUpRecordController extends BaseController {
         TaPerson person = taPersons.get(0);
         try {
             taCustomerFollowUpRecord.setFollowerId(person.getPersonId());
+            taCustomerFollowUpRecord.setCreateDate(LocalDateTime.now());
+            taCustomerFollowUpRecord.setOrgId(orgId);
             if (iTaCustomerFollowUpRecordService.save(taCustomerFollowUpRecord)){
                 responseBean.addSuccess(taCustomerFollowUpRecord);
             }else {
@@ -186,14 +189,14 @@ public class TaCustomerFollowUpRecordController extends BaseController {
     
     /**
      * 分页查询跟进记录列表
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @return
      */
     @RequestMapping(value="/wx/taCustomerFollowUpRecord",method= RequestMethod.GET)
-    public ResponseBean wxCustomerFollowUpRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean wxCustomerFollowUpRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                     @RequestParam(value ="customerId",required = true) Integer customerId,
+                                                     @RequestParam(value ="customerId",required = true) String customerId,
                                                      HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
@@ -205,7 +208,7 @@ public class TaCustomerFollowUpRecordController extends BaseController {
         TaPerson person = taPersons.get(0);
         try {
             //使用分页插件
-            IPage<TaCustomerFollowUpRecord> pg = new Page<>(pageNum, pageSize);
+            IPage<TaCustomerFollowUpRecord> pg = new Page<>(pageNumber, pageSize);
             QueryWrapper<TaCustomerFollowUpRecord> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("follower_id",person.getPersonId());
             queryWrapper.eq("org_id",orgId);
@@ -222,3 +225,4 @@ public class TaCustomerFollowUpRecordController extends BaseController {
         return responseBean;
     }
 }
+

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerGenderStatisticController.java → src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerGenderStatisticController.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
-import com.huiju.estateagents.statistic.service.ITaCustomerGenderStatisticService;
+import com.huiju.estateagents.statistic.entity.TsCustomerGenderStatistic;
+import com.huiju.estateagents.statistic.service.ITsCustomerGenderStatisticService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,12 +31,12 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
-public class TaCustomerGenderStatisticController extends BaseController {
+public class TsCustomerGenderStatisticController extends BaseController {
 
-    private final Logger logger = LoggerFactory.getLogger(TaCustomerGenderStatisticController.class);
+    private final Logger logger = LoggerFactory.getLogger(TsCustomerGenderStatisticController.class);
 
     @Autowired
-    public ITaCustomerGenderStatisticService iTaCustomerGenderStatisticService;
+    public ITsCustomerGenderStatisticService iTaCustomerGenderStatisticService;
 
 
     /**
@@ -51,11 +51,11 @@ public class TaCustomerGenderStatisticController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaCustomerGenderStatistic> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
+		    IPage<TsCustomerGenderStatistic> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TsCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
-            IPage<TaCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.page(pg, queryWrapper);
+            IPage<TsCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -71,7 +71,7 @@ public class TaCustomerGenderStatisticController extends BaseController {
      * @return
      */
     @RequestMapping(value="/taCustomerGenderStatistic",method= RequestMethod.POST)
-    public ResponseBean taCustomerGenderStatisticAdd(@RequestBody TaCustomerGenderStatistic taCustomerGenderStatistic){
+    public ResponseBean taCustomerGenderStatisticAdd(@RequestBody TsCustomerGenderStatistic taCustomerGenderStatistic){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTaCustomerGenderStatisticService.save(taCustomerGenderStatistic)){
@@ -117,7 +117,7 @@ public class TaCustomerGenderStatisticController extends BaseController {
      */
     @RequestMapping(value="/taCustomerGenderStatistic/{id}",method= RequestMethod.PUT)
     public ResponseBean taCustomerGenderStatisticUpdate(@PathVariable Integer id,
-                                        @RequestBody TaCustomerGenderStatistic taCustomerGenderStatistic){
+                                        @RequestBody TsCustomerGenderStatistic taCustomerGenderStatistic){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTaCustomerGenderStatisticService.updateById(taCustomerGenderStatistic)){
@@ -159,12 +159,12 @@ public class TaCustomerGenderStatisticController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             //查询当前小程序的男女比统计
-            QueryWrapper<TaCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
+            QueryWrapper<TsCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.eq("customer_type",customerType);
             queryWrapper.orderByDesc("create_date");
      
-            List<TaCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.list(queryWrapper);
+            List<TsCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.list(queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerStatisticDailyController.java → src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerStatisticDailyController.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
-import com.huiju.estateagents.statistic.service.ITaCustomerStatisticDailyService;
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily;
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticDailyService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,12 +31,12 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
-public class TaCustomerStatisticDailyController extends BaseController {
+public class TsCustomerStatisticDailyController extends BaseController {
 
-    private final Logger logger = LoggerFactory.getLogger(TaCustomerStatisticDailyController.class);
+    private final Logger logger = LoggerFactory.getLogger(TsCustomerStatisticDailyController.class);
 
     @Autowired
-    public ITaCustomerStatisticDailyService iTaCustomerStatisticDailyService;
+    public ITsCustomerStatisticDailyService iTaCustomerStatisticDailyService;
 
 
     /**
@@ -51,11 +51,11 @@ public class TaCustomerStatisticDailyController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaCustomerStatisticDaily> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaCustomerStatisticDaily> queryWrapper = new QueryWrapper<>();
+		    IPage<TsCustomerStatisticDaily> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TsCustomerStatisticDaily> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
-            IPage<TaCustomerStatisticDaily> result = iTaCustomerStatisticDailyService.page(pg, queryWrapper);
+            IPage<TsCustomerStatisticDaily> result = iTaCustomerStatisticDailyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -71,7 +71,7 @@ public class TaCustomerStatisticDailyController extends BaseController {
      * @return
      */
     @RequestMapping(value="/taCustomerStatisticDaily",method= RequestMethod.POST)
-    public ResponseBean taCustomerStatisticDailyAdd(@RequestBody TaCustomerStatisticDaily taCustomerStatisticDaily){
+    public ResponseBean taCustomerStatisticDailyAdd(@RequestBody TsCustomerStatisticDaily taCustomerStatisticDaily){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTaCustomerStatisticDailyService.save(taCustomerStatisticDaily)){
@@ -117,7 +117,7 @@ public class TaCustomerStatisticDailyController extends BaseController {
      */
     @RequestMapping(value="/taCustomerStatisticDaily/{id}",method= RequestMethod.PUT)
     public ResponseBean taCustomerStatisticDailyUpdate(@PathVariable Integer id,
-                                        @RequestBody TaCustomerStatisticDaily taCustomerStatisticDaily){
+                                        @RequestBody TsCustomerStatisticDaily taCustomerStatisticDaily){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTaCustomerStatisticDailyService.updateById(taCustomerStatisticDaily)){
@@ -160,7 +160,7 @@ public class TaCustomerStatisticDailyController extends BaseController {
                                                      HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            List<TaCustomerStatisticDaily> list = iTaCustomerStatisticDailyService.getDailyList(customerType,getOrgId(request));
+            List<TsCustomerStatisticDaily> list = iTaCustomerStatisticDailyService.getDailyList(customerType,getOrgId(request));
             responseBean.addSuccess(list);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerStatisticMonthlyController.java → src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerStatisticMonthlyController.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
-import com.huiju.estateagents.statistic.service.ITaCustomerStatisticMonthlyService;
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly;
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticMonthlyService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,12 +31,12 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
-public class TaCustomerStatisticMonthlyController extends BaseController {
+public class TsCustomerStatisticMonthlyController extends BaseController {
 
-    private final Logger logger = LoggerFactory.getLogger(TaCustomerStatisticMonthlyController.class);
+    private final Logger logger = LoggerFactory.getLogger(TsCustomerStatisticMonthlyController.class);
 
     @Autowired
-    public ITaCustomerStatisticMonthlyService iTaCustomerStatisticMonthlyService;
+    public ITsCustomerStatisticMonthlyService iTaCustomerStatisticMonthlyService;
 
 
     /**
@@ -51,11 +51,11 @@ public class TaCustomerStatisticMonthlyController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaCustomerStatisticMonthly> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaCustomerStatisticMonthly> queryWrapper = new QueryWrapper<>();
+		    IPage<TsCustomerStatisticMonthly> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TsCustomerStatisticMonthly> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
-            IPage<TaCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.page(pg, queryWrapper);
+            IPage<TsCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -71,7 +71,7 @@ public class TaCustomerStatisticMonthlyController extends BaseController {
      * @return
      */
     @RequestMapping(value="/taCustomerStatisticMonthly",method= RequestMethod.POST)
-    public ResponseBean taCustomerStatisticMonthlyAdd(@RequestBody TaCustomerStatisticMonthly taCustomerStatisticMonthly){
+    public ResponseBean taCustomerStatisticMonthlyAdd(@RequestBody TsCustomerStatisticMonthly taCustomerStatisticMonthly){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTaCustomerStatisticMonthlyService.save(taCustomerStatisticMonthly)){
@@ -117,7 +117,7 @@ public class TaCustomerStatisticMonthlyController extends BaseController {
      */
     @RequestMapping(value="/taCustomerStatisticMonthly/{id}",method= RequestMethod.PUT)
     public ResponseBean taCustomerStatisticMonthlyUpdate(@PathVariable Integer id,
-                                        @RequestBody TaCustomerStatisticMonthly taCustomerStatisticMonthly){
+                                        @RequestBody TsCustomerStatisticMonthly taCustomerStatisticMonthly){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTaCustomerStatisticMonthlyService.updateById(taCustomerStatisticMonthly)){
@@ -161,7 +161,7 @@ public class TaCustomerStatisticMonthlyController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             //查询月客户分析数据
-            List<TaCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.getCustomerMonthlyList(customerType, getOrgId(request));
+            List<TsCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.getCustomerMonthlyList(customerType, getOrgId(request));
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerGenderStatistic.java → src/main/java/com/huiju/estateagents/statistic/entity/TsCustomerGenderStatistic.java

@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class TaCustomerGenderStatistic implements Serializable {
+public class TsCustomerGenderStatistic implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerStatisticDaily.java → src/main/java/com/huiju/estateagents/statistic/entity/TsCustomerStatisticDaily.java

@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("ta_customer_statistic_daily")
-public class TaCustomerStatisticDaily implements Serializable {
+public class TsCustomerStatisticDaily implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -51,6 +51,11 @@ public class TaCustomerStatisticDaily implements Serializable {
      * 创建时间
      */
     private LocalDateTime createDate;
+    
+    /**
+     * 日期 格式yyyymmdd例20191111
+     */
+    private String day;
 
 
 }

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerStatisticMonthly.java → src/main/java/com/huiju/estateagents/statistic/entity/TsCustomerStatisticMonthly.java

@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("ta_customer_statistic_monthly")
-public class TaCustomerStatisticMonthly implements Serializable {
+public class TsCustomerStatisticMonthly implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/huiju/estateagents/statistic/mapper/TaCustomerGenderStatisticMapper.java → src/main/java/com/huiju/estateagents/statistic/mapper/TsCustomerGenderStatisticMapper.java

@@ -2,11 +2,10 @@ package com.huiju.estateagents.statistic.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.statistic.entity.GenderStatistic;
-import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
+import com.huiju.estateagents.statistic.entity.TsCustomerGenderStatistic;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -17,7 +16,7 @@ import java.util.Map;
  * @since 2019-11-08
  */
 @Mapper
-public interface TaCustomerGenderStatisticMapper extends BaseMapper<TaCustomerGenderStatistic> {
+public interface TsCustomerGenderStatisticMapper extends BaseMapper<TsCustomerGenderStatistic> {
 	
 	/**
 	 * 获取新增客户的男女性别比

src/main/java/com/huiju/estateagents/statistic/mapper/TaCustomerStatisticDailyMapper.java → src/main/java/com/huiju/estateagents/statistic/mapper/TsCustomerStatisticDailyMapper.java

@@ -1,13 +1,12 @@
 package com.huiju.estateagents.statistic.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -18,14 +17,14 @@ import java.util.Map;
  * @since 2019-11-08
  */
 @Mapper
-public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerStatisticDaily> {
+public interface TsCustomerStatisticDailyMapper extends BaseMapper<TsCustomerStatisticDaily> {
 	
 	/**
 	 * 获取当天跟进客户数
 	 * @param nowDate
 	 * @return
 	 */
-	List<TaCustomerStatisticDaily> getFollowUpData(@Param("nowDate") LocalDateTime nowDate);
+	List<TsCustomerStatisticDaily> getFollowUpData(@Param("nowDate") LocalDateTime nowDate);
 	
 	/**
 	 * 获取当天新增客户数
@@ -33,7 +32,7 @@ public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerSta
 	 * @param status
 	 * @return
 	 */
-	List<TaCustomerStatisticDaily> getNewCustomerData(@Param("nowDate") LocalDateTime nowDate,@Param("status") int status);
+	List<TsCustomerStatisticDaily> getNewCustomerData(@Param("nowDate") LocalDateTime nowDate, @Param("status") int status);
 	
 	/**
 	 * 获取当天到访客户数
@@ -41,7 +40,7 @@ public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerSta
 	 * @param checkin
 	 * @return
 	 */
-	List<TaCustomerStatisticDaily> getVisiteCustomerData(@Param("nowDate") LocalDateTime nowDate,@Param("checkin") int checkin);
+	List<TsCustomerStatisticDaily> getVisiteCustomerData(@Param("nowDate") LocalDateTime nowDate, @Param("checkin") int checkin);
 	
 	/**
 	 * 获取31天的统计数据
@@ -51,7 +50,7 @@ public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerSta
 	 * @param beforeDate
 	 * @return
 	 */
-	List<TaCustomerStatisticDaily> getDailyList(@Param("customerType") String customerType,@Param("orgId")  Integer orgId,@Param("nowDate")  LocalDateTime nowDate,@Param("beforeDate")  LocalDateTime beforeDate);
+	List<TsCustomerStatisticDaily> getDailyList(@Param("customerType") String customerType, @Param("orgId")  Integer orgId, @Param("nowDate")  LocalDateTime nowDate, @Param("beforeDate")  LocalDateTime beforeDate);
 	
 	int deleteNowDate(@Param("nowDate") LocalDateTime nowDate,@Param("customerType") String customerType);
 }

src/main/java/com/huiju/estateagents/statistic/mapper/TaCustomerStatisticMonthlyMapper.java → src/main/java/com/huiju/estateagents/statistic/mapper/TsCustomerStatisticMonthlyMapper.java

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.statistic.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,7 +17,7 @@ import java.util.List;
  * @since 2019-11-08
  */
 @Mapper
-public interface TaCustomerStatisticMonthlyMapper extends BaseMapper<TaCustomerStatisticMonthly> {
+public interface TsCustomerStatisticMonthlyMapper extends BaseMapper<TsCustomerStatisticMonthly> {
 	
 	/**
 	 * 获取一个月新增客户的数据插入
@@ -25,14 +25,14 @@ public interface TaCustomerStatisticMonthlyMapper extends BaseMapper<TaCustomerS
 	 * @param status
 	 * @return
 	 */
-	List<TaCustomerStatisticMonthly> getNewCustomerStatisticMonthly(@Param("nowDate") LocalDateTime nowDate,@Param("status") int status);
+	List<TsCustomerStatisticMonthly> getNewCustomerStatisticMonthly(@Param("nowDate") LocalDateTime nowDate, @Param("status") int status);
 	
 	/**
 	 * 获取一个月跟进客户数据插入
 	 * @param nowDate
 	 * @return
 	 */
-	List<TaCustomerStatisticMonthly> getFollowUpStatisticMonthly(@Param("nowDate") LocalDateTime nowDate);
+	List<TsCustomerStatisticMonthly> getFollowUpStatisticMonthly(@Param("nowDate") LocalDateTime nowDate);
 	
 	/**
 	 * 获取一个月访问客户数据插入
@@ -40,7 +40,7 @@ public interface TaCustomerStatisticMonthlyMapper extends BaseMapper<TaCustomerS
 	 * @param checkin
 	 * @return
 	 */
-	List<TaCustomerStatisticMonthly> getVisiteStatisticMonthly(@Param("nowDate") LocalDateTime nowDate,@Param("checkin") int checkin);
+	List<TsCustomerStatisticMonthly> getVisiteStatisticMonthly(@Param("nowDate") LocalDateTime nowDate, @Param("checkin") int checkin);
 	
 	/**
 	 * 获取12个月的统计数据
@@ -50,5 +50,5 @@ public interface TaCustomerStatisticMonthlyMapper extends BaseMapper<TaCustomerS
 	 * @param beforeDate
 	 * @return
 	 */
-	List<TaCustomerStatisticMonthly> getMonthlyList(@Param("customerType") String customerType,@Param("orgId") Integer orgId,@Param("nowDate") LocalDateTime nowDate,@Param("beforeDate") LocalDateTime beforeDate);
+	List<TsCustomerStatisticMonthly> getMonthlyList(@Param("customerType") String customerType, @Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate, @Param("beforeDate") LocalDateTime beforeDate);
 }

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerGenderStatisticService.java → src/main/java/com/huiju/estateagents/statistic/service/ITsCustomerGenderStatisticService.java

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.statistic.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
+import com.huiju.estateagents.statistic.entity.TsCustomerGenderStatistic;
 
 import java.time.LocalDateTime;
 
@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
  * @author jobob
  * @since 2019-11-08
  */
-public interface ITaCustomerGenderStatisticService extends IService<TaCustomerGenderStatistic> {
+public interface ITsCustomerGenderStatisticService extends IService<TsCustomerGenderStatistic> {
 	
 	/**
 	 * 每天的新增客户性别统计

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerStatisticDailyService.java → src/main/java/com/huiju/estateagents/statistic/service/ITsCustomerStatisticDailyService.java

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.statistic.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -14,7 +14,7 @@ import java.util.List;
  * @author jobob
  * @since 2019-11-08
  */
-public interface ITaCustomerStatisticDailyService extends IService<TaCustomerStatisticDaily> {
+public interface ITsCustomerStatisticDailyService extends IService<TsCustomerStatisticDaily> {
 	
 	/**
 	 * 每天的跟进客户统计
@@ -40,5 +40,5 @@ public interface ITaCustomerStatisticDailyService extends IService<TaCustomerSta
 	 * @param orgId
 	 * @return
 	 */
-	List<TaCustomerStatisticDaily> getDailyList(String customerType, Integer orgId);
+	List<TsCustomerStatisticDaily> getDailyList(String customerType, Integer orgId);
 }

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerStatisticMonthlyService.java → src/main/java/com/huiju/estateagents/statistic/service/ITsCustomerStatisticMonthlyService.java

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.statistic.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -14,7 +14,7 @@ import java.util.List;
  * @author jobob
  * @since 2019-11-08
  */
-public interface ITaCustomerStatisticMonthlyService extends IService<TaCustomerStatisticMonthly> {
+public interface ITsCustomerStatisticMonthlyService extends IService<TsCustomerStatisticMonthly> {
 	
 	/**
 	 * 每月新增客户统计，每天都更新
@@ -40,5 +40,5 @@ public interface ITaCustomerStatisticMonthlyService extends IService<TaCustomerS
 	 * @param orgId
 	 * @return
 	 */
-	List<TaCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId);
+	List<TsCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId);
 }

src/main/java/com/huiju/estateagents/statistic/service/impl/TaCustomerGenderStatisticServiceImpl.java → src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerGenderStatisticServiceImpl.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.statistic.entity.GenderStatistic;
-import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
-import com.huiju.estateagents.statistic.mapper.TaCustomerGenderStatisticMapper;
-import com.huiju.estateagents.statistic.service.ITaCustomerGenderStatisticService;
+import com.huiju.estateagents.statistic.entity.TsCustomerGenderStatistic;
+import com.huiju.estateagents.statistic.mapper.TsCustomerGenderStatisticMapper;
+import com.huiju.estateagents.statistic.service.ITsCustomerGenderStatisticService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,10 +23,10 @@ import java.util.List;
  * @since 2019-11-08
  */
 @Service
-public class TaCustomerGenderStatisticServiceImpl extends ServiceImpl<TaCustomerGenderStatisticMapper, TaCustomerGenderStatistic> implements ITaCustomerGenderStatisticService {
+public class TsCustomerGenderStatisticServiceImpl extends ServiceImpl<TsCustomerGenderStatisticMapper, TsCustomerGenderStatistic> implements ITsCustomerGenderStatisticService {
 	
 	@Autowired
-	private TaCustomerGenderStatisticMapper customerGenderStatisticMapper;
+	private TsCustomerGenderStatisticMapper customerGenderStatisticMapper;
 	
 	/**
 	 * 每天的新增客户性别统计
@@ -80,14 +80,14 @@ public class TaCustomerGenderStatisticServiceImpl extends ServiceImpl<TaCustomer
 	 */
 	private void saveBatchCustomerSexData(List<GenderStatistic> customerSexList, LocalDateTime nowDate,String customerType) {
 		//先删除在添加
-		QueryWrapper<TaCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
+		QueryWrapper<TsCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("customer_type",customerType);
 		customerGenderStatisticMapper.delete(queryWrapper);
 		
-		List<TaCustomerGenderStatistic> list = new ArrayList<>();
+		List<TsCustomerGenderStatistic> list = new ArrayList<>();
 		//划分男女未知三条数据
 		customerSexList.forEach(e -> {
-			TaCustomerGenderStatistic maleCustomer = new TaCustomerGenderStatistic();
+			TsCustomerGenderStatistic maleCustomer = new TsCustomerGenderStatistic();
 			maleCustomer.setCreateDate(nowDate);
 			maleCustomer.setGenderType(CommConstant.SEX_MALE);
 			maleCustomer.setCustomerType(customerType);
@@ -96,7 +96,7 @@ public class TaCustomerGenderStatisticServiceImpl extends ServiceImpl<TaCustomer
 			maleCustomer.setOrgId(e.getOrgId());
 			list.add(maleCustomer);
 			
-			TaCustomerGenderStatistic femaleCustomer = new TaCustomerGenderStatistic();
+			TsCustomerGenderStatistic femaleCustomer = new TsCustomerGenderStatistic();
 			femaleCustomer.setCreateDate(nowDate);
 			femaleCustomer.setGenderType(CommConstant.SEX_FEMALE);
 			femaleCustomer.setCustomerType(customerType);
@@ -105,7 +105,7 @@ public class TaCustomerGenderStatisticServiceImpl extends ServiceImpl<TaCustomer
 			femaleCustomer.setOrgId(e.getOrgId());
 			list.add(femaleCustomer);
 			
-			TaCustomerGenderStatistic unknownCustomer = new TaCustomerGenderStatistic();
+			TsCustomerGenderStatistic unknownCustomer = new TsCustomerGenderStatistic();
 			unknownCustomer.setCreateDate(nowDate);
 			unknownCustomer.setGenderType(CommConstant.SEX_UNKNOWN);
 			unknownCustomer.setCustomerType(customerType);

src/main/java/com/huiju/estateagents/statistic/service/impl/TaCustomerStatisticDailyServiceImpl.java → src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerStatisticDailyServiceImpl.java

@@ -2,17 +2,16 @@ package com.huiju.estateagents.statistic.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
-import com.huiju.estateagents.statistic.mapper.TaCustomerStatisticDailyMapper;
-import com.huiju.estateagents.statistic.service.ITaCustomerStatisticDailyService;
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily;
+import com.huiju.estateagents.statistic.mapper.TsCustomerStatisticDailyMapper;
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticDailyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -23,10 +22,10 @@ import java.util.Map;
  * @since 2019-11-08
  */
 @Service
-public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerStatisticDailyMapper, TaCustomerStatisticDaily> implements ITaCustomerStatisticDailyService {
+public class TsCustomerStatisticDailyServiceImpl extends ServiceImpl<TsCustomerStatisticDailyMapper, TsCustomerStatisticDaily> implements ITsCustomerStatisticDailyService {
 	
 	@Autowired
-	private TaCustomerStatisticDailyMapper customerStatisticDailyMapper;
+	private TsCustomerStatisticDailyMapper customerStatisticDailyMapper;
 	
 	/**
 	 * 每天的跟进客户统计
@@ -36,7 +35,7 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
 	@Override
 	public void followUpStatisticDaily(LocalDateTime nowDate) {
 		//按当前时间获取当天的跟进客户的数量，多一个客户进行多次跟进行为，只记录一次
-		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getFollowUpData(nowDate);
+		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getFollowUpData(nowDate);
 		//批量保存
 		statisticDailySaveBatch(list,nowDate,CommConstant.CUSTOMER_TYPE_FOLLOW);
 	}
@@ -49,7 +48,7 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
 	@Override
 	public void newCustomerStatisticDaily(LocalDateTime nowDate) {
 		//按当前时间获取当天的新增客户的数量，ta_recommend_customer 表的status 为1 的就是新增客户
-		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getNewCustomerData(nowDate,CommConstant.STATUS_NORMAL);
+		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getNewCustomerData(nowDate,CommConstant.STATUS_NORMAL);
 		//批量保存
 		statisticDailySaveBatch(list,nowDate,CommConstant.CUSTOMER_TYPE_NEW);
 	}
@@ -62,8 +61,8 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
 	@Override
 	public void visiteStatisticDaily(LocalDateTime nowDate) {
 		//按当前时间获取当天的到访客户的数量，同一天同一个项目只记录一次
-		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getVisiteCustomerData(nowDate,CommConstant.STATUS_NORMAL);
-		List<TaCustomerStatisticDaily> saveList = new ArrayList<>();
+		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getVisiteCustomerData(nowDate,CommConstant.STATUS_NORMAL);
+		List<TsCustomerStatisticDaily> saveList = new ArrayList<>();
 		list.forEach(e -> {
 			if (null != e.getOrgId() && !e.getOrgId().equals("null")){
 				saveList.add(e);
@@ -81,13 +80,13 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
 	 * @return
 	 */
 	@Override
-	public List<TaCustomerStatisticDaily> getDailyList(String customerType, Integer orgId) {
+	public List<TsCustomerStatisticDaily> getDailyList(String customerType, Integer orgId) {
 		//当前日期
 		LocalDateTime nowDate = LocalDateTime.now();
 		//31天前的日期
 		LocalDateTime beforeDate = nowDate.plusDays(-31);
 		//获取31天的日期数据
-		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getDailyList(customerType,orgId,nowDate,beforeDate);
+		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getDailyList(customerType,orgId,nowDate,beforeDate);
 		return list;
 	}
 	
@@ -97,13 +96,18 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
 	 * @param nowDate
 	 * @param customerType
 	 */
-	private void statisticDailySaveBatch(List<TaCustomerStatisticDaily> list, LocalDateTime nowDate, String customerType) {
+	private void statisticDailySaveBatch(List<TsCustomerStatisticDaily> list, LocalDateTime nowDate, String customerType) {
+		//格式化年月日
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+		String todayDate = nowDate.format(formatter);
+		
 		//先删除当天数据在添加防止有脏数据
 		customerStatisticDailyMapper.deleteNowDate(nowDate,customerType);
 		
 		list.forEach(e -> {
 			e.setCreateDate(nowDate);
 			e.setCustomerType(customerType);
+			e.setDay(todayDate);
 		});
 		//批量保存
 		this.saveBatch(list);

src/main/java/com/huiju/estateagents/statistic/service/impl/TaCustomerStatisticMonthlyServiceImpl.java → src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerStatisticMonthlyServiceImpl.java

@@ -3,10 +3,9 @@ package com.huiju.estateagents.statistic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
-import com.huiju.estateagents.statistic.mapper.TaCustomerStatisticMonthlyMapper;
-import com.huiju.estateagents.statistic.service.ITaCustomerStatisticMonthlyService;
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly;
+import com.huiju.estateagents.statistic.mapper.TsCustomerStatisticMonthlyMapper;
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticMonthlyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,10 +23,10 @@ import java.util.List;
  * @since 2019-11-08
  */
 @Service
-public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustomerStatisticMonthlyMapper, TaCustomerStatisticMonthly> implements ITaCustomerStatisticMonthlyService {
+public class TsCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TsCustomerStatisticMonthlyMapper, TsCustomerStatisticMonthly> implements ITsCustomerStatisticMonthlyService {
 	
 	@Autowired
-	private TaCustomerStatisticMonthlyMapper customerStatisticMonthlyMapper;
+	private TsCustomerStatisticMonthlyMapper customerStatisticMonthlyMapper;
 	
 	/**
 	 * 每月新增客户统计，每天都更新
@@ -37,7 +36,7 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
 	@Override
 	public void newCustomerStatisticMonthly(LocalDateTime nowDate) {
 		//获取当月新增客户总数
-		List<TaCustomerStatisticMonthly> newCustomerMonthList = customerStatisticMonthlyMapper.getNewCustomerStatisticMonthly(nowDate,CommConstant.STATUS_NORMAL);
+		List<TsCustomerStatisticMonthly> newCustomerMonthList = customerStatisticMonthlyMapper.getNewCustomerStatisticMonthly(nowDate,CommConstant.STATUS_NORMAL);
 		//批量插入
 		statisticMonthlySaveBatch(newCustomerMonthList,nowDate, CommConstant.CUSTOMER_TYPE_NEW);
 	}
@@ -50,7 +49,7 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
 	@Override
 	public void followUpStatisticMonthly(LocalDateTime nowDate) {
 		//获取当月跟进客户总数
-		List<TaCustomerStatisticMonthly> followUpMonthList = customerStatisticMonthlyMapper.getFollowUpStatisticMonthly(nowDate);
+		List<TsCustomerStatisticMonthly> followUpMonthList = customerStatisticMonthlyMapper.getFollowUpStatisticMonthly(nowDate);
 		statisticMonthlySaveBatch(followUpMonthList,nowDate, CommConstant.CUSTOMER_TYPE_FOLLOW);
 	}
 	
@@ -62,8 +61,8 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
 	@Override
 	public void visiteStatisticMonthly(LocalDateTime nowDate) {
 		//获取当月访问客户总数
-		List<TaCustomerStatisticMonthly> visiteMonthList = customerStatisticMonthlyMapper.getVisiteStatisticMonthly(nowDate,CommConstant.STATUS_NORMAL);
-		List<TaCustomerStatisticMonthly> newVisiteMonthList = new ArrayList<>();
+		List<TsCustomerStatisticMonthly> visiteMonthList = customerStatisticMonthlyMapper.getVisiteStatisticMonthly(nowDate,CommConstant.STATUS_NORMAL);
+		List<TsCustomerStatisticMonthly> newVisiteMonthList = new ArrayList<>();
 		visiteMonthList.forEach(e -> {
 			if (null != e.getOrgId() && !e.getOrgId().equals("null")){
 				newVisiteMonthList.add(e);
@@ -80,13 +79,13 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
 	 * @return
 	 */
 	@Override
-	public List<TaCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId) {
+	public List<TsCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId) {
 		//当前日期
 		LocalDateTime nowDate = LocalDateTime.now();
 		//12个月前的日期
 		LocalDateTime beforeDate = nowDate.plusMonths(-12);
 		//获取31天的日期数据
-		List<TaCustomerStatisticMonthly> list = customerStatisticMonthlyMapper.getMonthlyList(customerType,orgId,nowDate,beforeDate);
+		List<TsCustomerStatisticMonthly> list = customerStatisticMonthlyMapper.getMonthlyList(customerType,orgId,nowDate,beforeDate);
 		return list;
 	}
 	
@@ -96,13 +95,13 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
 	 * @param nowDate
 	 * @param customerType
 	 */
-	private void statisticMonthlySaveBatch(List<TaCustomerStatisticMonthly> list, LocalDateTime nowDate, String customerType) {
-		//格式化年月日
+	private void statisticMonthlySaveBatch(List<TsCustomerStatisticMonthly> list, LocalDateTime nowDate, String customerType) {
+		//格式化年月
 		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
 		String todayDate = nowDate.format(formatter);
 		
 		//先删除在添加
-		QueryWrapper<TaCustomerStatisticMonthly> queryWrapper = new QueryWrapper<>();
+		QueryWrapper<TsCustomerStatisticMonthly> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("customer_type",customerType);
 		queryWrapper.eq("month",todayDate);
 		customerStatisticMonthlyMapper.delete(queryWrapper);

src/main/resources/mapper/Activity.xml

@@ -30,9 +30,10 @@
             t.enlist_id AS id,
             t.dynamic_id AS activityId,
             t.create_date AS createDate,
-            IF( t.is_checkin = 1, "已签到", "未签到" ) AS `status`,
+            IF( t.is_checkin = 1, "已签到", "未签到" ) AS `joinStatus`,
             d.list_img_url AS mainImg,
             d.title,
+            d.status,
             d.start_date AS startDate,
             d.enlist_end AS endDate,
             'dynamic' AS type
@@ -58,9 +59,10 @@
         "成功未核销"
         WHEN t.STATUS = 2 THEN
         "失败"
-        END `status`,
+        END `joinStatus`,
             d.list_img AS mainImg,
             d.activity_name AS title,
+            d.status,
             d.start_time AS startDate,
             d.end_time AS endDate,
             'group' AS type
@@ -86,9 +88,10 @@
                         "成功未核销"
                         WHEN t.STATUS = 2 THEN
                         "失败"
-                    END `status`,
+                    END `joinStatus`,
             d.list_img AS mainImg,
             d.title,
+            d.status,
             d.start_date AS startDate,
             d.end_date AS endDate,
             'help' AS type

src/main/resources/mapper/HelpActivityMapper.xml

@@ -61,6 +61,7 @@
                 a.city_id as cityId,
 				a.help_activity_id as activityId,
 				a.img as img,
+                a.banner_list_img as bannerListImg,
 				1 AS type
 			FROM
 				ta_help_activity a
@@ -82,6 +83,7 @@
                     s.city_id as cityId,
 					s.group_activity_id as activityId,
 					s.main_img as img,
+                    s.banner_list_img as bannerListImg,
 					2 AS type
 				FROM
 					ta_share_activity s

src/main/resources/mapper/TaBuildingMapRelationMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.ta.mapper.TaBuildingMapRelationMapper">
+
+</mapper>

src/main/resources/mapper/TaOrgCity.xml

@@ -1,4 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaOrgCityMapper">
+    <select id="selectByIdCity"  resultType="int">
+        select city_id from ta_org_city where  parentid != 100000 and  org_id = #{orgId}
+    </select>
+
+    <select id="selectAdminTdCityList" resultType="com.huiju.estateagents.entity.TaOrgCity">
+                SELECT
+                    oc.city_id AS id,
+                    oc.`name` AS name,
+                    oc.org_id,
+                    oc.`status`,
+                    oc.parentid,
+                LEFT (c.pinyin, 1) AS initial
+                FROM
+                ta_org_city oc
+                LEFT JOIN td_city c ON oc.city_id = c.id
+                WHERE
+                oc.org_id = #{orgId}
+                and  oc.parentid  !=100000
+                and  oc.status = 1
+                ORDER BY
+                c.pinyin
+    </select>
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -607,8 +607,8 @@ FROM
 
     <select id="getMyCustStatistics" resultType="java.util.Map">
         SELECT
-            sum( IF ( STATUS = 4, 1, 0 ) ) AS followSum,
-            sum( IF ( STATUS != 4 AND STATUS != 4, 1, 0 ) ) AS clinchSum
+            sum( IF ( STATUS = 4, 1, 0 ) ) AS clinchSum,
+            sum( IF ( STATUS != 4 AND STATUS != 4, 1, 0 ) ) AS followSum
         FROM
             ta_recommend_customer
         WHERE
@@ -631,7 +631,7 @@ FROM
         <if test="type == 'follow'">
           AND STATUS != 4
             <if test="name != null and name !=''">
-                and `name` like CONCAT('%',#{name}, '%')
+                and (`name` like CONCAT('%',#{name}, '%') or phone like CONCAT('%',#{name}, '%'))
             </if>
             <if test="phone != null and phone !=''">
                 and phone like CONCAT('%',#{phone}, '%')

src/main/resources/mapper/TdCityMapper.xml

@@ -19,6 +19,33 @@ FROM
 ORDER BY
 	pinyin
     </select>
-    
+
+
+    <select id="selectWxCity" resultType="com.huiju.estateagents.entity.TdCity">
+
+        SELECT
+                    c.id,
+                    c.name,
+                    c.parentid,
+                    c.shortname,
+                    c.leveltype,
+                    c.citycode,
+                    c.zipcode,
+                    c.lng,
+                    c.lat,
+                    c.pinyin,
+                    oc.org_id,
+                    oc.`status`,
+                    LEFT (c.pinyin, 1) AS initial
+                FROM
+                ta_org_city oc
+                INNER JOIN td_city c ON oc.city_id = c.id
+                WHERE
+                oc.org_id = #{orgId}
+                and  oc.parentid  !=100000
+                and  oc.status = 1
+                ORDER BY
+                c.pinyin
+    </select>
 
 </mapper>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huiju.estateagents.statistic.mapper.TaCustomerGenderStatisticMapper">
+<mapper namespace="com.huiju.estateagents.statistic.mapper.TsCustomerGenderStatisticMapper">
 
     <select id="getNewCustomerSexCount" resultType="com.huiju.estateagents.statistic.entity.GenderStatistic">
         SELECT

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huiju.estateagents.statistic.mapper.TaCustomerStatisticDailyMapper">
+<mapper namespace="com.huiju.estateagents.statistic.mapper.TsCustomerStatisticDailyMapper">
 
     <delete id="deleteNowDate">
         delete from ta_customer_statistic_daily
@@ -8,7 +8,7 @@
         AND date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
     </delete>
 
-    <select id="getFollowUpData" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
+    <select id="getFollowUpData" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
         SELECT
             org_id,
             count( DISTINCT ( customer_id ) ) as customer_num
@@ -20,7 +20,7 @@
             org_id
     </select>
 
-    <select id="getNewCustomerData" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
+    <select id="getNewCustomerData" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
         SELECT
             org_id,
             count( customer_id ) as customer_num
@@ -32,7 +32,7 @@
         GROUP BY
             org_id
     </select>
-    <select id="getVisiteCustomerData" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
+    <select id="getVisiteCustomerData" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
         SELECT
             count( DISTINCT ( c.customer_id ) ) as customer_num,
             c.org_id
@@ -48,7 +48,7 @@
             c.org_id
     </select>
 
-    <select id="getDailyList" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
+    <select id="getDailyList" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
         SELECT
           *
         FROM

src/main/resources/mapper/statistic/TaCustomerStatisticMonthlyMapper.xml → src/main/resources/mapper/statistic/TsCustomerStatisticMonthlyMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huiju.estateagents.statistic.mapper.TaCustomerStatisticMonthlyMapper">
+<mapper namespace="com.huiju.estateagents.statistic.mapper.TsCustomerStatisticMonthlyMapper">
 
     <select id="getNewCustomerStatisticMonthly"
-            resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly">
+            resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly">
         SELECT
             org_id,
             count( customer_id ) as customer_num
@@ -17,7 +17,7 @@
     </select>
 
     <select id="getFollowUpStatisticMonthly"
-            resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly">
+            resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly">
         SELECT
             org_id,
             count( DISTINCT ( customer_id ) ) as customer_num
@@ -29,7 +29,7 @@
             org_id
     </select>
     <select id="getVisiteStatisticMonthly"
-            resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly">
+            resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly">
         SELECT
             count( DISTINCT ( c.customer_id ) ) as customer_num,
             c.org_id
@@ -44,7 +44,7 @@
         GROUP BY
             c.org_id
     </select>
-    <select id="getMonthlyList" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly">
+    <select id="getMonthlyList" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly">
         SELECT
           *
         FROM