瀏覽代碼

营销首页统计开发

anderx 2 年之前
父節點
當前提交
20984dcb66

+ 15 - 6
src/main/java/com/goafanti/admin/service/impl/AdminStatisticsServiceImpl.java

@@ -31,12 +31,21 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
         endTime=endTime+" 23:59:59";
         AdminStatisticsBo adminStatisticsBo = adminMapper.adminStatisticsInfo(aid);
         AdminStatisticsBo asb = adminMapper.adminStatisticsInfoByTime(aid, startTime, endTime);
-        adminStatisticsBo.setRangePrivateSum(asb.getRangePrivateSum());
-        adminStatisticsBo.setRangeSignSum(asb.getRangeSignSum());
-        adminStatisticsBo.setRangeChannelSum(asb.getRangeChannelSum());
-        adminStatisticsBo.setRangeFollowSum(asb.getFollowSum());
-        adminStatisticsBo.setRangeOrderSum(asb.getRangeOrderSum());
-        int rangePublicReleaseSum=adminMapper.adminStatisticsPublicReleaseByAidAndTime(aid, startTime, endTime);
+        if (asb==null) {
+            adminStatisticsBo.setRangePrivateSum(0);
+            adminStatisticsBo.setRangeSignSum(0);
+            adminStatisticsBo.setRangeChannelSum(0);
+            adminStatisticsBo.setRangeFollowSum(0);
+            adminStatisticsBo.setRangeOrderSum(0);
+        }else {
+            adminStatisticsBo.setRangePrivateSum(asb.getRangePrivateSum());
+            adminStatisticsBo.setRangeSignSum(asb.getRangeSignSum());
+            adminStatisticsBo.setRangeChannelSum(asb.getRangeChannelSum());
+            adminStatisticsBo.setRangeFollowSum(asb.getFollowSum());
+            adminStatisticsBo.setRangeOrderSum(asb.getRangeOrderSum());
+        }
+        Integer rangePublicReleaseSum=adminMapper.adminStatisticsPublicReleaseByAidAndTime(aid, startTime, endTime);
+        if (rangePublicReleaseSum==null)rangePublicReleaseSum=0;
         adminStatisticsBo.setRangePublicReleaseSum(rangePublicReleaseSum);
         return adminStatisticsBo;
     }

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

@@ -191,5 +191,5 @@ public interface AdminMapper {
     List<AdminUserCount> selectAllAdminOrder();
 
 
-    int adminStatisticsPublicReleaseByAidAndTime(String aid, String startTime, String endTime);
+    Integer adminStatisticsPublicReleaseByAidAndTime(@Param("aid") String aid, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }

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

@@ -1247,9 +1247,16 @@
     where a.id= #{aid}
   </select>
   <select id="adminStatisticsInfo" resultType="com.goafanti.admin.bo.AdminStatisticsBo">
-    select sum(private_count)privateSum ,sum(channel_count)channelSum ,sum(sign_count)signSum ,
-           sum(public_release_count)publicReleaseSum ,sum(follow_count) followSum,sum(order_count) orderSum
-    from admin_user_count a where aid=#{aid} group by aid
+    select *
+    from (select aid ,sum(private_count)privateSum ,sum(channel_count)channelSum ,sum(sign_count)signSum ,
+                 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=2 or b.project_status =3 or b.project_status =29,1,0))projectStopSum ,
+            sum(if(b.check_status=1,1,0))projectCheckSum from t_order_new a left join t_order_task b
+            on a.order_no =b.order_no where a.salesman_id =  #{aid})y on x.aid=y.aid
+    left join (  select salesman_id aid,  sum(1)orderSum,sum(if(order_status=3 or order_status=5,1,0))rejectSum, sum(if(delete_sign=2,1,0))changeSum
+            from t_order_new where delete_sign in (0,2,3) and process_status >0
+            and salesman_id =  #{aid})g on x.aid=g.aid
   </select>
 
   <select id="adminStatisticsInfoByTime" resultType="com.goafanti.admin.bo.AdminStatisticsBo">