bug fix

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

@@ -23,7 +23,7 @@ public interface TaShareCountMapper extends BaseMapper<TaShareCount> {
      * @param personId
      * @return
      */
-    Integer countShare(@Param("personId") String personId, @Param("orgId")Integer orgId);
+    Integer countShare(@Param("personId") String personId, @Param("orgId")Integer orgId, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate);
 
     /**
      * 根据条件查询分享内容

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

@@ -15,5 +15,5 @@ import org.apache.ibatis.annotations.Param;
  */
 @Mapper
 public interface TaSharePersonFromMapper extends BaseMapper<TaSharePersonFrom> {
-    Integer countViewNum(@Param("userId") Integer userId, @Param("orgId")Integer orgId, @Param("personId")String personId);
+    Integer countViewNum(@Param("userId") Integer userId, @Param("orgId")Integer orgId, @Param("personId")String personId, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate);
 }

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

@@ -330,20 +330,20 @@ public class StatisticalServiceImpl implements IStatisticalService {
     @Override
     public ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate) {
         ResponseBean responseBean = new ResponseBean();
-//        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFrom(orgId,startDate,endDate);
+        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFrom(orgId,startDate,endDate);
         QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
         tdWxDictQueryWrapper.groupBy("scene_type");
         List<TdWxDict> tdWxDicts = tdWxDictMapper.selectList(tdWxDictQueryWrapper);
-//        tdWxDicts.forEach(e -> {
-//            int fromSum = list.stream().filter(l -> e.getSceneType().equals(l.getSceneType())).mapToInt(TsPersonFromStatistic::getFromNum).sum();
-//            int registerSum = list.stream().filter(l -> e.getSceneType().equals(l.getSceneType())).mapToInt(TsPersonFromStatistic::getRegisteredNum).sum();
-//            e.setFromData(fromSum);
-//            e.setRegisterSum(registerSum);
-//        });
+        tdWxDicts.forEach(e -> {
+            int fromSum = list.stream().filter(l -> e.getSceneType().equals(l.getSceneType())).mapToInt(TsPersonFromStatistic::getFromNum).sum();
+            int registerSum = list.stream().filter(l -> e.getSceneType().equals(l.getSceneType())).mapToInt(TsPersonFromStatistic::getRegisteredNum).sum();
+            e.setFromData(fromSum);
+            e.setRegisterSum(registerSum);
+        });
         Map<String,Object> map = new HashMap<>();
         map.put("tdWxDicts",tdWxDicts);
-//        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectPersonFromGroupByData(orgId,startDate,endDate);
-//        map.put("list",tableList);
+        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectPersonFromGroupByData(orgId,startDate,endDate);
+        map.put("list",tableList);
         responseBean.addSuccess(map);
         return responseBean;
     }

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

@@ -49,8 +49,8 @@ public class TaPersonBuildingServiceImpl extends ServiceImpl<TaPersonBuildingMap
             QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
             taPersonQueryWrapper.eq("person_id", taPersonBuilding.getPersonId());
             TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
-            taPersonBuilding.setShareCount(taShareCountMapper.countShare(taPersonBuilding.getPersonId(), orgId));
-            taPersonBuilding.setClickNum(taPerson != null ? taSharePersonFromMapper.countViewNum(taPerson.getUserId(), taPerson.getOrgId(), taPerson.getPersonId()) : 0);
+            taPersonBuilding.setShareCount(taShareCountMapper.countShare(taPersonBuilding.getPersonId(), orgId, startCreateDate, endCreateDate));
+            taPersonBuilding.setClickNum(taPerson != null ? taSharePersonFromMapper.countViewNum(taPerson.getUserId(), taPerson.getOrgId(), taPerson.getPersonId(), startCreateDate, endCreateDate) : 0);
         }
         page.setRecords(list);
         return ResponseBean.success(page);

src/main/resources/mapper/TaShareCountMapper.xml

@@ -4,7 +4,15 @@
     <select id="countShare" resultType="java.lang.Integer">
         select count(1) from ta_share_count t
         left join ta_person a on t.person_id = a.person_id
-        where t.person_id = #{personId} and a.org_id = #{orgId}
+        where
+        t.person_id = #{personId}
+        and a.org_id = #{orgId}
+        <if test="startCreateDate != null and startCreateDate != ''">
+            and  date_format(t.create_date,'%Y-%m-%d') >= date_format(#{startCreateDate},'%Y-%m-%d')
+        </if>
+        <if test="endCreateDate != null and endCreateDate != ''">
+            and  date_format(t.create_date,'%Y-%m-%d') &lt;= date_format(#{endCreateDate},'%Y-%m-%d')
+        </if>
     </select>
     <select id="selectListByParams" resultType="com.huiju.estateagents.entity.TaShareCount">
         select
@@ -21,13 +29,13 @@
         end as shareTitle,t.create_date
 
         from ta_share_count t
-        left join ta_building_dynamic a on t.be_share = a.dynamic_id
-        left join ta_help_activity b on t.be_share = b.help_activity_id
-        left join ta_share_activity c on t.be_share = c.share_id
-        LEFT JOIN ta_drainage d on t.be_share = d.drainage_id
-        left join ta_building e on t.be_share = e.building_id
-        LEFT JOIN ta_news f on t.be_share = f.news_id
-        left JOIN ta_person g on t.be_share = g.person_id
+        left join ta_building_dynamic a on t.be_share = a.dynamic_id and t.tagert_type = 'activity'
+        left join ta_help_activity b on t.be_share = b.help_activity_id and t.tagert_type = 'help'
+        left join ta_share_activity c on t.be_share = c.share_id and t.tagert_type = 'group'
+        LEFT JOIN ta_drainage d on t.be_share = d.drainage_id and t.tagert_type = 'h5'
+        left join ta_building e on t.be_share = e.building_id and t.tagert_type = 'project'
+        LEFT JOIN ta_news f on t.be_share = f.news_id and t.tagert_type = 'news'
+        left JOIN ta_person g on t.be_share = g.person_id and t.tagert_type = 'consultant'
         where t.person_id = #{personId}
         <if test="shareType != null and shareType != ''">
             and t.tagert_type = #{shareType}
@@ -66,14 +74,14 @@
         FROM
             ta_share_person_from t
 
-        left join ta_building_dynamic g on t.target_id = g.dynamic_id
-                left join ta_help_activity b on t.target_id = b.help_activity_id
-                left join ta_share_activity c on t.target_id = c.group_activity_id
-                LEFT JOIN ta_drainage d on t.target_id = d.drainage_id
-                left join ta_building e on t.target_id = e.building_id
-                LEFT JOIN ta_news f on t.target_id = f.news_id
+        left join ta_building_dynamic g on t.target_id = g.dynamic_id and t.target_type = 'dynamic_share'
+                left join ta_help_activity b on t.target_id = b.help_activity_id and t.target_type = 'help_share'
+                left join ta_share_activity c on t.target_id = c.group_activity_id and t.target_type = 'group_share'
+                LEFT JOIN ta_drainage d on t.target_id = d.drainage_id and t.target_type = 'h5_share'
+                left join ta_building e on t.target_id = e.building_id and t.target_type = 'building_share'
+                LEFT JOIN ta_news f on t.target_id = f.news_id and t.target_type = 'news_share'
 
-        LEFT JOIN ta_person a ON t.person_id = a.person_id
+        LEFT JOIN ta_person a ON t.person_id = a.person_id and t.target_type = 'card_share'
         WHERE
             (t.share_person = (select user_id from ta_person where person_id = #{personId}) or t.share_person = #{personId})
         AND t.org_id = #{orgId}

src/main/resources/mapper/TaSharePersonFromMapper.xml

@@ -13,6 +13,12 @@
         </if>
         )
         and t.org_id = #{orgId} and t.status = 1 and t.person_id != #{personId}
+        <if test="startCreateDate != null and startCreateDate != ''">
+            and  date_format(t.create_date,'%Y-%m-%d') >= date_format(#{startCreateDate},'%Y-%m-%d')
+        </if>
+        <if test="endCreateDate != null and endCreateDate != ''">
+            and  date_format(t.create_date,'%Y-%m-%d') &lt;= date_format(#{endCreateDate},'%Y-%m-%d')
+        </if>
         GROUP BY t.person_id
       ) t
     </select>