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

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

                                          @RequestParam(value = "shareType", required = false)String shareType,
                                          @RequestParam(value = "personType", required = false)String personType,
                                          @RequestParam(value = "phone", required = false)String phone,
-                                         Integer salesBatchId, HttpServletRequest request){
+                                         @RequestParam(value = "salesBatchId")String salesBatchId, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (salesBatchId == null){

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

         }
         return responseBean;
     }
+
+    /**
+     * 根据id查询对象
+     */
+    @RequestMapping(value="api/admin/taHouseVisit",method= RequestMethod.GET)
+    public ResponseBean taSharePersonFromVisit(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                               @RequestParam(value = "sceneType", required = false)String sceneType,
+                                               @RequestParam(value = "personType", required = false)String personType,
+                                               @RequestParam(value = "phone", required = false)String phone,
+                                               @RequestParam(value = "salesBatchId")String salesBatchId, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (salesBatchId == null){
+                return ResponseBean.success("");
+            }
+            responseBean = iTaSharePersonFromService.selectHouseVisitList(pageNum, pageSize, getOrgId(request), personType, sceneType, phone, salesBatchId);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareCountList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
     private Boolean isFirstTime;
 
+    @TableField(exist = false)
+    private String nameOrnick;
 
+    @TableField(exist = false)
+    private String sceneName;
+
+    @TableField(exist = false)
+    private String name;
+
+    @TableField(exist = false)
+    private String phone;
+
+    @TableField(exist = false)
+    private String photoOravatar;
 }

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

  */
 @Mapper
 public interface TaShareMapper extends BaseMapper<TaShare> {
-    List<TaShare> selectHouseShareList(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("shareType")String shareType, @Param("phone")String phone, @Param("saleBatchId")Integer saleBatchId);
+    List<TaShare> selectHouseShareList(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("shareType")String shareType, @Param("phone")String phone, @Param("saleBatchId")String saleBatchId);
 }

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

 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaSharePersonFrom;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  *   Mapper 接口
 @Mapper
 public interface TaSharePersonFromMapper extends BaseMapper<TaSharePersonFrom> {
     Integer countViewNum(@Param("userId") Integer userId, @Param("orgId")Integer orgId, @Param("personId")String personId, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate);
+    List<TaSharePersonFrom> selectHouseVisitList(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("sceneType")String sceneType, @Param("phone")String phone, @Param("saleBatchId")String saleBatchId);
 }

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

      * @return
      */
     TaSharePersonFrom addSharePersonRecord(String personId, Integer orgId, String from, String recommender, String targetId);
+
+    ResponseBean selectHouseVisitList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String sceneType, String phone, String saleBatchId);
 }

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

 
     void makeSure(String openid, String typeOf, String id, Integer orgId);
 
-    ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer saleBatchId);
+    ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, String saleBatchId);
 }

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

 package com.huiju.estateagents.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
         taSharePersonFromMapper.insert(taSharePersonFrom);
         return taSharePersonFrom;
     }
+
+    @Override
+    public ResponseBean selectHouseVisitList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String sceneType, String phone, String saleBatchId) {
+        Page page = new Page(pageNum,pageSize);
+        // 分页查询
+        List<TaSharePersonFrom> list = taSharePersonFromMapper.selectHouseVisitList(page, orgId, personType, sceneType, phone, saleBatchId);
+//        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(saleBatchId);
+//        list.forEach(e -> {
+//            e.setSalesBatchName(taSalesBatch.getSalesBatchName());
+//        });
+        page.setRecords(list);
+        return ResponseBean.success(page);
+    }
 }

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

     }
 
     @Override
-    public ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer saleBatchId) {
+    public ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, String saleBatchId) {
         Page page = new Page(pageNum,pageSize);
         // 分页查询
         List<TaShare> list = taShareMapper.selectHouseShareList(page, orgId, personType, shareType, phone, saleBatchId);

src/main/resources/mapper/TaShareMapper.xml

 <mapper namespace="com.huiju.estateagents.mapper.TaShareMapper">
 
     <select id="selectHouseShareList" resultType="com.huiju.estateagents.entity.TaShare">
-      select a.avatarurl as photoOravatar, a.nickname, a.name, a.phone, a.person_type, t.create_date From ta_share t
+      select a.avatarurl as photoOravatar, a.nickname as nameOrnick, a.name, a.phone, a.person_type, t.create_date From ta_share t
       left join ta_person a on t.person_id = a.person_id
       where a.org_id = #{orgId}
       <if test="personType != null and personType != ''">

src/main/resources/mapper/TaSharePersonFromMapper.xml

         GROUP BY t.person_id
       ) t
     </select>
+
+    <select id="selectHouseVisitList" resultType="com.huiju.estateagents.entity.TaSharePersonFrom">
+        select c.avatarurl as photoOravatar, c.nickname as nameOrnick, c.name, c.phone, c.person_type as sharePersonType, t.create_date, b.scene_type as sceneName
+        From ta_share_person_from t
+        LEFT JOIN ta_person_from_record a on t.person_id = a.person_id
+        left join td_wx_dict b on a.scene_id = b.scene_id
+        left join ta_person c on t.person_id = c.person_id
+        where a.org_id = #{orgId}
+        <if test="personType != null and personType != ''">
+            and c.person_Type = #{personType}
+        </if>
+        <if test="sceneType != null and sceneType != ''">
+            and b.scene_type = #{sceneType}
+        </if>
+        <if test="phone != null and phone != ''">
+            and c.phone = #{phone}
+        </if>
+        GROUP BY t.target_id,t.target_type,t.person_id,t.share_person
+        order by t.create_date desc
+    </select>
 </mapper>