Merge branch 'master' of http://59.57.98.130:3000/jjhc/report

app/admin/controller/EnterpriseChangeRecord.php

@@ -8,8 +8,10 @@ use app\common\api\CompanyApi;
 use app\common\api\DictApi;
 use app\common\api\EnterpriseApi;
 use app\common\api\TalentState;
+use app\common\model\CurrentcyFileType;
 use app\common\model\MessageRecord;
 use app\common\model\TalentChecklog;
+use app\common\model\TalentCommonFile;
 
 class EnterpriseChangeRecord extends AdminController {
 
@@ -162,21 +164,110 @@ class EnterpriseChangeRecord extends AdminController {
 
             TalentChecklog::create([
                 'id' => getStringId(),
+                'category' => 'enterprise_change',
                 'mainId' => $ecr['id'],
                 'type' => 10,
                 'typeField' => null,
                 'active' => 1,
-                'state' => 2,
+                'state' => 3,
                 'step' => 101,
                 'stateChange' => "<span class='label label-info'>审核驳回</span>",
                 'description' => $checkMsg,
                 'createTime' => date("Y-m-d H:i:s",time()),
                 'createUser' => session('user')['name']."({$company['name']})"
             ]);
-
             return json(["msg" => '操作成功!',"code" => 200]);
+		}else{
+            $ecr->checkState = 4;
+            $ecr->checkMsg = $checkMsg;
+            $ecr->updateUser = session('user')['uid'];
+            $ecr->updateTime = date("Y-m-d H:i:s");
+            $ecr->save();
 
-		}
+            $ep = EnterpriseApi::getOne($ecr['mainId']);
+            $ep->name = $ecr['newName'];
+            $ep->idCard = $ecr['newIdCard'];
+            $ep->enterpriseTag = $ecr['newEnterpriseTag'];
+            $ep->street = $ecr['newStreet'];
+            $ep->address = $ecr['newAddress'];
+            $ep->legal = $ecr['newLegal'];
+            $ep->ephone = $ecr['newEphone'];
+            $ep->agentName = $ecr['newAgentName'];
+            $ep->agentEmail = $ecr['newAgentEmail'];
+            $ep->agentPhone = $ecr['newAgentPhone'];
+            $ep->industryFieldNew = $ecr['newIndustryFieldNew'];
+            $ep->industryFieldOld = $ecr['newIndustryFieldOld'];
+            $ep->enterpriseType = $ecr['newEnterpriseType'];
+            $ep->bankCard = $ecr['newBankCard'];
+            $ep->bankNetwork = $ecr['newBankNetwork'];
+            $ep->bank = $ecr['newBank'];
+            $ep->updateUser = session('user')['uid'];
+            $ep->updateTime = date("Y-m-d H:i:s");
+            //查询此次上传的文件
+            $list = TalentCommonFile::where('mainId',$ecr['id'])->select()->toArray();
+            if(count($list) > 0){
+                foreach ($list as $k => $v){
+                    $fileInfo = CurrentcyFileType::where('id',$v['typeId'])->select()->toArray();
+                    if(count($fileInfo) > 0){
+                        foreach ($fileInfo as $item) {
+                            switch ($item['api']){
+                                case 'businessLicense':
+                                    $ep->imgurl = $v['url'];
+                                    break;
+                                case 'businessBank':
+                                    $ep->bankImg = $v['url'];
+                                    break;
+                                case 'businessDomain':
+                                    $ep->domainImg = $v['url'];
+                                    break;
+                            }
+                        }
+                    }
+                }
+            }
+            //同步人才库与津贴库  TODO
+            $ep->save();
+            //发送短信
+            $record_data = [
+                'id' => getStringId(),
+                'bizId' => getStringId(),
+                'userId' => $ecr['mainId'],
+                'type' => 2,
+                'smsType' => 2,
+                'name' => $ecr['newName'],
+                'phone' => $ecr['newAgentPhone'],
+                'templateCode' => "【晋江市人才服务平台】您好！您提交申请的优秀人才{$checkMsg}已审核通过，可登录申报系统做相关事宜申报。",
+                'params' => '企业信息变更',
+                'state' => 1,
+                'sendingDate' => date("Y-m-d H:i:s",time()),
+                'createTime' => date("Y-m-d H:i:s",time())
+            ];
+
+            $smsapi = new ChuanglanSmsApi();
+
+            $result = $smsapi->sendSMS($ecr['newAgentPhone'],$record_data['templateCode']);
+
+            MessageRecord::create($record_data);
+
+            $company = CompanyApi::getOne(session('user')['companyId']);
+
+            TalentChecklog::create([
+                'id' => getStringId(),
+                'category' => 'enterprise_change',
+                'mainId' => $ecr['id'],
+                'type' => 10,
+                'typeField' => null,
+                'active' => 1,
+                'state' => 4,
+                'step' => 101,
+                'stateChange' => "<span class='label label-info'>审核通过</span>",
+                'description' => $checkMsg,
+                'createTime' => date("Y-m-d H:i:s",time()),
+                'createUser' => session('user')['name']."({$company['name']})"
+            ]);
+
+            return json(["msg" => '操作成功!',"code" => 200]);
+        }
 
     }
 }

app/common/controller/Api.php

@@ -86,67 +86,70 @@ class Api extends BaseController {
         $list = TalentLogApi::getList($type, $mainId);
         $new_list = [];
         foreach ($list as $item) {
-            if($item['type'] == 10){//姑且按type还区分
-                switch ($item['state']){
-                    case -2:
-                        $new_item["stateName"] = "<span class='label label-success'>待提交</span>";
-                        break;
-                    case -1:
-                        $new_item["stateName"] = "<span class='label label-success'>审核不通过</span>";
-                        break;
-                    case 1:
-                        $new_item["stateName"] = "<span class='label label-success'>待审核</span>";
-                        break;
-                    case 2:
-                        $new_item["stateName"] = "<span class='label label-danger'>审核驳回</span>";
-                        break;
-                    case 3:
-                        $new_item["stateName"] = "<span class='label label-primary'>审核通过</span>";
-                        break;
-                    case 4:
-                        $new_item["stateName"] = "<span class='label label-warm'>上级驳回</span>";
-                        break;
-                    case 8:
-                        $new_item["stateName"] = "<span class='label label-primary'>提交审核</span>";
-                        break;
-                    case 9:
-                        $new_item["stateName"] = "<span class='label label-primary'>重新提交</span>";
-                        break;
-                    case 10:
-                        $new_item["stateName"] = "<span class='label label-default'>冻结</span>";
-                        break;
-                    case 11:
-                        $new_item["stateName"] = "<span class='label label-primary'>撤销审核</span>";
-                        break;
-                }
-            }else{
-                $new_item["stepName"] = DictApi::getTalentInfoStepByState($item["new_state"]);
-                if ($item["state"] == 13) {
-                    $new_item["stateName"] = '<span class="label label-success">审核不通过</span>';
-                } else if (in_array($item["state"], [3, 7, 9, 11])) {
-                    $new_item["stateName"] = '<span class="label label-primary">审核通过</span>';
-                } else if (in_array($item["state"], [4, 8, 10, 12])) {
-                    $new_item["stateName"] = '<span class="label label-danger">审核驳回</span>';
-                } else {
-                    $new_item["stateName"] = '<span class="label label-success">待审核</span>';
-                }
-            }
-
-
-            if ($item["step"] == 3) {
-                $company = CompanyApi::getOne($item["companyId"]);
-                if ($item["active"] == 0) {
-                    $new_item["stateChange"] = str_replace("部门", '"' . $company["name"] . '"', DictApi::getTalentInfoStateName($item["last_state"], $item["step"], $needDeptVerify));
-                } else {
-                    $new_item["stateChange"] = sprintf("%s -> %s", str_replace("部门", '"' . $company["name"] . '"', DictApi::getTalentInfoStateName($item["last_state"], $item["step"], $needDeptVerify)), DictApi::getTalentInfoStateName($item["new_state"], $item["step"], $needDeptVerify));
-                }
-            } else {
-                if ($item["last_state"] && $item["new_state"]) {
-                    $new_item["stateChange"] = sprintf("%s -> %s", DictApi::getTalentInfoStateName($item["last_state"], $item["step"], $needDeptVerify), DictApi::getTalentInfoStateName($item["new_state"], $item["step"], $needDeptVerify));
-                } else {
+            switch ($item['category']){
+                case 'enterprise_change':
+                    switch ($item['step']){
+                        case 100:
+                            $new_item["stepName"] = "<span class='label'>用户操作</span>";
+                            break;
+                        case 101:
+                            $new_item["stepName"] = "<span class='label label-primary'>审核</span>";
+                            break;
+                        case 102:
+                            $new_item["stepName"] = "<span class='label label-danger'>设置冻结</span>";
+                            break;
+                        case 103:
+                            $new_item["stepName"] = "<span class='label label-info'>重置密码</span>";
+                            break;
+                    }
+                    switch ($item['state']){
+                        case 1:
+                            $new_item["stateName"] = "<span class='label label-success'>待提交</span>";
+                            break;
+                        case 2:
+                            $new_item["stateName"] = "<span class='label label-success'>待审核</span>";
+                            break;
+                        case 3:
+                            $new_item["stateName"] = "<span class='label label-danger'>审核驳回</span>";
+                            break;
+                        case 4:
+                            $new_item["stateName"] = "<span class='label label-primary'>审核通过</span>";
+                            break;
+                        case 5:
+                            $new_item["stateName"] = "<span class='label label-warm'>重新提交</span>";
+                            break;
+                    }
                     $new_item["stateChange"] = $item['stateChange'];
-                }
+                    break;
+                default:
+                    $new_item["stepName"] = DictApi::getTalentInfoStepByState($item["new_state"]);
+                    if ($item["state"] == 13) {
+                        $new_item["stateName"] = '<span class="label label-success">审核不通过</span>';
+                    } else if (in_array($item["state"], [3, 7, 9, 11])) {
+                        $new_item["stateName"] = '<span class="label label-primary">审核通过</span>';
+                    } else if (in_array($item["state"], [4, 8, 10, 12])) {
+                        $new_item["stateName"] = '<span class="label label-danger">审核驳回</span>';
+                    } else {
+                        $new_item["stateName"] = '<span class="label label-success">待审核</span>';
+                    }
+                    if ($item["step"] == 3) {
+                        $company = CompanyApi::getOne($item["companyId"]);
+                        if ($item["active"] == 0) {
+                            $new_item["stateChange"] = str_replace("部门", '"' . $company["name"] . '"', DictApi::getTalentInfoStateName($item["last_state"], $item["step"], $needDeptVerify));
+                        } else {
+                            $new_item["stateChange"] = sprintf("%s -> %s", str_replace("部门", '"' . $company["name"] . '"', DictApi::getTalentInfoStateName($item["last_state"], $item["step"], $needDeptVerify)), DictApi::getTalentInfoStateName($item["new_state"], $item["step"], $needDeptVerify));
+                        }
+                    } else {
+                        if ($item["last_state"] && $item["new_state"]) {
+                            $new_item["stateChange"] = sprintf("%s -> %s", DictApi::getTalentInfoStateName($item["last_state"], $item["step"], $needDeptVerify), DictApi::getTalentInfoStateName($item["new_state"], $item["step"], $needDeptVerify));
+                        } else {
+                            $new_item["stateChange"] = "";
+                        }
+                    }
+                    break;
+
             }
+
             $new_item["description"] = $item["description"];
             $new_item["createUser"] = $item["updateUser"] ?: $item["createUser"];
             $new_item["createTime"] = $item["updateTime"] ?: $item["createTime"];

app/enterprise/controller/Api.php

@@ -56,12 +56,14 @@ class Api extends EnterpriseController {
             'newAgentPhone' => $ep['agentPhone'],
             'type' => $ep['type'],
             'newEnterpriseTag' => $ep['enterpriseTag'],
+            'newEnterpriseType' => $ep['enterpriseType'],
             'newIndustryFieldNew' => $ep['industryFieldNew'],
-            'newIndustryFieldOld' => $ep['industryFieldOld']
+            'newIndustryFieldOld' => $ep['industryFieldOld'],
+            'newBankCard' => $ep['bankCard'],
+            'newBank' => $ep['bank'],
+            'newBankNetwork' => $ep['bankNetwork']
         ];
 
-
-
         switch ($ep['checkState']){
             case 1:
                 $ecr['checkStateName'] = '保存未提交审核';
@@ -157,6 +159,7 @@ class Api extends EnterpriseController {
                 $log = [
                     'id' => getStringId(),
                     'mainId' => $record_data['id'],
+                    'category' => 'enterprise_change',
                     'type' => 10,
                     'active' => 1,
                     'state' => 1,
@@ -169,13 +172,47 @@ class Api extends EnterpriseController {
                 $res = ['msg' => '添加成功', 'code' => 200, 'obj' => $record_data];
             } else {
                 $record = EnterpriseRecord::find($record_id);
-                $record->name = htmlspecialchars($data['name']);
+                $ep = Enterprise::where('id',session("user")["uid"])->find();
+                $record->oldName = $ep['name'];
+                $record->oldIdCard = $ep['idCard'];
+                $record->oldIndustryFieldNew = $ep['industryFieldNew'];
+                $record->oldIndustryFieldOld = $ep['industryFieldOld'];
+                $record->oldStreet = $ep['street'];
+                $record->oldAddress = $ep['address'];
+                $record->oldLegal = $ep['legal'];
+                $record->oldEphone = $ep['ephone'];
+                $record->oldAgentName = $ep['agentName'];
+                $record->oldAgentEmail = $ep['agentEmail'];
+                $record->oldAgentPhone = $ep['agentPhone'];
+                $record->oldEnterpriseTag = $ep['enterpriseTag'];
+                $record->oldEnterpriseType = $ep['enterpriseType'];
+                $record->oldBankCard = $ep['bankCard'];
+                $record->oldBank = $ep['bank'];
+                $record->oldBankNetwork = $ep['bankNetwork'];
+                $record->newName = htmlspecialchars($data['name']);
+                $record->newIdCard = htmlspecialchars($data['idCard']);
+                $record->newIndustryFieldNew = $data['industryFieldNew'];
+                $record->newIndustryFieldOld = $data['industryFieldOld'];
+                $record->newStreet = $data['street'];
+                $record->newAddress = $data['address'];
+                $record->newLegal = $data['legal'];
+                $record->newEphone = $data['ephone'];
+                $record->newAgentName = $data['agentName'];
+                $record->newAgentEmail = $data['agentEmail'];
+                $record->newAgentPhone = $data['agentPhone'];
+                $record->newEnterpriseTag = $data['enterpriseTag'];
+                $record->newEnterpriseType = $data['enterpriseType'];
+                $record->newBankCard = $data['bankCard'];
+                $record->newBank = $data['bank'];
+                $record->newBankNetwork = $data['bankNetwork'];
                 $record->updateTime = date("Y-m-d H:i:s");
                 $record->updateUser = session("user")["uid"];
+
                 $record->save();
 
                 $log = [
                     'id' => getStringId(),
+                    'category' => 'enterprise_change',
                     'mainId' => '',
                     'type' => 10,
                     'active' => 1,
@@ -243,14 +280,16 @@ class Api extends EnterpriseController {
         }
         if($obj['checkState'] == 3){
             $obj['checkState'] = 5;
-            $state = 9;
+            $state = 5;
         }else{
             $obj['checkState'] = 2;
+            $state = 2;
         }
         $obj->save();
 
         $log = [
             'id' => getStringId(),
+            'category' => 'enterprise_change',
             'mainId' => $id,
             'type' => 10,
             'active' => 1,