fix : 修改联系方式，首页数据
This commit is contained in:
parent
5fb91cfff1
commit
a332b3f252
@ -32,10 +32,12 @@ class ContactScancode extends BaseController
|
||||
'contact_scancode_id',
|
||||
'contact_scancode_guid',
|
||||
'contact_scancode_title',
|
||||
'contact_scancode_status',
|
||||
'contact_scancode_icon',
|
||||
'contact_scancode_img',
|
||||
'contact_scancode_order'
|
||||
])
|
||||
->order('contact_scancode_update_time', 'desc');
|
||||
->order('contact_scancode_order', 'asc');
|
||||
|
||||
return msg("获取联系扫码列表成功!", $query);
|
||||
}
|
||||
@ -47,14 +49,16 @@ class ContactScancode extends BaseController
|
||||
{
|
||||
$params = $request->param();
|
||||
$this->validate($params, [
|
||||
'contact_scancode_title|联系扫码标题'=>'require'
|
||||
|
||||
'contact_scancode_title|联系扫码标题' => 'require'
|
||||
|
||||
]);
|
||||
$model = ModelContactScancode::where('contact_scancode_guid', $params['contact_scancode_guid'])->find();
|
||||
if (!$model) throwErrorMsg("该联系扫码不存在", 1);
|
||||
$model->allowField([
|
||||
'contact_scancode_update_user_guid',
|
||||
'contact_scancode_title',
|
||||
'contact_scancode_status',
|
||||
'contact_scancode_icon',
|
||||
'contact_scancode_img',
|
||||
'contact_scancode_order'
|
||||
])->save($params);
|
||||
@ -68,8 +72,8 @@ class ContactScancode extends BaseController
|
||||
{
|
||||
$params = $request->param();
|
||||
$this->validate($params, [
|
||||
'contact_scancode_title|联系扫码标题'=>'require',
|
||||
'contact_scancode_order|联系扫码排序'=>'require'
|
||||
'contact_scancode_title|联系扫码标题' => 'require',
|
||||
'contact_scancode_order|联系扫码排序' => 'require'
|
||||
]);
|
||||
$model = ModelContactScancode::create($params, [
|
||||
'contact_scancode_guid',
|
||||
@ -77,6 +81,8 @@ class ContactScancode extends BaseController
|
||||
'contact_scancode_update_user_guid',
|
||||
'contact_scancode_title',
|
||||
'contact_scancode_img',
|
||||
'contact_scancode_status',
|
||||
'contact_scancode_icon',
|
||||
'contact_scancode_order'
|
||||
]);
|
||||
return msg('添加成功!');
|
||||
|
||||
@ -20,12 +20,12 @@ class SchoolCategory extends BaseController
|
||||
/**
|
||||
* 获取录取院校分类列表
|
||||
*/
|
||||
public function getSchoolCategoryList(Request $request): array
|
||||
public function getSchoolCategoryList(Request $request, $isExport = false): array
|
||||
{
|
||||
$params = $request->param();
|
||||
$con = [];
|
||||
|
||||
$con = Tool::getOptionalQuery(['school_category_name', 'LIKE'],['school_category_status', "="],);
|
||||
$con = Tool::getOptionalQuery(['school_category_name', 'LIKE'], ['school_category_status', "="],);
|
||||
|
||||
$query = ModelSchoolCategory::where($con)
|
||||
->field([
|
||||
@ -34,12 +34,13 @@ class SchoolCategory extends BaseController
|
||||
'school_category_title',
|
||||
'school_category_name',
|
||||
'school_category_img',
|
||||
'school_category_icon',
|
||||
'school_category_status',
|
||||
'school_category_sort'
|
||||
])
|
||||
->order('school_category_sort', 'asc');
|
||||
|
||||
return msg("获取录取院校分类列表成功!", $query);
|
||||
return $isExport ? $query->select()->toArray() : msg("获取录取院校分类列表成功!", $query);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -61,6 +62,7 @@ class SchoolCategory extends BaseController
|
||||
'school_category_title',
|
||||
'school_category_name',
|
||||
'school_category_img',
|
||||
'school_category_icon',
|
||||
'school_category_status',
|
||||
'school_category_sort'
|
||||
])->save($params);
|
||||
@ -84,6 +86,7 @@ class SchoolCategory extends BaseController
|
||||
'school_category_create_user_guid',
|
||||
'school_category_update_user_guid',
|
||||
'school_category_title',
|
||||
'school_category_icon',
|
||||
'school_category_name',
|
||||
'school_category_img',
|
||||
'school_category_status',
|
||||
@ -113,9 +116,6 @@ class SchoolCategory extends BaseController
|
||||
*/
|
||||
public function exportExcel(Request $request)
|
||||
{
|
||||
$params = $request->param();
|
||||
$params['limit'] = 10000;
|
||||
$select = self::getSchoolCategoryList($request)['data'];
|
||||
return ModelSchoolCategory::exportExcel($select);
|
||||
ModelSchoolCategory::exportExcel(self::getSchoolCategoryList($request, true));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -105,10 +105,47 @@ class Test extends BaseController
|
||||
return msg('删除成功!');
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 导出Excel
|
||||
*/
|
||||
public function exportExcel(Request $request)
|
||||
{
|
||||
$params = $request->param();
|
||||
$select = ModelTest::field([
|
||||
'test_name',
|
||||
'test_show_status',
|
||||
'test_score',
|
||||
'test_sort'
|
||||
])
|
||||
->order('test_sort', 'desc' )
|
||||
->select();
|
||||
return ModelTest::exportExcel($select);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 下载导入模板
|
||||
*/
|
||||
public function downloadTemplate(Request $request)
|
||||
{
|
||||
$params = $request->param();
|
||||
$data = array_values(ModelTest::EXCELFIELD);
|
||||
$excel = (new Excel())->exporTsheet($data);
|
||||
$excel->save('测试导入模板.xlsx');
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 导入excel
|
||||
*/
|
||||
public function importExcel(Request $request)
|
||||
{
|
||||
$file = new UploadFile('uploads', 'fileExt:xlsx');
|
||||
$file->putFile('test');
|
||||
|
||||
$msg = ModelTest::importExcel($file);
|
||||
return [
|
||||
'code' => 0,
|
||||
'msg' => $msg
|
||||
];
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -31,6 +31,7 @@ class SchoolCategory extends BaseController
|
||||
'school_category_title',
|
||||
'school_category_name',
|
||||
'school_category_img',
|
||||
'school_category_icon',
|
||||
'school_category_sort'
|
||||
])
|
||||
->order('school_category_sort', 'asc')->select();
|
||||
|
||||
@ -21,30 +21,30 @@ class ConsultingHotline extends BaseModel
|
||||
protected $disuse = [];
|
||||
// 设置字段信息
|
||||
protected $schema = [
|
||||
|
||||
"consulting_hotline_id" => "int",
|
||||
|
||||
"consulting_hotline_guid" => "string",
|
||||
|
||||
"consulting_hotline_user" => "string",
|
||||
|
||||
"consulting_hotline_phone" => "string",
|
||||
|
||||
"consulting_hotline_order" =>"int",
|
||||
|
||||
"consulting_hotline_create_time" => "datetime",
|
||||
|
||||
"consulting_hotline_create_user_guid" => "string",
|
||||
|
||||
"consulting_hotline_update_time" => "datetime",
|
||||
|
||||
"consulting_hotline_update_user_guid" => "string",
|
||||
|
||||
"consulting_hotline_delete_time" => "datetime",
|
||||
|
||||
"consulting_hotline_delete_user_guid" => "string",
|
||||
|
||||
];
|
||||
"consulting_hotline_id" => "int",
|
||||
|
||||
"consulting_hotline_guid" => "string",
|
||||
|
||||
"consulting_hotline_user" => "string",
|
||||
|
||||
"consulting_hotline_phone" => "string",
|
||||
|
||||
"consulting_hotline_order" => "int",
|
||||
|
||||
"consulting_hotline_create_time" => "datetime",
|
||||
|
||||
"consulting_hotline_create_user_guid" => "string",
|
||||
|
||||
"consulting_hotline_update_time" => "datetime",
|
||||
|
||||
"consulting_hotline_update_user_guid" => "string",
|
||||
|
||||
"consulting_hotline_delete_time" => "datetime",
|
||||
|
||||
"consulting_hotline_delete_user_guid" => "string",
|
||||
|
||||
];
|
||||
// 设置json类型字段
|
||||
protected $json = [''];
|
||||
// 开启自动写入时间戳字段
|
||||
@ -54,9 +54,9 @@ class ConsultingHotline extends BaseModel
|
||||
// 修改时间
|
||||
protected $updateTime = 'consulting_hotline_update_time';
|
||||
|
||||
|
||||
//排序字段
|
||||
public $order_field = 'consulting_hotline_order';
|
||||
|
||||
//排序字段
|
||||
public $order_field = 'consulting_hotline_order';
|
||||
|
||||
/**
|
||||
* 新增前
|
||||
@ -93,12 +93,4 @@ class ConsultingHotline extends BaseModel
|
||||
Tool::sortDeleteProc(self::class, $model->consulting_hotline_guid);
|
||||
$model->completeDeleteField();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -21,30 +21,34 @@ class ContactScancode extends BaseModel
|
||||
protected $disuse = [];
|
||||
// 设置字段信息
|
||||
protected $schema = [
|
||||
|
||||
"contact_scancode_id" => "int",
|
||||
|
||||
"contact_scancode_guid" => "string",
|
||||
|
||||
"contact_scancode_title"=>"string",
|
||||
|
||||
"contact_scancode_img" => "string",
|
||||
"contact_scancode_id" => "int",
|
||||
|
||||
"contact_scancode_order"=>'int',
|
||||
|
||||
"contact_scancode_create_time" => "datetime",
|
||||
|
||||
"contact_scancode_create_user_guid" => "string",
|
||||
|
||||
"contact_scancode_update_time" => "datetime",
|
||||
|
||||
"contact_scancode_update_user_guid" => "string",
|
||||
|
||||
"contact_scancode_delete_time" => "datetime",
|
||||
|
||||
"contact_scancode_delete_user_guid" => "string",
|
||||
|
||||
];
|
||||
"contact_scancode_guid" => "string",
|
||||
|
||||
"contact_scancode_title" => "string",
|
||||
|
||||
"contact_scancode_img" => "string",
|
||||
|
||||
"contact_scancode_icon" => "string",
|
||||
|
||||
"contact_scancode_order" => 'int',
|
||||
|
||||
"contact_scancode_status" => 'int',
|
||||
|
||||
"contact_scancode_create_time" => "datetime",
|
||||
|
||||
"contact_scancode_create_user_guid" => "string",
|
||||
|
||||
"contact_scancode_update_time" => "datetime",
|
||||
|
||||
"contact_scancode_update_user_guid" => "string",
|
||||
|
||||
"contact_scancode_delete_time" => "datetime",
|
||||
|
||||
"contact_scancode_delete_user_guid" => "string",
|
||||
|
||||
];
|
||||
// 设置json类型字段
|
||||
protected $json = [''];
|
||||
// 开启自动写入时间戳字段
|
||||
@ -54,11 +58,11 @@ class ContactScancode extends BaseModel
|
||||
// 修改时间
|
||||
protected $updateTime = 'contact_scancode_update_time';
|
||||
|
||||
|
||||
|
||||
|
||||
//排序字段
|
||||
public $order_field = 'contact_scancode_order';
|
||||
|
||||
|
||||
//排序字段
|
||||
public $order_field = 'contact_scancode_order';
|
||||
|
||||
/**
|
||||
* 新增前
|
||||
@ -95,12 +99,4 @@ class ContactScancode extends BaseModel
|
||||
Tool::sortDeleteProc(self::class, $model->contact_scancode_guid);
|
||||
$model->completeDeleteField();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
namespace app\common\model\Home;
|
||||
|
||||
use app\common\arw\adjfut\src\Validate;
|
||||
use app\common\model\Dictionary\Dictionary as ModelDictionary;
|
||||
use app\BaseModel;
|
||||
use think\model\concern\SoftDelete;
|
||||
use app\common\arw\adjfut\src\Excel;
|
||||
@ -109,4 +110,15 @@ class HomeWorks extends BaseModel
|
||||
$excel = (new Excel())->exporTsheet($data);
|
||||
$excel->save('首页作品.xlsx');
|
||||
}
|
||||
|
||||
/**
|
||||
* 作品作者类型字典获取器
|
||||
*/
|
||||
public function getHomeWorksAuthorTypeName($value,$data)
|
||||
{
|
||||
$home_works_author_type = $data['home_works_author_type'];
|
||||
$works_author_type = ModelDictionary::getDictionaryData('works_author_type');
|
||||
$home_works_author_type = ModelDictionary::getDataDictionaryValue($works_author_type, $home_works_author_type);
|
||||
return $home_works_author_type;
|
||||
}
|
||||
}
|
||||
|
||||
@ -33,6 +33,8 @@ class SchoolCategory extends BaseModel
|
||||
|
||||
"school_category_img" => "string",
|
||||
|
||||
"school_category_icon" => "string",
|
||||
|
||||
"school_category_status" => "int",
|
||||
|
||||
"school_category_sort" => "int",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user