周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 0f1414dd244455e989b1ccbc26e624f4e7e5387d 1 个父辈 82e36d49

gx售后统计数据

内嵌 并排对比
正在显示 1 个修改的文件 包含 12 行增加 和 12 行删除
@@ -61,7 +61,7 @@ class AfterDayCount extends Command @@ -61,7 +61,7 @@ class AfterDayCount extends Command
61 $this->managerHrModel = new ManageHr(); 61 $this->managerHrModel = new ManageHr();
62 $projectModel = new Project(); 62 $projectModel = new Project();
63 $rankDataLogModel = new RankDataLog(); 63 $rankDataLogModel = new RankDataLog();
64 - $todayMidnight = date('Y-m-d 00:00:00', strtotime('today')); 64 + $todayMidnight = date('Y-m-d', strtotime('today'));
65 $saveData = []; 65 $saveData = [];
66 $projectIdArr = $rankDataLogModel->selectField(['is_compliance'=>1,'lang'=>'','date'=>date('Y-m-d', strtotime('-3 months'))],'project_id');//3个月前达标的项目id 66 $projectIdArr = $rankDataLogModel->selectField(['is_compliance'=>1,'lang'=>'','date'=>date('Y-m-d', strtotime('-3 months'))],'project_id');//3个月前达标的项目id
67 foreach ($this->after_manager as $key => $valM){ 67 foreach ($this->after_manager as $key => $valM){
@@ -69,9 +69,9 @@ class AfterDayCount extends Command @@ -69,9 +69,9 @@ class AfterDayCount extends Command
69 $project_count = $projectModel->where('gl_project.extend_type',0) 69 $project_count = $projectModel->where('gl_project.extend_type',0)
70 ->where('gl_project.delete_status',0) 70 ->where('gl_project.delete_status',0)
71 ->where('gl_project.old_project_id',0) 71 ->where('gl_project.old_project_id',0)
72 - ->where('gl_project.created_at','<=',$todayMidnight) 72 + ->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight)
73 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 73 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
74 - ->whereIn('gl_project.type',[2,4]) 74 + ->whereIn('gl_project.type',[2,4,6])
75 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 75 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
76 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") 76 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
77 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") 77 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
@@ -79,11 +79,11 @@ class AfterDayCount extends Command @@ -79,11 +79,11 @@ class AfterDayCount extends Command
79 $qualified_count = $projectModel->where('gl_project.extend_type',0) 79 $qualified_count = $projectModel->where('gl_project.extend_type',0)
80 ->where('gl_project.delete_status',0) 80 ->where('gl_project.delete_status',0)
81 ->where('gl_project.old_project_id',0) 81 ->where('gl_project.old_project_id',0)
82 - ->where('gl_project.created_at','<=',$todayMidnight) 82 + ->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight)
83 ->where('gl_project.is_remain_today',1) 83 ->where('gl_project.is_remain_today',1)
84 ->where('gl_project_deploy_build.plan','!=',0) 84 ->where('gl_project_deploy_build.plan','!=',0)
85 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 85 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
86 - ->whereIn('gl_project.type',[2,4]) 86 + ->whereIn('gl_project.type',[2,4,6])
87 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 87 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
88 ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id') 88 ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
89 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") 89 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
@@ -94,10 +94,10 @@ class AfterDayCount extends Command @@ -94,10 +94,10 @@ class AfterDayCount extends Command
94 $three_project_count = $projectModel->where('gl_project.extend_type',0) 94 $three_project_count = $projectModel->where('gl_project.extend_type',0)
95 ->where('gl_project.delete_status',0) 95 ->where('gl_project.delete_status',0)
96 ->where('gl_project.old_project_id',0) 96 ->where('gl_project.old_project_id',0)
97 - ->where('gl_project.created_at','>=',$threeMonthsAgo.'-01 00:00:00')  
98 - ->where('gl_project.created_at','<=',$threeMonthsAgo.'-31 23:59:59') 97 + ->where('gl_project_deploy_optimize.start_date','>=',$threeMonthsAgo.'-01')
  98 + ->where('gl_project_deploy_optimize.start_date','<=',$threeMonthsAgo.'-31')
99 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 99 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
100 - ->whereIn('gl_project.type',[2,4]) 100 + ->whereIn('gl_project.type',[2,4,6])
101 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 101 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
102 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0") 102 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
103 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0") 103 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
@@ -106,10 +106,10 @@ class AfterDayCount extends Command @@ -106,10 +106,10 @@ class AfterDayCount extends Command
106 ->whereIn('gl_project.id',$projectIdArr) 106 ->whereIn('gl_project.id',$projectIdArr)
107 ->where('gl_project.delete_status',0) 107 ->where('gl_project.delete_status',0)
108 ->where('gl_project.old_project_id',0) 108 ->where('gl_project.old_project_id',0)
109 - ->where('gl_project.created_at','>=',$threeMonthsAgo.'-01 00:00:00')  
110 - ->where('gl_project.created_at','<=',$threeMonthsAgo.'-31 23:59:59') 109 + ->where('gl_project_deploy_optimize.start_date','>=',$threeMonthsAgo.'-01')
  110 + ->where('gl_project_deploy_optimize.start_date','<=',$threeMonthsAgo.'-31')
111 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 111 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
112 - ->whereIn('gl_project.type',[2,4]) 112 + ->whereIn('gl_project.type',[2,4,6])
113 ->where('gl_project_deploy_build.plan','!=',0) 113 ->where('gl_project_deploy_build.plan','!=',0)
114 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 114 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
115 ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id') 115 ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
@@ -123,7 +123,7 @@ class AfterDayCount extends Command @@ -123,7 +123,7 @@ class AfterDayCount extends Command
123 } 123 }
124 $data = $projectModel->where('gl_project.extend_type',0) 124 $data = $projectModel->where('gl_project.extend_type',0)
125 ->where('gl_project.delete_status',0) 125 ->where('gl_project.delete_status',0)
126 - ->where('gl_project.created_at','<=',$todayMidnight) 126 + ->where('gl_project_deploy_optimize.start_date','<=',$todayMidnight)
127 ->where('gl_project.is_remain_today',1) 127 ->where('gl_project.is_remain_today',1)
128 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr) 128 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
129 ->whereIn('gl_project.type',[2,4]) 129 ->whereIn('gl_project.type',[2,4])