report

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

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

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

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

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

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

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

@@ -0,0 +1,53 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 项目报表设置 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaBuildingReport implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设置ID
+     */
+    @TableId(value = "setting_id", type = IdType.AUTO)
+    private Integer settingId;
+
+    /**
+     * 报表编码
+     */
+    private String reportCode;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/main/resources/mapper/TaBuildingReportMapper.xml

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

src/main/resources/mapper/TdReportMapper.xml

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