新需求

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

@@ -80,4 +80,25 @@ public class TaShareController extends BaseController {
         }
         return responseBean;
     }
+
+    @RequestMapping(value = "/admin/taLiveShare", method = RequestMethod.GET)
+    public ResponseBean taLiveShare(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "shareType", required = false)String shareType,
+                                         @RequestParam(value = "personType", required = false)String personType,
+                                         @RequestParam(value = "phone", required = false)String phone,
+                                         @RequestParam(value = "liveActivityId")Integer liveActivityId, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (liveActivityId == null){
+                return ResponseBean.success("");
+            }
+            responseBean = taShareService.selectLiveShareList(pageNum, pageSize, getOrgId(request), personType, shareType, phone, liveActivityId);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareCountList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -19,4 +19,7 @@ import java.util.List;
 @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> selectLiveShareList(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("shareType")String shareType, @Param("phone")String phone, @Param("saleBatchId")Integer saleBatchId);
+
 }

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

@@ -21,4 +21,6 @@ public interface ITaShareService extends IService<TaShare> {
     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 selectLiveShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer liveActivityId);
 }

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

@@ -51,6 +51,9 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     @Autowired
     private TaSalesBatchMapper taSalesBatchMapper;
 
+    @Autowired
+    private TaLiveActivityMapper taLiveActivityMapper;
+
     @Resource
     private ApplicationContext applicationContext;
 
@@ -143,6 +146,19 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         return ResponseBean.success(result);
     }
 
+    @Override
+    public ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer saleBatchId) {
+        Page page = new Page(pageNum,pageSize);
+        // 分页查询
+        List<TaShare> list = taShareMapper.selectHouseShareList(page, orgId, personType, shareType, phone, saleBatchId);
+        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(saleBatchId);
+        list.forEach(e -> {
+            e.setSalesBatchName(taSalesBatch.getSalesBatchName());
+        });
+        page.setRecords(list);
+        return ResponseBean.success(page);
+    }
+
     @Override
     public void makeSure(String openid, String typeOf, String id, Integer orgId) {
         // 查找分享记录
@@ -186,13 +202,13 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     }
 
     @Override
-    public ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer saleBatchId) {
+    public ResponseBean selectLiveShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer liveActivityId) {
         Page page = new Page(pageNum,pageSize);
         // 分页查询
-        List<TaShare> list = taShareMapper.selectHouseShareList(page, orgId, personType, shareType, phone, saleBatchId);
-        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(saleBatchId);
+        List<TaShare> list = taShareMapper.selectLiveShareList(page, orgId, personType, shareType, phone, liveActivityId);
+        TaLiveActivity taLiveActivity = taLiveActivityMapper.selectById(liveActivityId);
         list.forEach(e -> {
-            e.setSalesBatchName(taSalesBatch.getSalesBatchName());
+            e.setSalesBatchName(taLiveActivity.getLiveActivityTitle());
         });
         page.setRecords(list);
         return ResponseBean.success(page);

src/main/resources/mapper/TaShareMapper.xml

@@ -20,4 +20,23 @@
       </if>
         order by t.create_date desc
     </select>
+
+    <select id="selectLiveShareList" resultType="com.huiju.estateagents.entity.TaShare">
+        select a.avatarurl as photoOravatar, a.nickname as nameOrnick, a.name, a.phone, a.person_type, t.tagert_type, t.create_date From ta_share_count t
+        left join ta_person a on t.person_id = a.person_id
+        left join td_live_dict b on t.be_share = b.live_activity_id
+        where a.org_id = #{orgId}
+        and t.tagert_type in ('livePost','liveApp')
+        and b.live_activity_id = #{liveActivityId}
+        <if test="personType != null and personType != ''">
+            and a.person_Type = #{personType}
+        </if>
+        <if test="shareType != null and shareType != ''">
+            and t.tagert_type = #{shareType}
+        </if>
+        <if test="phone != null and phone != ''">
+            and a.phone = #{phone}
+        </if>
+        order by t.create_date desc
+    </select>
 </mapper>