fix: 修改合作加盟

This commit is contained in:
lwh 2023-04-29 15:20:17 +08:00
parent 620d38ad40
commit 148c44e1dc
6 changed files with 67 additions and 123 deletions

View File

@ -133,7 +133,7 @@ class JoinApply extends BaseController
->select();
return ModelJoinApply::exportExcel($select);
}
/**
/**
* 合作加盟申请受理接口
*
* @param Request request
@ -146,7 +146,7 @@ class JoinApply extends BaseController
{
$params = $request->param();
$this->validate($params, [
'join_apply_guid|在线报名guid' => 'require',
'join_apply_guid|合作加盟申请guid' => 'require',
]);
$msg_data = [];
$join_apply_guids = explode(',', $params['join_apply_guid']);
@ -155,8 +155,8 @@ class JoinApply extends BaseController
$prefix_text = ($join_apply_guids_count != 1) ? "" . ($line + 1) . "行-> " : null;
try {
$join_apply = ModelJoinApply::where('join_apply_guid', $join_apply_guid)->find();
if (!$join_apply) throwErrorMsg('该在线报名数据不存在!');
if ($join_apply->join_apply_status == 1) throwErrorMsg('该在线报名数据已处理!');
if (!$join_apply) throwErrorMsg('该合作加盟申请数据不存在!');
if ($join_apply->join_apply_status == 1) throwErrorMsg('该合作加盟申请数据已处理!');
$join_apply->join_apply_status = 1;
$join_apply->save();
$msg_data[] = $prefix_text . "用户名称【{$join_apply->join_apply_user_name}】: <span style='color:#27af49'>受理成功!</span>";
@ -166,7 +166,4 @@ class JoinApply extends BaseController
};
return msg(0, implode('<br>', $msg_data));
}
}

View File

@ -17,59 +17,8 @@ use think\facade\Env;
class JoinApply extends BaseController
{
/**
* 获取加盟申请列表
*/
public function getJoinApplyList(Request $request): array
{
$params = $request->param();
$con = [];
$con = Tool::getOptionalQuery(['join_apply_user_name', 'LIKE'], ['join_apply_user_phone', 'LIKE'], ['join_apply_user_position', '='], ['join_apply_status', '='],);
$query = ModelJoinApply::where($con)
->field([
'join_apply_id',
'join_apply_guid',
'join_apply_user_name',
'join_apply_user_phone',
'join_apply_user_position',
'join_apply_user_area',
'join_apply_user_org',
'join_apply_status'
])
->order('join_apply_update_time', 'desc');
return msg("获取加盟申请列表成功!", $query);
}
/**
* 获取加盟申请详情
*/
public function getJoinApplyInfo(Request $request): array
{
$params = $request->param();
$this->validate($params, ['join_apply_guid' => 'require']);
$find = ModelJoinApply::field([
'join_apply_id',
'join_apply_guid',
'join_apply_user_name',
'join_apply_user_phone',
'join_apply_user_position',
'join_apply_user_area',
'join_apply_user_org',
'join_apply_status'
])
->where('join_apply_guid', $params['join_apply_guid'])
->find();
return msg(0, '获取加盟申请详情成功!', ['data' => $find]);
}
/**
* 添加加盟申请
*/
public function addJoinApply(Request $request): array
@ -93,7 +42,6 @@ class JoinApply extends BaseController
'join_apply_user_org',
'join_apply_status'
]);
return msg('添加成功!');
return msg('申请成功!');
}
}

View File

@ -29,7 +29,7 @@ class WorksType extends BaseController
*/
public function getWorksTypeList(Request $request): array
{
$select = ModelWorksType::field(['works_type_name', 'works_type_id'])
$select = ModelWorksType::field(['works_type_name' => 'name', 'works_type_id'])
->where('works_type_parent_guid', "0")
->order('works_type_order')
->select();

View File

@ -4,6 +4,7 @@ namespace app\common\model\ContactUs;
use app\common\arw\adjfut\src\Validate;
use app\BaseModel;
use app\common\model\Dictionary\Dictionary as ModelDictionary;
use think\model\concern\SoftDelete;
use app\common\arw\adjfut\src\Excel;
use app\Request;
@ -22,35 +23,35 @@ class JoinApply extends BaseModel
// 设置字段信息
protected $schema = [
"join_apply_id" => "int",
"join_apply_id" => "int",
"join_apply_guid" => "string",
"join_apply_guid" => "string",
"join_apply_user_name" => "string",
"join_apply_user_name" => "string",
"join_apply_user_phone" => "int",
"join_apply_user_phone" => "int",
"join_apply_user_position" => "string",
"join_apply_user_position" => "string",
"join_apply_user_area" => "string",
"join_apply_user_area" => "string",
"join_apply_user_org" => "string",
"join_apply_user_org" => "string",
"join_apply_status" => "int",
"join_apply_status" => "int",
"join_apply_create_time" => "datetime",
"join_apply_create_time" => "datetime",
"join_apply_create_user_guid" => "string",
"join_apply_create_user_guid" => "string",
"join_apply_update_time" => "datetime",
"join_apply_update_time" => "datetime",
"join_apply_update_user_guid" => "string",
"join_apply_update_user_guid" => "string",
"join_apply_delete_time" => "datetime",
"join_apply_delete_time" => "datetime",
"join_apply_delete_user_guid" => "string",
"join_apply_delete_user_guid" => "string",
];
];
// 设置json类型字段
protected $json = [''];
// 开启自动写入时间戳字段
@ -91,35 +92,33 @@ class JoinApply extends BaseModel
}
/**
* 导出Excel
*/
public static function exportExcel($select)
{
$data = [[
'加盟申请用户名字',
'加盟申请用户电话',
'加盟申请用户职位',
'加盟申请用户所在地区',
'加盟申请用户所属机构名称',
'加盟申请受理状态'
]];
foreach ($select as $key => $val) {
$data[] = [
$val['join_apply_user_name'],
$val['join_apply_user_phone'],
$val['join_apply_user_position'],
$val['join_apply_user_area'],
$val['join_apply_user_org'],
$val['join_apply_status'],
];
}
$excel = (new Excel())->exporTsheet($data);
$excel->save('加盟申请.xlsx');
}
* 导出Excel
*/
public static function exportExcel($select)
{
$data = [[
'加盟申请用户名字',
'加盟申请用户电话',
'加盟申请用户职位',
'加盟申请用户所在地区',
'加盟申请用户所属机构名称',
'加盟申请受理状态'
]];
foreach ($select as $key => $val) {
// 字典取值
$processing_state = ModelDictionary::getDictionaryData('processing_state');
$val['join_apply_status'] = ModelDictionary::getDataDictionaryName($processing_state, $val['join_apply_status']);
$data[] = [
$val['join_apply_user_name'],
$val['join_apply_user_phone'],
$val['join_apply_user_position'],
$val['join_apply_user_area'],
$val['join_apply_user_org'],
$val['join_apply_status'],
];
}
$excel = (new Excel())->exporTsheet($data);
$excel->save('加盟申请.xlsx');
}
}

View File

@ -76,7 +76,7 @@ class Works extends BaseModel
*/
public static function onBeforeInsert(self $model): void
{
Tool::sortInsertProc(self::class, $model->works_order);
Tool::sortInsertProc(self::class, $model->works_order, ['works_type_guid' => $model->works_type_guid]);
$model->completeCreateField();
}

Binary file not shown.