作者 lyh

gx

@@ -77,5 +77,6 @@ class InquiryCount extends Command @@ -77,5 +77,6 @@ class InquiryCount extends Command
77 } 77 }
78 $inquiryCount = new InquiryCountModel(); 78 $inquiryCount = new InquiryCountModel();
79 $inquiryCount->insert($data); 79 $inquiryCount->insert($data);
  80 + return true;
80 } 81 }
81 } 82 }
1 <?php 1 <?php
2 2
3 -namespace App\Http\Controllers\Aside\Projects; 3 +namespace App\Http\Controllers\Aside\Inquiry;
4 4
5 use App\Enums\Common\Code; 5 use App\Enums\Common\Code;
6 use App\Http\Controllers\Aside\BaseController; 6 use App\Http\Controllers\Aside\BaseController;
7 use App\Http\Logic\Aside\Projects\InquiryInfoLogic; 7 use App\Http\Logic\Aside\Projects\InquiryInfoLogic;
8 -use App\Models\Projects\InquiryUser;  
9 -use Carbon\Carbon;  
10 use PhpOffice\PhpSpreadsheet\IOFactory; 8 use PhpOffice\PhpSpreadsheet\IOFactory;
11 9
12 /** 10 /**
@@ -200,12 +198,12 @@ class InquiryInfoController extends BaseController @@ -200,12 +198,12 @@ class InquiryInfoController extends BaseController
200 * @time :2023/7/14 15:55 198 * @time :2023/7/14 15:55
201 */ 199 */
202 public function getCount(InquiryInfoLogic $inquiryInfoLogic){ 200 public function getCount(InquiryInfoLogic $inquiryInfoLogic){
203 -  
204 - // 获取30天前的时间  
205 -// $thirtyDaysAgo = date("Y-m-d", strtotime("-30 days"));  
206 -// // 获取当前时间  
207 -// $currentDateTime = date("Y-m-d");  
208 -// $lists = $inquiryInfoLogic->getNewThirtyCount($thirtyDaysAgo,$currentDateTime);  
209 -// $this->response('success',Code::SUCCESS,$lists); 201 + $this->request->validate([
  202 + 'type'=>'required',
  203 + ],[
  204 + 'type.required' => '类型不能为空',
  205 + ]);
  206 + $lists = $inquiryInfoLogic->getNewThirtyCount();
  207 + $this->response('success',Code::SUCCESS,$lists);
210 } 208 }
211 } 209 }
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 namespace App\Http\Logic\Aside\Projects; 3 namespace App\Http\Logic\Aside\Projects;
4 4
5 use App\Http\Logic\Aside\BaseLogic; 5 use App\Http\Logic\Aside\BaseLogic;
  6 +use App\Models\Inquiry\InquiryCount;
6 use App\Models\Inquiry\InquiryIP; 7 use App\Models\Inquiry\InquiryIP;
7 use App\Models\Projects\InquiryInfo; 8 use App\Models\Projects\InquiryInfo;
8 use App\Models\Projects\InquiryUser; 9 use App\Models\Projects\InquiryUser;
@@ -223,7 +224,9 @@ class InquiryInfoLogic extends BaseLogic @@ -223,7 +224,9 @@ class InquiryInfoLogic extends BaseLogic
223 * @method :post 224 * @method :post
224 * @time :2023/7/14 16:00 225 * @time :2023/7/14 16:00
225 */ 226 */
226 - public function getNewThirtyCount($start_time,$end_time){  
227 - $list = $this->model->list(['created_at'=>['between',[$start_time,$end_time]]]); 227 + public function getNewThirtyCount(){
  228 + $inquiryCountModel = new InquiryCount();
  229 + $lists = $inquiryCountModel->lists(['type'=>$this->param['type']],1,90,'created_at');
  230 + return $this->success($lists);
228 } 231 }
229 } 232 }
@@ -257,14 +257,14 @@ Route::group([], function () { @@ -257,14 +257,14 @@ Route::group([], function () {
257 }); 257 });
258 258
259 Route::prefix('inquiry')->group(function () { 259 Route::prefix('inquiry')->group(function () {
260 - Route::any('/', [Aside\Projects\InquiryInfoController::class, 'lists'])->name('admin.inquiry_lists');  
261 - Route::any('/save', [Aside\Projects\InquiryInfoController::class, 'save'])->name('admin.inquiry_save');  
262 - Route::any('/status', [Aside\Projects\InquiryInfoController::class, 'status'])->name('admin.inquiry_status');  
263 - Route::any('/getCount', [Aside\Projects\InquiryInfoController::class, 'getCount'])->name('admin.inquiry_getCount');  
264 - Route::any('/forwardInquiry', [Aside\Projects\InquiryInfoController::class, 'forwardInquiry'])->name('admin.inquiry_forwardInquiry');  
265 - Route::any('/forwardInfo', [Aside\Projects\InquiryInfoController::class, 'forwardInfo'])->name('admin.inquiry_forwardInfo');  
266 - Route::any('/importInquirySave', [Aside\Projects\InquiryInfoController::class, 'importInquirySave'])->name('admin.inquiry_importInquirySave');  
267 - Route::any('/getSearchIpInfo', [Aside\Projects\InquiryInfoController::class, 'getSearchIpInfo'])->name('admin.inquiry_getSearchIpInfo'); 260 + Route::any('/', [Aside\Inquiry\InquiryInfoController::class, 'lists'])->name('admin.inquiry_lists');
  261 + Route::any('/save', [Aside\Inquiry\InquiryInfoController::class, 'save'])->name('admin.inquiry_save');
  262 + Route::any('/status', [Aside\Inquiry\InquiryInfoController::class, 'status'])->name('admin.inquiry_status');
  263 + Route::any('/getCount', [Aside\Inquiry\InquiryInfoController::class, 'getCount'])->name('admin.inquiry_getCount');
  264 + Route::any('/forwardInquiry', [Aside\Inquiry\InquiryInfoController::class, 'forwardInquiry'])->name('admin.inquiry_forwardInquiry');
  265 + Route::any('/forwardInfo', [Aside\Inquiry\InquiryInfoController::class, 'forwardInfo'])->name('admin.inquiry_forwardInfo');
  266 + Route::any('/importInquirySave', [Aside\Inquiry\InquiryInfoController::class, 'importInquirySave'])->name('admin.inquiry_importInquirySave');
  267 + Route::any('/getSearchIpInfo', [Aside\Inquiry\InquiryInfoController::class, 'getSearchIpInfo'])->name('admin.inquiry_getSearchIpInfo');
268 }); 268 });
269 }); 269 });
270 270