周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 a2b7c7dc6c27e651f6cab00aca4af013733efe98 1 个父辈 54f60f26

更新修改

内嵌 并排对比
正在显示 4 个修改的文件 包含 53 行增加 和 10 行删除
@@ -80,7 +80,7 @@ class TemplateLog extends Command @@ -80,7 +80,7 @@ class TemplateLog extends Command
80 * @time :2024/11/13 16:19 80 * @time :2024/11/13 16:19
81 */ 81 */
82 public function deleteUserLog(){ 82 public function deleteUserLog(){
83 - $date = date('Y-m-d H:i:s', strtotime('-60 days')); 83 + $date = date('Y-m-d H:i:s', strtotime('-30 days'));
84 $userLogModel = new UserLog(); 84 $userLogModel = new UserLog();
85 return $userLogModel->del(['created_at'=>['<=',$date]]); 85 return $userLogModel->del(['created_at'=>['<=',$date]]);
86 } 86 }
@@ -72,12 +72,26 @@ class CountAllProject extends Command @@ -72,12 +72,26 @@ class CountAllProject extends Command
72 $arr = explode('.',$v['category']); 72 $arr = explode('.',$v['category']);
73 if($arr[0] == 1){ 73 if($arr[0] == 1){
74 $v['status'] = 1; 74 $v['status'] = 1;
75 - 75 + $v['category'] = $arr[1] ?? '';
76 }elseif ($arr[0] == 2){ 76 }elseif ($arr[0] == 2){
77 $v['status'] = 2; 77 $v['status'] = 2;
78 - 78 + $v['category'] = $arr[1] ?? '';
  79 + }elseif($arr[0] == 3){
  80 + $v['status'] = 3;
  81 + $v['category'] = $arr[1] ?? '';
  82 + }elseif ($arr[0] == 4){
  83 + $v['status'] = 7;
  84 + $v['category'] = '续费记录单';
  85 + }elseif ($arr[0] == 5){
  86 + $v['status'] = 4;
  87 + $v['category'] = '推广续网站';
  88 + }elseif ($arr[0] == 6){
  89 + $v['status'] = 5;
  90 + $v['category'] = '未续费项目';
  91 + }else{
  92 + $v['status'] = 6;
  93 + $v['category'] = '特殊推广项目';
79 } 94 }
80 - $v['category'] = $arr[1] ?? '';  
81 } 95 }
82 if($v['is_admin5'] == 5){ 96 if($v['is_admin5'] == 5){
83 $v['version'] = 2; 97 $v['version'] = 2;
@@ -85,7 +99,6 @@ class CountAllProject extends Command @@ -85,7 +99,6 @@ class CountAllProject extends Command
85 $v['version'] = 3; 99 $v['version'] = 3;
86 } 100 }
87 $v['is_upgrade'] = 0; 101 $v['is_upgrade'] = 0;
88 - $v['status'] = 0;  
89 $v['created_at'] = $v['updated_at'] = date('Y-m-d H:i:s'); 102 $v['created_at'] = $v['updated_at'] = date('Y-m-d H:i:s');
90 $data[$k] = $v; 103 $data[$k] = $v;
91 } 104 }
@@ -142,6 +155,31 @@ class CountAllProject extends Command @@ -142,6 +155,31 @@ class CountAllProject extends Command
142 $data = []; 155 $data = [];
143 echo '执行页数:' . $i . PHP_EOL . date('Y-m-d H:i:s') . PHP_EOL; 156 echo '执行页数:' . $i . PHP_EOL . date('Y-m-d H:i:s') . PHP_EOL;
144 foreach ($lists['list'] as $k => $v){ 157 foreach ($lists['list'] as $k => $v){
  158 + if(!empty($v['type'])){
  159 + if($v['type'] == 1){
  160 + $type = 1;
  161 + $category = '建站进程中';
  162 + }elseif ($v['type'] == 2){
  163 + $type = 2;
  164 + $category = '已完成 - 推广进程中';
  165 + }elseif($v['type'] == 3){
  166 + $type = 3;
  167 + $category = '已完成 - 建站用户';
  168 + }elseif ($v['type'] == 4){
  169 + $type = 4;
  170 + $category = '推广续网站';
  171 + }elseif ($v['type'] == 5){
  172 + $type = 5;
  173 + $category = '未续费项目';
  174 + }elseif ($v['type'] == 6){
  175 + $type = 6;
  176 + $category = '特殊推广项目';
  177 + }else{
  178 + $type = 7;
  179 + $category = '续费记录单';
  180 + }
  181 + }
  182 + $channel = Channel::getChannelText($v['channel']['user_id'] ?? 0);
145 $data[] = [ 183 $data[] = [
146 'project_id'=>$v['id'], 184 'project_id'=>$v['id'],
147 'version'=>1,//代表6.0 185 'version'=>1,//代表6.0
@@ -149,13 +187,15 @@ class CountAllProject extends Command @@ -149,13 +187,15 @@ class CountAllProject extends Command
149 'title'=>$v['title'], 187 'title'=>$v['title'],
150 'company'=>$v['company'], 188 'company'=>$v['company'],
151 'channel'=>Channel::getChannelText($v['channel']['user_id'] ?? 0), 189 'channel'=>Channel::getChannelText($v['channel']['user_id'] ?? 0),
  190 + 'sale'=>$this->end_channel($channel) ?? '',
152 'join_date'=>$v['cooperate_date'], 191 'join_date'=>$v['cooperate_date'],
153 'online_date'=>$v['uptime'], 192 'online_date'=>$v['uptime'],
154 'keywords_num'=>$v['key'], 193 'keywords_num'=>$v['key'],
155 'service_num'=>$v['day'], 194 'service_num'=>$v['day'],
156 'production_num'=>intval(abs((empty($v['uptime']) ? time() : strtotime($v['uptime'])) - strtotime($v['created_at'])) / 86400), 195 'production_num'=>intval(abs((empty($v['uptime']) ? time() : strtotime($v['uptime'])) - strtotime($v['created_at'])) / 86400),
157 'plan'=>Project::planMap()[$v['plan']], 196 'plan'=>Project::planMap()[$v['plan']],
158 - 'status'=>0, 197 + 'status'=>$type,
  198 + 'category'=>$category,
159 'test_domain'=>$v['test_domain'], 199 'test_domain'=>$v['test_domain'],
160 'product_domain'=>!empty($v['domain']) ? (new DomainInfo())->getDomain($v['domain']) : '', 200 'product_domain'=>!empty($v['domain']) ? (new DomainInfo())->getDomain($v['domain']) : '',
161 'project_manager'=>$manageModel->getName($v['manager_mid'] ?? ''), 201 'project_manager'=>$manageModel->getName($v['manager_mid'] ?? ''),
@@ -219,7 +259,10 @@ class CountAllProject extends Command @@ -219,7 +259,10 @@ class CountAllProject extends Command
219 } 259 }
220 260
221 public function end_channel($channel){ 261 public function end_channel($channel){
222 - $parts = explode("-", $channel);  
223 - return end($parts); 262 + if(!empty($channel)){
  263 + $parts = explode("-", $channel);
  264 + return end($parts);
  265 + }
  266 + return $channel;
224 } 267 }
225 } 268 }
@@ -31,8 +31,8 @@ class DetailController extends BaseController @@ -31,8 +31,8 @@ class DetailController extends BaseController
31 ],[ 31 ],[
32 'product_id.required' => '产品id不能为空', 32 'product_id.required' => '产品id不能为空',
33 ]); 33 ]);
34 - $data = $detail->list($this->map,'sort',['*'],'asc');  
35 $data_column = $column->list([],'id',['*'],'asc'); 34 $data_column = $column->list([],'id',['*'],'asc');
  35 + $data = $detail->list($this->map,'sort',['*'],'asc');
36 if(!empty($data_column) && !empty($data)){ 36 if(!empty($data_column) && !empty($data)){
37 foreach ($data_column as $k => $v){ 37 foreach ($data_column as $k => $v){
38 $column_data = []; 38 $column_data = [];
@@ -189,7 +189,7 @@ class ManageHr extends Base @@ -189,7 +189,7 @@ class ManageHr extends Base
189 * @time :2023/8/18 14:41 189 * @time :2023/8/18 14:41
190 */ 190 */
191 public function getName($id){ 191 public function getName($id){
192 - $name = ''; 192 + $name = '未分配';
193 if(!empty($id)){ 193 if(!empty($id)){
194 $name = Cache::get('manager_hr_'.$id); 194 $name = Cache::get('manager_hr_'.$id);
195 if(empty($name)){ 195 if(empty($name)){