mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2023-08-12 16:54:08 +08:00
parent 05313f8c18
commit 6300d00662
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/adminapi/controller/task_scheduling/TaskSchedulingController.php
View File

@ -70,7 +70,6 @@ class TaskSchedulingController extends BaseAdminController
*/ */
public function edit() public function edit()
{ {
return $this->fail('暂未开放');
$params = (new TaskSchedulingValidate())->post()->goCheck('edit'); $params = (new TaskSchedulingValidate())->post()->goCheck('edit');
$result = TaskSchedulingLogic::edit($params); $result = TaskSchedulingLogic::edit($params);
if (true === $result) { if (true === $result) {

9
app/api/controller/InformationController.php
View File

@ -4,6 +4,7 @@ namespace app\api\controller;
use app\common\model\informationg\UserInformationg; use app\common\model\informationg\UserInformationg;
use app\common\logic\BaseLogic; use app\common\logic\BaseLogic;
use app\common\model\task\Task;
use app\common\model\user\User; use app\common\model\user\User;
class InformationController extends BaseApiController class InformationController extends BaseApiController
@ -84,6 +85,14 @@ class InformationController extends BaseApiController
if ($res != true) { if ($res != true) {
return $this->fail( BaseLogic::getError()); return $this->fail( BaseLogic::getError());
} }
if(isset($param['task_id'])&& isset($param['id'])>0){
$task=Task::where('id',$param['task_id'])->find();
$extend=json_decode($task['extend'],true);
$extend['informationg_demand']=$res['id'];
$task->extend=json_encode($extend);
$task->save();
}
UserInformationg::where('id',$param['id'])->update(['update_time'=>time()]); UserInformationg::where('id',$param['id'])->update(['update_time'=>time()]);
return $this->success('成功'); return $this->success('成功');
} }

1
app/common/logic/CompanyLogic.php
View File

@ -215,6 +215,7 @@ class CompanyLogic extends BaseLogic
$data['other_contacts'] = json_decode($data['other_contacts'], true); $data['other_contacts'] = json_decode($data['other_contacts'], true);
$data['qualification'] = json_decode($data['qualification'], true); $data['qualification'] = json_decode($data['qualification'], true);
if($data['qualification'] && isset($data['qualification']['other_qualifications'])){ if($data['qualification'] && isset($data['qualification']['other_qualifications'])){
halt($data['qualification']['other_qualifications']);
$data['qualification']['other_qualifications']=json_decode($data['qualification']['other_qualifications'],true); $data['qualification']['other_qualifications']=json_decode($data['qualification']['other_qualifications'],true);
} }
$find= Admin::where('id', $data['admin_id'])->field('avatar,id_card')->find(); $find= Admin::where('id', $data['admin_id'])->field('avatar,id_card')->find();

11
app/common/logic/task_scheduling/TaskSchedulingLogic.php
View File

@ -73,14 +73,9 @@ class TaskSchedulingLogic extends BaseLogic
{ {
Db::startTrans(); Db::startTrans();
try { try {
TaskScheduling::where('id', $params['id'])->update([ $data=$params;
'create_user_id' => $params['create_user_id'], unset($data['id']);
'template_id' => $params['template_id'], TaskScheduling::where('id', $params['id'])->update($data);
'company_id' => $params['company_id'],
'type' => $params['type'],
'status' => $params['status']
]);
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {

7
app/common/model/user/User.php
View File

@ -208,11 +208,8 @@ class User extends BaseModel
} }
public function getBrigadeNameAttr($value) public function getBrigadeNameAttr($value)
{ {
if($this->brigade){ return Db::name('geo_brigade')->where('id' ,$this->brigade)->value('brigade_name');
return Db::name('geo_brigade')->where('id' ,'in' ,explode(',',$this->brigade))->field('brigade_name')->select()->toArray();
}else{
return [];
}
} }
public function getContractAttr(){ public function getContractAttr(){