注销账号

app/admin/controller/Enterprise.php

@@ -351,6 +351,8 @@ class Enterprise extends AdminController {
                 }
                 if ($newCheckState == 3) {
                     $record_data['templateCode'] = "【晋江市人才服务平台】您好！您提交的晋江市现代产业体系人才机构注册信息已审核通过，可登录“晋江市人才综合服务申报平台”做相关事宜申报。退订回复TD。";
+
+                    queue("app\job\Enterprise", ["type" => 1, "id" => $id]);
                 }
 
                 if ($newCheckState == 3 || ($checkState == 2 && $ep["type"] != CommonConst::ENTERPRISE_WJ) || ($checkState == 2 && $ep["isGeneral"] == 1) || $checkState == 5) {

app/admin/controller/EnterpriseCloseAccount.php

@@ -90,6 +90,8 @@ class EnterpriseCloseAccount extends AdminController {
             $responseObj->msg = "审核成功";
 
             Db::commit();
+
+            queue("app\job\Messenger", ["type" => 109, "userId" => $user["uid"]]);
             return $responseObj;
         } catch (\think\db\exception\DbException $e) {
             $responseObj->msg = $e->getMessage();

app/common/api/UserApi.php

@@ -26,15 +26,15 @@ class UserApi {
         $this->username = $username;
         $this->password = $password;
         $this->usertype = $usertype;
+        $where = [];
         switch ($usertype) {
             case 2:
                 //企业
-                $where = [];
                 $name1 = str_replace(["(", ")"], ["（", "）"], $username);
                 $name2 = str_replace(["（", "）"], ["(", ")"], $username);
-                $where[] = ["username", "=", $name1];
-                $where[] = ["username", "=", $name2];
-                $user = Enterprise::whereOr($where)->findOrEmpty();
+                $where[] = ["username", "in", [$name1, $name2]];
+                $where[] = ["delete", "=", 0];
+                $user = Enterprise::where($where)->findOrEmpty();
                 break;
             case 3:
                 //个人

app/common/controller/Api.php

@@ -88,6 +88,7 @@ class Api extends BaseController {
         $params = $this->request->param();
         $mainId = $params["mainId"];
         $enterpriseId = $params["enterpriseId"];
+        $category = $params["category"];
         $type = $params["type"];
         $list = [];
         switch ($type) {
@@ -159,32 +160,36 @@ class Api extends BaseController {
                                 $new_item["stepName"] = "<span class='label label-info'>重置密码</span>";
                                 break;
                         }
-                        switch ($item['state']) {
-                            case 1:
-                                if ($item["stateChange"]) {
-                                    $new_item["stateName"] = "<span class='label label-success'>待提交</span>";
-                                } else {
-                                    $item['stateChange'] = "修改密码";
-                                }
-                                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;
-                            case 6:
-                                $new_item["stateName"] = "<span class='label label-danger'>初审驳回</span>";
-                                break;
-                            case 7:
-                                $new_item["stateName"] = "<span class='label label-primary'>初审通过</span>";
-                                break;
+                        if ($category == "close_account") {
+                            $new_item["stateName"] = \app\common\state\MainState::getStateName($item['state']);
+                        } else {
+                            switch ($item['state']) {
+                                case 1:
+                                    if ($item["stateChange"]) {
+                                        $new_item["stateName"] = "<span class='label label-success'>待提交</span>";
+                                    } else {
+                                        $item['stateChange'] = "修改密码";
+                                    }
+                                    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;
+                                case 6:
+                                    $new_item["stateName"] = "<span class='label label-danger'>初审驳回</span>";
+                                    break;
+                                case 7:
+                                    $new_item["stateName"] = "<span class='label label-primary'>初审通过</span>";
+                                    break;
+                            }
                         }
                         $new_item["stateChange"] = $item['stateChange'];
                     } else {
@@ -659,6 +664,7 @@ class Api extends BaseController {
         $type = $param["type"];
         $id = $param["id"];
 
+        $where = [];
         switch ($type) {
             case ProjectState::TALENT:
                 $where[] = ["type", "=", $type];
@@ -683,10 +689,16 @@ class Api extends BaseController {
                 $record = \app\common\api\IntegralRecordApi::getOne($id);
                 $zip_filename = sprintf("%s(%s)积分申报材料.zip", $record["name"], $record["enterprise"]["name"]);
                 break;
+            case 109:
+                $table = "un_enterpriseclose_record";
+                $record = \app\common\model\EnterpriseCloseAccount::where("id", $id)->find();
+                $zip_filename = sprintf("%s(%s)注销申请材料.zip", $record["name"], $record["username"]);
+                $files = json_decode($record["files"], true);
+                break;
         }
-        $where = [];
         $where[] = ["mainId", "=", $id];
-        $files = Db::table($table)->where($where)->select()->toArray();
+        if (!$files)
+            $files = Db::table($table)->where($where)->select()->toArray();
         if (!$files)
             die("没有附件不能打包下载");
 
@@ -700,10 +712,16 @@ class Api extends BaseController {
             header('HTTP/1.1 404 NOT FOUND');
         }
         foreach ($files as $file) {
-            $filepath = "storage/" . $file["url"];
-            $fileTypeInfo = Db::table("new_common_filetype")->where("id", $file["typeId"])->find();
-            $filename = $fileTypeInfo["name"] . "/" . $file["orignName"];
-            $zip->addFile($filepath, $filename);
+            if (is_array($file)) {
+                $filepath = "storage/" . $file["url"];
+                $fileTypeInfo = Db::table("new_common_filetype")->where("id", $file["typeId"])->find();
+                $filename = $fileTypeInfo["name"] . "/" . $file["orignName"];
+                $zip->addFile($filepath, $filename);
+            } else {
+                $filepath = "storage/" . $file;
+                $filename = basename($filepath);
+                $zip->addFile($filepath, $filename);
+            }
         }
         $zip->close();
         if (file_exists($tmp_file_path)) {

app/common/validate/Enterprise.php

@@ -8,7 +8,7 @@ use app\admin\model\Enterprise as EnterpriseModel;
 class Enterprise extends Validate {
 
     protected $rule = [
-        'username' => 'require|max:50|unique:un_enterprise',
+        'username' => 'require|max:50|checkUserName',
         'password' => 'require|min:8|regex:/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,}$/',
         're_password' => 'require|confirm:password',
         'name' => 'require|max:100|checkName', //|regex:/^[\x{4e00}-\x{9fa5}\(\)（）\da-zA-Z&]{2,50}$/u
@@ -82,8 +82,17 @@ class Enterprise extends Validate {
         'jc_change' => ['name', 'idCard', 'agentName', 'agentPhone', 'legal', 'street', 'address', 'ephone', 'agentEmail']
     ];
 
+    protected function checkUserName($value, $rule, $data = []) {
+        $info = EnterpriseModel::where('username', $value)->where('delete', 0)->where('id', '<>', $data['id'])->find();
+        if ($info) {
+            return "该账号已被注册";
+        } else {
+            return true;
+        }
+    }
+
     protected function checkName($value, $rule, $data = []) {
-        $info = EnterpriseModel::where('name', $value)->where('active', 1)->where('delete', 0)->where('id', '<>', $data['id'])->find();
+        $info = EnterpriseModel::where('name', $value)->where('delete', 0)->where('id', '<>', $data['id'])->find();
         if ($info) {
             return "机构名称已存在";
         } else {

app/common/validate/Hospital.php

@@ -8,7 +8,7 @@ use app\admin\model\Enterprise as EnterpriseModel;
 class Hospital extends Validate {
 
     protected $rule = [
-        'username' => 'require|max:50|unique:un_enterprise',
+        'username' => 'require|max:50|checkUserName',
         'password' => 'require|min:8|regex:/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,}$/',
         're_password' => 'require|confirm:password',
         'name' => 'require|max:100|checkName', //|regex:/^[\x{4e00}-\x{9fa5}\(\)（）\da-zA-Z&]{2,50}$/u
@@ -67,8 +67,17 @@ class Hospital extends Validate {
         'changePwd' => ['password']
     ];
 
+    protected function checkUserName($value, $rule, $data = []) {
+        $info = EnterpriseModel::where('username', $value)->where('delete', 0)->where('id', '<>', $data['id'])->find();
+        if ($info) {
+            return "该账号已被注册";
+        } else {
+            return true;
+        }
+    }
+
     protected function checkName($value, $rule, $data = []) {
-        $info = EnterpriseModel::where('name', $value)->where('active', 1)->where('delete', 0)->where('id', '<>', $data['id'])->find();
+        $info = EnterpriseModel::where('name', $value)->where('delete', 0)->where('id', '<>', $data['id'])->find();
         if ($info) {
             return "医院名称已被使用";
         } else {

app/common/validate/School.php

@@ -8,7 +8,7 @@ use app\admin\model\Enterprise as EnterpriseModel;
 class School extends Validate {
 
     protected $rule = [
-        'username' => 'require|max:50|unique:un_enterprise',
+        'username' => 'require|max:50|checkUserName',
         'password' => 'require|min:8|regex:/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,}$/',
         're_password' => 'require|confirm:password',
         'name' => 'require|max:100|checkName', //|regex:/^[\x{4e00}-\x{9fa5}\(\)（）\da-zA-Z&]{2,50}$/u
@@ -55,8 +55,17 @@ class School extends Validate {
         'changePwd' => ['password'],
     ];
 
+    protected function checkUserName($value, $rule, $data = []) {
+        $info = EnterpriseModel::where('username', $value)->where('delete', 0)->where('id', '<>', $data['id'])->find();
+        if ($info) {
+            return "该账号已被注册";
+        } else {
+            return true;
+        }
+    }
+
     protected function checkName($value, $rule, $data = []) {
-        $info = EnterpriseModel::where('name', $value)->where('active', 1)->where('delete', 0)->where('id', '<>', $data['id'])->find();
+        $info = EnterpriseModel::where('name', $value)->where('delete', 0)->where('id', '<>', $data['id'])->find();
         if ($info) {
             return "学校名称已存在";
         } else {

app/enterprise/controller/Api.php

@@ -1118,10 +1118,6 @@ class Api extends EnterpriseController {
             $response->msg = "注销原因不能为空";
             return \StrUtil::back($response, "EnterpriseCenter.callback");
         }
-        if (!$tmp && !$record["files"]) {
-            $response->msg = "请上传附件";
-            return \StrUtil::back($response, "EnterpriseCenter.callback");
-        }
 
         $upload = new \app\common\api\UploadApi();
         $files = $this->request->file("closeAccountFiles");
@@ -1135,6 +1131,10 @@ class Api extends EnterpriseController {
             }
             $tmp[] = $result->filepath;
         }
+        if (!$tmp && !$record["files"]) {
+            $response->msg = "请上传附件";
+            return \StrUtil::back($response, "EnterpriseCenter.callback");
+        }
         Db::startTrans();
         try {
             if (\StrUtil::isEmpOrNull($record["firstSubmitTime"])) {

app/job/Enterprise.php

@@ -0,0 +1,140 @@
+<?php
+
+namespace app\job;
+
+use think\queue\Job;
+use think\facade\Log;
+use think\facade\Db;
+use app\common\api\ChuanglanSmsApi;
+use app\common\model\MessageRecord;
+
+/**
+ * Description of Enterprise
+ * 企业相关事务处理
+ * @author sgq
+ */
+class Enterprise {
+
+    public function fire(Job $job, $data) {
+        if ($this->deal($data)) {
+            $job->delete();
+            return true;
+        }
+        if ($job->attempts() >= 3) {
+            $job->delete();
+            return false;
+        }
+        $job->release(10); //10秒后重试
+    }
+
+    /**
+     * 处理业务逻辑
+     * @param type $data
+     * @return bool
+     */
+    public function deal($data): bool {
+        $type = $data["type"];
+        switch ($type) {
+            case 1:
+                $id = $data["id"];
+                //注册成功，检查是否重新注册，如果是，继承账号所有人才数据和申报数据
+                $ep = \app\common\api\EnterpriseApi::getOne($id);
+                if ($ep && $ep["checkState"] == 3) {
+                    $where = [];
+                    $where[] = ["idCard", "=", $ep["idCard"]];
+                    $where[] = ["checkState", "=", 3];
+                    $closeRecord = \app\common\model\EnterpriseCloseAccount::where($where)->order("passTime desc")->find();
+                    if ($closeRecord && $closeRecord["enterpriseId"]) {
+                        $oldEpId = $closeRecord["enterpriseId"];
+                        //开始转移数据
+                        Db::startTrans();
+                        try {
+                            unset($where);
+                            //生活补贴
+                            $where[] = ["enterpriseId", "=", $oldEpId];
+                            $upd["enterpriseId"] = $id;
+                            $upd["type"] = $ep["type"];
+                            $upd["enterpriseName"] = $ep["name"];
+                            Db::table("md_living_allowance_info")->where($where)->save($upd);
+                            //津补贴
+                            Db::table("un_talent_allowance_info")->where($where)->save($upd);
+
+                            //积分
+                            unset($where);
+                            unset($upd);
+                            $where[] = ["enterprise_id", "=", $oldEpId];
+                            $upd["enterprise_id"] = $id;
+                            $upd["type"] = $ep["type"];
+                            Db::table("new_integral_log")->where($where)->save($upd);
+                            unset($upd["type"]);
+                            Db::table("new_integral_record")->where($where)->save($upd);
+                            Db::table("new_integral_veto")->where($where)->save($upd);
+
+                            //人才
+                            unset($where);
+                            unset($upd);
+                            $where[] = ["enterprise_id", "=", $oldEpId];
+                            $upd["enterprise_id"] = $id;
+                            Db::table("new_talent_info")->where($where)->save($upd);
+
+                            //信息变更
+                            unset($where);
+                            unset($upd);
+                            $where[] = ["enterpriseId", "=", $oldEpId];
+                            $upd["enterpriseId"] = $id;
+                            $upd["type"] = $ep["type"];
+                            Db::table("un_talent_basic_change")->where($where)->save($upd);
+                            $upd["enterpriseName"] = $ep["name"];
+                            Db::table("un_talent_type_change")->where($where)->save($upd);
+                            Db::table("un_talent_quit")->where($where)->save($upd);
+                            Db::table("un_talent_bank_change")->where($where)->save($upd);
+
+                            //工作变更情况1 作为变更前时候
+                            unset($where);
+                            unset($upd);
+                            $where[] = ["oldEnterpriseId", "=", $oldEpId];
+                            $upd["oldEnterpriseId"] = $oldEpId;
+                            Db::table("un_talent_workunit_change")->where($where)->save($upd);
+
+                            //工作变更情况2 作为变更后时候
+                            unset($where);
+                            unset($upd);
+                            $where[] = ["newEnterpriseId", "=", $oldEpId];
+                            $upd["newEnterpriseId"] = $oldEpId;
+                            $upd["type"] = $ep["type"];
+                            Db::table("un_talent_workunit_change")->where($where)->save($upd);
+
+
+                            //other
+                            unset($where);
+                            unset($upd);
+                            $where[] = ["enterpriseId", "=", $oldEpId];
+                            $upd["enterpriseId"] = $id;
+                            Db::table("un_talent_allowance_project")->where($where)->save($upd);
+                            Db::table("un_talent_allowancecontract_detail")->where($where)->save($upd);
+                            $upd["type"] = $ep["type"];
+                            Db::table("un_childschool_fees")->where($where)->save($upd);
+                            Db::table("un_house_renting")->where($where)->save($upd);
+                            Db::table("un_house_renting_fees")->where($where)->save($upd);
+                            Db::table("un_house_renting_purchase_fees")->where($where)->save($upd);
+                            Db::table("un_housepurchase")->where($where)->save($upd);
+                            Db::table("un_houser_renting_purchase_apply")->where($where)->save($upd);
+                            Db::table("un_medical_subsidy")->where($where)->save($upd);
+                            Db::table("un_training_subsidy")->where($where)->save($upd);
+                            Db::table("un_major_projects")->where($where)->save($upd);
+                            Db::commit();
+                            return true;
+                        } catch (\think\Exception $e) {
+                            Db::rollback();
+                            Log::error(json_encode($data));
+                            Log::error($e->getMessage());
+                            return false;
+                        }
+                    }
+                }
+                break;
+        }
+        return false;
+    }
+
+}

app/job/Messenger.php

@@ -146,6 +146,42 @@ class Messenger {
                     return false;
                 }
                 break;
+            case 109:
+                //注销审核通过通知
+                try {
+                    $id = $data["userId"];
+                    $ep = \app\common\api\EnterpriseApi::getOne($id);
+                    if ($ep && $ep["agentPhone"]) {
+                        $template = sprintf("【晋江市人才服务平台】您申请的账号注销已通过审核，账号注销成功。");
+                        $smsapi = new ChuanglanSmsApi();
+                        $result = $smsapi->sendSMS($ep["agentPhone"], $template);
+                        $result = json_decode($result, true);
+                        $id = getStringId();
+                        $record_data = [
+                            'id' => getStringId(),
+                            'userId' => $id,
+                            'bizId' => $result["msgId"],
+                            'type' => 2,
+                            'smsType' => 2,
+                            'name' => $ep["name"],
+                            'phone' => $ep["agentPhone"],
+                            'params' => "账号注销审核",
+                            'templateCode' => $template,
+                            'state' => $result['code'] == 0 ? 2 : 3,
+                            'sendingDate' => date("Y-m-d H:i:s", time()),
+                            'createTime' => date("Y-m-d H:i:s", time()),
+                            'msg' => $result['errorMsg']
+                        ];
+
+                        MessageRecord::create($record_data);
+                        return true;
+                    }
+                } catch (\think\Exception $e) {
+                    Log::error(json_encode($data));
+                    Log::error($e->getMessage());
+                    return false;
+                }
+                break;
         }
         return false;
     }

public/static/js/register.js

@@ -588,7 +588,7 @@ Register.enterpriseUserRegister = function () {
         case "gaojiao":
             var x = document.getElementById("gj_imgurl").value;
             if (x == "") {
-                Feng.info("办学许可证、法人证书或登记证书!");
+                Feng.info("请上传办学许可证、法人证书或登记证书!");
                 return;
             }
             if (!Feng.chkFileInvalid(document.getElementById("gj_imgurl").files[0], 5, 10, ["image/jpeg", "image/gif", "image/png", "image/jpg", "application/pdf"], "办学许可证、法人证书或登记证书只允许上传PDF或图片")) {

public/static/modular/enterprise/closeAccountRecord/closeAccount.js

@@ -177,7 +177,7 @@ TalentQuit.export = function () {
  */
 TalentQuit.download = function () {
     if (this.check()) {
-        window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/common/api/downloadZip?type=3&id=" + TalentQuit.seItem.id));
+        window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/common/api/downloadZip?type=109&id=" + TalentQuit.seItem.id));
     }
 }
 
@@ -194,7 +194,7 @@ TalentQuit.showLog = function (id) {
         area: ['80%', '80%'],
         maxmin: true,
         success: function (layero, index) {
-            Feng.getCheckLog(id, {"type": 10, "mainId": id, "typeFileId": "", "active": 1})
+            Feng.getCheckLog(id, {"type": 10, "mainId": id, "typeFileId": "", "active": 1, "category": "close_account"})
         }
     });
 

public/static/modular/enterprise/closeAccountRecord/closeAccount_info.js

@@ -198,7 +198,7 @@ TalentQuitInfoDlg.toggleField = function () {
  * 打包下载
  */
 TalentQuitInfoDlg.download = function () {
-    window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/common/api/downloadZip?type=3&id=" + $("#id").val()));
+    window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/common/api/downloadZip?type=109&id=" + $("#id").val()));
 }
 
 $(function () {
@@ -207,8 +207,10 @@ $(function () {
     } else {
         $("#fileLi").attr("style", "pointer-events: none");
     }
-    Feng.getCheckLog("logTable", {"type": 10, "mainId": $("#id").val(), "typeFileId": "", "active": 1})
+    Feng.getCheckLog("logTable", {"type": 10, "mainId": $("#id").val(), "typeFileId": "", "active": 1, "category": "close_account"})
     $("select").each(function () {
         $(this).val($(this).attr("value"));
     });
+
+    $(".imgs").viewer({fullscreen: false});
 });