Browse Source

营销首页修改

anderx 11 months ago
parent
commit
282b5b8b6a

+ 17 - 4
src/main/java/com/goafanti/admin/service/impl/AdminStatisticsServiceImpl.java

@@ -41,8 +41,18 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
     public Object info( String startTime, String endTime) {
         String aid=TokenManager.getAdminId();
         endTime=endTime+" 23:59:59";
+        //不再计算私有,签单,渠道
         AdminStatisticsBo adminStatisticsBo = adminMapper.adminStatisticsInfo(aid);
-        if (adminStatisticsBo==null)adminStatisticsBo=new AdminStatisticsBo();
+        if (adminStatisticsBo==null){
+            adminStatisticsBo=new AdminStatisticsBo();
+        }else {
+            //从客户中计算再添加到adminStatisticsBo
+            AdminStatisticsBo ListCount = adminMapper.selectUserCount(aid, null, null);
+            adminStatisticsBo.setPrivateSum(ListCount.getPrivateSum());
+            adminStatisticsBo.setSignSum(ListCount.getSignSum());
+            adminStatisticsBo.setChannelSum(ListCount.getChannelSum());
+        }
+
         if (adminStatisticsBo.getReceivables()==null) adminStatisticsBo.setReceivables(new BigDecimal(0));
         AdminStatisticsBo asb = adminMapper.adminStatisticsInfoByTime(aid, startTime, endTime);
         if (asb==null) {
@@ -52,11 +62,14 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
             adminStatisticsBo.setRangeFollowSum(0);
             adminStatisticsBo.setRangeOrderSum(0);
         }else {
-            adminStatisticsBo.setRangePrivateSum(asb.getRangePrivateSum());
-            adminStatisticsBo.setRangeSignSum(asb.getRangeSignSum());
-            adminStatisticsBo.setRangeChannelSum(asb.getRangeChannelSum());
             adminStatisticsBo.setRangeFollowSum(asb.getRangeFollowSum());
             adminStatisticsBo.setRangeOrderSum(asb.getRangeOrderSum());
+            //从客户中计算再添加到adminStatisticsBo
+            AdminStatisticsBo ListCount = adminMapper.selectUserCount(aid, startTime, endTime);
+            adminStatisticsBo.setRangePrivateSum(ListCount.getPrivateSum());
+            adminStatisticsBo.setRangeSignSum(ListCount.getSignSum());
+            adminStatisticsBo.setRangeChannelSum(ListCount.getChannelSum());
+
         }
         Integer rangePublicReleaseSum=adminMapper.adminStatisticsPublicReleaseByAidAndTime(aid, startTime, endTime);
         if (rangePublicReleaseSum==null)rangePublicReleaseSum=0;

+ 2 - 0
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -280,6 +280,8 @@ public interface AdminMapper {
     Admin selectByCallStaffNo(String staffNo);
 
     List<Admin> queryByTeamId(Integer id);
+
+    AdminStatisticsBo selectUserCount(@Param("aid") String aid, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }
 
 

+ 10 - 3
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -1096,7 +1096,7 @@
     </select>
     <select id="adminStatisticsInfo" resultType="com.goafanti.admin.bo.AdminStatisticsBo">
         select *
-        from (select aid ,sum(private_count)privateSum ,sum(channel_count)channelSum ,sum(sign_count)signSum ,
+        from (select aid ,
                      sum(public_release_count)publicReleaseSum ,sum(follow_count) followSum,sum(order_count) orderSum
               from admin_user_count a where aid=#{aid} group by aid)x
                  left join(select a.salesman_id aid , sum(if( b.project_status =29,1,0))projectStopSum ,
@@ -1115,8 +1115,7 @@
     </select>
 
     <select id="adminStatisticsInfoByTime" resultType="com.goafanti.admin.bo.AdminStatisticsBo">
-        select sum(private_count)rangePrivateSum ,sum(channel_count)rangeChannelSum ,sum(sign_count)rangeSignSum ,
-               sum(follow_count) rangeFollowSum,sum(order_count) rangeOrdersum
+        select sum(follow_count) rangeFollowSum,sum(order_count) rangeOrdersum
         from admin_user_count a where aid=#{aid} and  date_time BETWEEN #{startTime} and #{endTime}
         group by aid
     </select>
@@ -1321,5 +1320,13 @@
         from admin
         where team_id = #{teamId}
     </select>
+    <select id="selectUserCount" resultType="com.goafanti.admin.bo.AdminStatisticsBo">
+        select aid,sum(if( share_type=0 and channel=0 and new_channel=0,1,0))privateSum,
+               sum(if(share_type=0 and new_channel=1,1,0))channelSum,
+               sum(if( share_type=2 ,1,0))signCount
+        from `user` where `type` =1   and source in(1,2,3)
+        AND aid = #{aid}
+        group by aid
+    </select>
 </mapper>