bug fix

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

@@ -62,7 +62,7 @@ public class TaLiveActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
-                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request));
+                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request), getUserId(request));
             responseBean.addSuccess(result);
 
         } catch (Exception e) {
@@ -255,7 +255,7 @@ public class TaLiveActivityController extends BaseController {
             status = status == null ? 1 : status;
             Integer orgId = getOrgId(request);
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, orgId,
-                    liveActivityTitle, cityId, buildingId, status, null);
+                    liveActivityTitle, cityId, buildingId, status, null, null);
             responseBean.addSuccess(result);
 
         } catch (Exception e) {

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

@@ -30,7 +30,7 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
      */
     Boolean addVisitNum(@Param("id") String id);
 
-    IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg, @Param("liveActivityTitle") String liveActivityTitle, @Param("cityId") String cityId, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg, @Param("liveActivityTitle") String liveActivityTitle, @Param("cityId") String cityId, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList, @Param("userId") Integer userId);
     /**
      * 批量更新直播活动状态
      *

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

@@ -41,7 +41,7 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
      * @return
      */
     IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
-                                                      String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId);
+                                                      String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId, Integer userId);
 
     /**
      * 访问量自增

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

@@ -104,13 +104,13 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
 
     @Override
     public IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
-                                                             String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+                                                             String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId, Integer userId) {
         logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数：pageNum:{},pageSize:{},orgId:{}," +
                     "liveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{}", pageNum, pageSize,
                 liveActivityTitle, cityId, buildingId, status);
 
         IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
-        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId,taPersonBuildingListByUserId);
+        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId,taPersonBuildingListByUserId, userId);
     }
 
     @Override

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

@@ -244,8 +244,9 @@ public class ActivityStatisticController extends BaseController {
                                                @RequestParam(value = "activityId", required = false)String activityId,
                                                @RequestParam(value = "activityType", required = false)String activityType,
                                                @RequestParam(value = "buildingId", required = false)String buildingId,
+                                               @RequestParam(value = "province", required = false)String province,
                                                HttpServletRequest request) {
-        return taActivityStaticService.selectActivityAddRegistNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, getTaPersonBuildingListByUserId(request), getUserId(request));
+        return taActivityStaticService.selectActivityAddRegistNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, province, getTaPersonBuildingListByUserId(request), getUserId(request));
     }
 
     /**
@@ -259,6 +260,7 @@ public class ActivityStatisticController extends BaseController {
                                                                @RequestParam(value = "activityId", required = false)String activityId,
                                                                @RequestParam(value = "activityType", required = false)String activityType,
                                                                @RequestParam(value = "buildingId", required = false)String buildingId,
+                                                               @RequestParam(value = "province", required = false)String province,
                                                                HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -266,7 +268,7 @@ public class ActivityStatisticController extends BaseController {
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), AddRegistNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
-        List<AddRegistNum> data = taActivityStaticService.selectActivityAddRegistNumExport(getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, getTaPersonBuildingListByUserId(request), getUserId(request));
+        List<AddRegistNum> data = taActivityStaticService.selectActivityAddRegistNumExport(getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, province, getTaPersonBuildingListByUserId(request), getUserId(request));
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();

src/main/java/com/huiju/estateagents/statistic/mapper/TaActicityStaticMapper.java

@@ -196,6 +196,7 @@ public interface TaActicityStaticMapper {
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
             @Param("buildingId") String buildingId,
+            @Param("province") String province,
             @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
             @Param("userId") Integer userId
     );
@@ -208,6 +209,7 @@ public interface TaActicityStaticMapper {
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
             @Param("buildingId") String buildingId,
+            @Param("province") String province,
             @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
             @Param("userId") Integer userId
     );

src/main/java/com/huiju/estateagents/statistic/service/impl/TaActivityStaticServiceImpl.java

@@ -141,14 +141,14 @@ public class TaActivityStaticServiceImpl {
         return taActicityStaticMapper.selectActivityShareNumExport( orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sortType, colKey, taPersonBuildings, userId);
     }
 
-    public ResponseBean selectActivityAddRegistNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+    public ResponseBean selectActivityAddRegistNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, String province, List<TaPersonBuilding> taPersonBuildings, Integer userId){
         IPage<AddRegistNum> iPage = new Page<>(pageNum, pageSize);
-        IPage<AddRegistNum> data = taActicityStaticMapper.selectActivityAddRegistNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, taPersonBuildings, userId);
+        IPage<AddRegistNum> data = taActicityStaticMapper.selectActivityAddRegistNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, province, taPersonBuildings, userId);
         return ResponseBean.success(data);
     }
 
-    public List<AddRegistNum> selectActivityAddRegistNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, List<TaPersonBuilding> taPersonBuildings, Integer userId){
-        return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, taPersonBuildings, userId);
+    public List<AddRegistNum> selectActivityAddRegistNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, String province, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+        return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, province, taPersonBuildings, userId);
     }
 
     public ResponseBean selectActivityVisitNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String personId, String buildingId){

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -40,10 +40,11 @@
          and t.building_id = #{buildingId}
     </if>
     <if test="personBuildingList != null and personBuildingList.size > 0">
-        AND t.building_id in
+        AND (t.building_id in
         <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
             #{personBuilding.buildingId}
         </foreach>
+        or t.create_user = #{userId})
     </if>
         order by t.weight desc
     </select>

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

@@ -170,7 +170,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -248,7 +248,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -326,7 +326,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -376,7 +376,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -425,7 +425,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -481,7 +481,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -694,7 +694,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -961,10 +961,12 @@
             and d.name like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
-            and d.building_id in
+            and (d.building_id in
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or d.create_user = #{userId}
+            )
         </if>
         union all
         select e.live_activity_id as activityId, e.live_activity_title as activityName, "live" as activityType From
@@ -977,10 +979,12 @@
             and e.live_activity_title like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
-            and e.building_id in
+            and (e.building_id in
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or e.create_user = #{userId}
+            )
         </if>
         ) as activity
 
@@ -1169,10 +1173,12 @@
             and d.name = #{activityName}
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
-            and c.building_id in
+            and (d.building_id in
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or d.create_user = #{userId}
+            )
         </if>
         union all
         select e.live_activity_id as activityId, e.live_activity_title as activityName, "live" as activityType From
@@ -1185,10 +1191,12 @@
             and e.live_activity_title = #{activityName}
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
-            and e.building_id in
+            and (e.building_id in
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or e.create_user = #{userId}
+            )
         </if>
         ) as activity
 
@@ -1416,7 +1424,7 @@
         <if test="activityType != null and activityType != ''">
             and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
         </if>
-        and t.org_id = #{orgId} group by t.share_person ) t
+        and t.org_id = #{orgId} ) t
         left join ta_person a on t.share_person = a.person_id
         left join ta_person b on t.share_person = b.user_id
         ) as visitNum on visitNum.person_id = person.person_id
@@ -1440,6 +1448,7 @@
         left join ta_person a on t.share_person = a.person_id
         left join ta_person b on t.share_person = b.user_id
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
+        group by person.person_id
         <if test="colKey == null or colKey == ''">
             order by person.create_date desc
         </if>
@@ -1555,7 +1564,7 @@
         <if test="activityType != null and activityType != ''">
             and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
         </if>
-        and t.org_id = #{orgId} group by t.share_person ) t
+        and t.org_id = #{orgId} ) t
         left join ta_person a on t.share_person = a.person_id
         left join ta_person b on t.share_person = b.user_id
         ) as visitNum on visitNum.person_id = person.person_id
@@ -1579,6 +1588,7 @@
         left join ta_person a on t.share_person = a.person_id
         left join ta_person b on t.share_person = b.user_id
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
+        group by person.person_id
         <if test="colKey == null or colKey == ''">
             order by person.create_date desc
         </if>
@@ -1784,14 +1794,14 @@
         a.nickname, a.phone,
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
-        b1.scene_name as personFrom,
+        b1.scene_alias as personFrom,
         GROUP_CONCAT(c.name) as realtyConsultant,
         ifnull(d.phone, d.tel) as realtyConsultantPhone,
         ifnull(e.nickname, f.user_name) as sharePersonName,
         ifnull(e.phone, e.tel) as sharePersonPhone
         FROM ta_share_person_from t
         left join ta_person a on t.person_id = a.person_id
-        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = 84 and b.is_first_time =1
+        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId} and b.is_first_time =1
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         left join ta_recommend_customer c on c.person_id = t.person_id
         left join ta_person d on c.recommend_person = d.person_id
@@ -1808,6 +1818,9 @@
         <if test="activityType != null and activityType != ''">
             and t.target_type = concat(#{activityType}, '_share')
         </if>
+        <if test="province != null and province != ''">
+            and a.province like concat('%', #{province}, '%')
+        </if>
         <if test="personFrom != null and personFrom != ''">
             and b.scene_type = #{personFrom}
         </if>
@@ -1823,14 +1836,14 @@
         a.nickname, a.phone,
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
-        b1.scene_name as personFrom,
+        b1.scene_alias as personFrom,
         GROUP_CONCAT(c.name) as realtyConsultant,
         ifnull(d.phone, d.tel) as realtyConsultantPhone,
         ifnull(e.nickname, f.user_name) as sharePersonName,
         ifnull(e.phone, e.tel) as sharePersonPhone
         FROM ta_share_person_from t
         left join ta_person a on t.person_id = a.person_id
-        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = 84 and b.is_first_time =1
+        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId} and b.is_first_time =1
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         left join ta_recommend_customer c on c.person_id = t.person_id
         left join ta_person d on c.recommend_person = d.person_id
@@ -1847,6 +1860,9 @@
         <if test="activityType != null and activityType != ''">
             and t.target_type = concat(#{activityType}, '_share')
         </if>
+        <if test="province != null and province != ''">
+            and a.province like concat('%', #{province}, '%')
+        </if>
         <if test="personFrom != null and personFrom != ''">
             and b.scene_type = #{personFrom}
         </if>