bug

src/main/java/com/yunzhi/marketing/controller/TaRecommendCustomerController.java

@@ -578,7 +578,7 @@ public class TaRecommendCustomerController extends BaseController {
     public ResponseBean getCustomersIRecommended(@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId, HttpServletRequest request) {
         Integer orgId = getOrgId(request);
         try {
-            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber, pageSize, customerId, orgId, getTaPersonBuildingListByUserId(request),null,null,null));
+            return ResponseBean.success(taRecommendCustomerService.getCustomersRecommended(pageNumber, pageSize, customerId, orgId, getTaPersonBuildingListByUserId(request),null,null,null));
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/yunzhi/marketing/excel/TaActivityDynamicEnlistExport.java

@@ -37,26 +37,26 @@ public class TaActivityDynamicEnlistExport implements Serializable {
     @ExcelProperty(value = "报名时间", index = 3)
     private Date createDate;
 
-    /**
-     * 推广人
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "引流人", index = 4)
-    private String sharePersonName;
-
-    /*
-     * 公司
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "公司", index = 5)
-    private String orgName;
-
-    /**
-     * 公司
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "签到状态", index = 6)
-    private String isCheckin;
+//    /**
+//     * 推广人
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "引流人", index = 4)
+//    private String sharePersonName;
+//
+//    /*
+//     * 公司
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "公司", index = 5)
+//    private String orgName;
+//
+//    /**
+//     * 公司
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "签到状态", index = 6)
+//    private String isCheckin;
 
 
 

src/main/java/com/yunzhi/marketing/mapper/TaRecommendCustomerMapper.java

@@ -312,4 +312,6 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @return
      */
     IPage<TaRecommendCustomerPO> getMarkingCustList(IPage<TaRecommendCustomerPO> page,@Param("keywords") String keywords,@Param("buildingId") String buildingId);
+
+    IPage<TaRecommendCustomerPO> getCustomersRecommended(IPage<TaRecommendCustomerPO> page, @Param("customerId") String customerId, @Param("status") Integer status, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("startDate") LocalDateTime startDate,@Param("endDate") LocalDateTime endDate);
 }

src/main/java/com/yunzhi/marketing/service/ITaRecommendCustomerService.java

@@ -55,6 +55,8 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     TaRecommendCustomer getCustomerById(String customerId);
 
+    IPage<TaRecommendCustomerPO> getCustomersRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, LocalDateTime startDate,LocalDateTime endDate,Integer status);
+
     IPage<TaRecommendCustomerPO> getCustomersIRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, LocalDateTime startDate,LocalDateTime endDate,Integer status);
 
     TaRecommendCustomer newByPerson(TaPerson person);

src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java

@@ -1366,6 +1366,30 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         return customersIRecommended;
     }
 
+    @Override
+    public IPage<TaRecommendCustomerPO> getCustomersRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, LocalDateTime startDate,LocalDateTime endDate,Integer status) {
+
+//        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+        // todo
+        // 此处可能不是 person_id 而是 recommend_person
+        IPage<TaRecommendCustomerPO> page = new Page<>(pageNumber, pageSize);
+        IPage<TaRecommendCustomerPO> customersIRecommended = taRecommendCustomerMapper.getCustomersRecommended(page, customerId, status, orgId, taPersonBuildingList, startDate, endDate);
+        List<TaRecommendCustomerPO> records = customersIRecommended.getRecords();
+        records.forEach(e -> {
+            LambdaQueryWrapper<BuildingChannel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(BuildingChannel::getBuildingId,e.getBuildingId());
+            lambdaQueryWrapper.last("limit 1");
+            BuildingChannel buildingChannel = buildingChannelMapper.selectOne(lambdaQueryWrapper);
+
+            if (null != buildingChannel) {
+                Integer expirationDay = buildingChannel.getExpirationDate();
+                LocalDateTime expirationDate = e.getCreateDate().plusDays(expirationDay);
+                e.setExpirationDate(expirationDate);
+            }
+        });
+        return customersIRecommended;
+    }
+
     @Override
     public TaRecommendCustomer newByPerson(TaPerson person) {
         // 没有手机号, 暂时不生成客户信息

src/main/java/com/yunzhi/marketing/xlk/controller/PcIndexStatisticsController.java

@@ -86,6 +86,7 @@ public class PcIndexStatisticsController extends BaseController {
      * 项目排行统计图
      * @return
      */
+    @ApiOperation(value = "admin-项目排行统计图", notes = "admin-项目排行统计图")
     @GetMapping(value = "/admin/statistics/barList")
     public ResponseBean selectBuildingBar(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDateTime endDate,
@@ -100,4 +101,28 @@ public class PcIndexStatisticsController extends BaseController {
         pcStatisticsDTO.setCityId(cityId);
         return pcStatisticsService.getStatsBarList(taUser, pcStatisticsDTO);
     }
+
+    /**
+     * 活动统计
+     * @return
+     */
+    @ApiOperation(value = "admin-活动统计", notes = "admin-活动统计")
+    @GetMapping(value = "/admin/statistics/activityList")
+    public ResponseBean selectActivityList(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
+                                          @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDateTime endDate,
+                                          @RequestParam(value = "buildingId", required = false) String buildingId,
+                                           @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                          HttpServletRequest request) {
+        Integer userId = getUserId(request);
+        TaUser taUser = iTaUserService.getById(userId);
+        PcStatisticsDTO pcStatisticsDTO = new PcStatisticsDTO();
+        pcStatisticsDTO.setOrgId(taUser.getOrgId());
+        pcStatisticsDTO.setStartTime(startDate);
+        pcStatisticsDTO.setEndTime(endDate);
+        pcStatisticsDTO.setBuildingId(buildingId);
+        pcStatisticsDTO.setPageNum(pageNum);
+        pcStatisticsDTO.setPageSize(pageSize);
+        return pcStatisticsService.selectActivityList(taUser, pcStatisticsDTO);
+    }
 }

src/main/java/com/yunzhi/marketing/xlk/dto/PcStatisticsDTO.java

@@ -33,4 +33,14 @@ public class PcStatisticsDTO {
      * 结束时间
      */
     private LocalDateTime endTime;
+
+    /**
+     * 楼盘id
+     *
+     */
+    private String buildingId;
+
+    private Integer pageSize;
+
+    private Integer pageNum;
 }

src/main/java/com/yunzhi/marketing/xlk/mapper/PcStatisticsMapper.java

@@ -1,7 +1,9 @@
 package com.yunzhi.marketing.xlk.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
 import com.yunzhi.marketing.xlk.dto.PcStatisticsDTO;
+import com.yunzhi.marketing.xlk.vo.PcStatisticsActivityVO;
 import com.yunzhi.marketing.xlk.vo.PcStatisticsGenderVO;
 import com.yunzhi.marketing.xlk.vo.PcStatisticsLeaderboardVO;
 import com.yunzhi.marketing.xlk.vo.PcStatisticsVO;
@@ -92,4 +94,12 @@ public interface PcStatisticsMapper {
      * @return
      */
     List<PcStatisticsLeaderboardVO> getSuccessLeaderboard(@Param("params") PcStatisticsDTO pcStatisticsDTO);
+
+    /**
+     * 活动列表
+     * @param page
+     * @param pcStatisticsDTO
+     * @return
+     */
+    IPage<PcStatisticsActivityVO> selectActivityList(IPage<PcStatisticsActivityVO> page,@Param("params") PcStatisticsDTO pcStatisticsDTO);
 }

src/main/java/com/yunzhi/marketing/xlk/service/IPcStatisticsService.java

@@ -41,4 +41,12 @@ public interface IPcStatisticsService {
      * @return
      */
     ResponseBean getStatsBarList(TaUser taUser, PcStatisticsDTO pcStatisticsDTO);
+
+    /**
+     * 获取活动列表接口
+     * @param taUser
+     * @param pcStatisticsDTO
+     * @return
+     */
+    ResponseBean selectActivityList(TaUser taUser, PcStatisticsDTO pcStatisticsDTO);
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/IPcStatisticsServiceimpl.java

@@ -1,15 +1,20 @@
 package com.yunzhi.marketing.xlk.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.center.taUser.entity.TaTagUser;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.dto.StatisticsDTO;
+import com.yunzhi.marketing.entity.TaRecommendCustomer;
 import com.yunzhi.marketing.xlk.dto.PcStatisticsDTO;
 import com.yunzhi.marketing.xlk.entity.Institution;
 import com.yunzhi.marketing.xlk.mapper.InstitutionMapper;
 import com.yunzhi.marketing.xlk.mapper.PcStatisticsMapper;
 import com.yunzhi.marketing.xlk.service.IInstitutionService;
 import com.yunzhi.marketing.xlk.service.IPcStatisticsService;
+import com.yunzhi.marketing.xlk.vo.PcStatisticsActivityVO;
 import com.yunzhi.marketing.xlk.vo.PcStatisticsGenderVO;
 import com.yunzhi.marketing.xlk.vo.PcStatisticsLeaderboardVO;
 import com.yunzhi.marketing.xlk.vo.PcStatisticsVO;
@@ -149,4 +154,21 @@ public class IPcStatisticsServiceimpl implements IPcStatisticsService {
         map.put("successList",successList);
         return ResponseBean.success(map);
     }
+
+    /**
+     * 获取活动列表接口
+     *
+     * @param taUser
+     * @param pcStatisticsDTO
+     * @return
+     */
+    @Override
+    public ResponseBean selectActivityList(TaUser taUser, PcStatisticsDTO pcStatisticsDTO) {
+        Institution institution = institutionMapper.selectById(taUser.getInstitutionId());
+        pcStatisticsDTO.setInstitutionCode(institution.getInstitutionCode());
+
+        IPage<PcStatisticsActivityVO> page = new Page<>(pcStatisticsDTO.getPageNum(),pcStatisticsDTO.getPageSize());
+        IPage<PcStatisticsActivityVO> result = pcStatisticsMapper.selectActivityList(page,pcStatisticsDTO);
+        return ResponseBean.success(result);
+    }
 }

src/main/java/com/yunzhi/marketing/xlk/vo/PcStatisticsActivityVO.java

@@ -0,0 +1,38 @@
+package com.yunzhi.marketing.xlk.vo;
+
+import lombok.Data;
+
+@Data
+public class PcStatisticsActivityVO {
+
+    /**
+     * 访问人数
+     */
+    private Integer visitPersonNum;
+
+    /**
+     * 访问次数
+     */
+    private Integer visitNum;
+
+    /**
+     * 报名人数
+     */
+    private Integer signNum;
+
+    /**
+     * 楼盘id
+     *
+     */
+    private String buildingId;
+
+    /**
+     * 活动id
+     */
+    private String dynamicId;
+
+    /**
+     * 活动标题
+     */
+    private String title;
+}

src/main/resources/mapper/TaPersonMapper.xml

@@ -520,7 +520,7 @@ FROM
         p.*,
         COUNT(rc.person_id) AS recommendCount
         from ta_channel_person tch
-        left join  ta_person p on  tch.person_id = p.person_id and p.person_type = 'estate agent' and tch.status = 1
+        left join  ta_person p on  tch.person_id = p.person_id and p.person_type in ( 'estate agent', 'channel agent') and tch.status = 1
         LEFT JOIN ta_recommend_customer rc ON p.person_id = rc.person_id
         <where>
         <if test="name !=null and name !=''">

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -1041,4 +1041,33 @@ FROM
             and t.name like CONCAT('%',#{keywords}, '%')
         </if>
     </select>
+    <select id="getCustomersRecommended" resultType="com.yunzhi.marketing.po.TaRecommendCustomerPO">
+        select a.customer_id AS id,
+        a.NAME,
+        a.phone,
+        a.picture,
+        a.sex,
+        a.building_id AS buildingId,
+        "customer" AS type,
+        a.create_date as createDate,
+        a.realty_consultant AS consultant,
+        a.STATUS AS customerStatus,
+        NULL AS channelStatus,
+        b.avatarurl
+        from ta_recommend_customer a left join ta_person b on a.person_id = b.person_id
+        where a.recommend_person = #{customerId}
+        <if test="status != null and status !=''">
+            and a.status = #{status}
+        </if>
+        <if test="startDate != null or endDate != null">
+            AND a.create_date BETWEEN #{startDate} and #{endDate}
+        </if>
+        and a.org_id = #{orgId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND a.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
+    </select>
 </mapper>

src/main/resources/mapper/xlk/PcStatisticsMapper.xml

@@ -69,7 +69,7 @@
             LEFT JOIN xlk_institution i ON b.institution_id = i.institution_id
         WHERE
             b.STATUS > 0
-            AND b.org_id = 1
+            AND b.org_id = #{params.orgId}
             AND b.verify_status = 1
             AND ( b.realty_consultant IS NULL OR b.realty_consultant = '' )
             AND b.building_id IS NOT NULL
@@ -98,7 +98,7 @@
         LEFT JOIN xlk_institution i ON b.institution_id = i.institution_id
         WHERE
             b.STATUS > 0
-        AND b.org_id = 1
+        AND b.org_id = #{params.orgId}
         AND b.verify_status = 1
         AND b.realty_consultant IS NOT NULL
         AND b.realty_consultant != ''
@@ -128,7 +128,7 @@
             LEFT JOIN xlk_institution i ON d.institution_id = i.institution_id
         WHERE
             a.tagert_type = 'project'
-            AND d.org_id = 1
+            AND d.org_id = #{params.orgId}
             AND a.be_uv != "undefined"
         <if test="params.cityId != null">
             and d.city_id = #{params.cityId}
@@ -157,7 +157,7 @@
         LEFT JOIN xlk_institution i ON b.institution_id = i.institution_id
         WHERE
             b.STATUS > 3
-        AND b.org_id = 1
+        AND b.org_id = #{params.orgId}
         AND b.verify_status = 1
         AND b.building_id IS NOT NULL
         <if test="params.cityId != null">
@@ -174,4 +174,56 @@
         ORDER BY num desc
         LIMIT 6
     </select>
+    <select id="selectActivityList" resultType="com.yunzhi.marketing.xlk.vo.PcStatisticsActivityVO">
+        SELECT
+            p.visit_num,
+            v.visit_person_num,
+            d.sign_num,
+            t.title,
+            t.dynamic_id,
+            t.building_id
+        FROM
+        ta_building_dynamic t
+        LEFT JOIN (
+            SELECT
+            count( * ) AS visit_num,
+            a.target_id
+            FROM
+            ta_person_visit_record a
+            WHERE
+            a.event_type = 'activity'
+            AND a.`event` = 'detail'
+            AND a.org_id = #{params.orgId}
+            GROUP BY
+            a.target_id
+        ) p ON t.dynamic_id = p.target_id
+        LEFT JOIN (
+        SELECT
+        count( DISTINCT ( a.person_id ) ) AS visit_person_num,
+        a.target_id
+        FROM
+        ta_person_visit_record a
+        WHERE
+        a.event_type = 'activity'
+        AND a.`event` = 'detail'
+        AND a.org_id = #{params.orgId}
+        GROUP BY
+        a.target_id
+        ) v ON t.dynamic_id = v.target_id
+        LEFT JOIN ( SELECT COUNT( 1 ) AS sign_num, dynamic_id FROM ta_activity_dynamic_enlist GROUP BY dynamic_id ) d ON t.dynamic_id = d.dynamic_id
+        LEFT JOIN xlk_institution i ON b.institution_id = i.institution_id
+        where
+        t.org_id = #{params.orgId}
+        <if test="params.startTime != null">
+            and  TO_DAYS(t.create_date) >= TO_DAYS(#{params.startTime})
+        </if>
+        <if test="params.endTime != null">
+            and  TO_DAYS(t.create_date) &lt;= TO_DAYS(#{params.endTime})
+        </if>
+        <if test="params.buildingId != null and params.buildingId != ''">
+            and  t.building_id = #{params.buildingId}
+        </if>
+        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')
+        order by t.create_date desc
+    </select>
 </mapper>