1

app/admin/controller/IntegralMgr.php

@@ -3,6 +3,7 @@
 namespace app\admin\controller;
 
 use app\admin\common\AdminController;
+use app\common\api\IntegralProjectApi;
 
 /**
  * Description of IntegralMgr
@@ -16,7 +17,7 @@ class IntegralMgr extends AdminController {
     }
 
     public function list() {
-        return json(EnterpriseVerifyMgrApi::getList($this->request->param()));
+        return json(IntegralProjectApi::getList($this->request->param()));
     }
 
     /**
@@ -26,19 +27,7 @@ class IntegralMgr extends AdminController {
     public function add() {
         if ($this->request->isPost()) {
             $params = $this->request->param();
-            if (!$params["name"]) {
-                return json(["msg" => "请选择审核单位"]);
-            }
-            if (!$params["enterpriseTag"] && !$params["uniCode"]) {
-                return json(["msg" => "请选择单位标签或填写例外企业统一信用代码，可同时设置"]);
-            }
-            if (EnterpriseVerifyMgrApi::chkExist($params["enterpriseTag"]) && $params["enterpriseTag"])
-                return json(["msg" => "该标签已经存在审核配置，不需要重复配置"]);
-            if (EnterpriseVerifyMgrApi::chkUnicodeExist($params["uniCode"]) && $params["uniCode"])
-                return json(["msg" => "输入的例外企业统一信用代码中包含已经被其它单位设置过的企业，不能重复设置"]);
-            if (EnterpriseVerifyMgrApi::edit($params))
-                return json(["code" => 200, "msg" => "添加单位标签审核配置成功"]);
-            return json(["msg" => "添加单位标签审核配置失败"]);
+            return $this->doSave($params);
         }
         return view("save");
     }
@@ -52,31 +41,29 @@ class IntegralMgr extends AdminController {
         if ($this->request->isPost()) {
             return $this->doSave($params);
         }
-        return view("save");
+        $row = IntegralProjectApi::getOne($params["id"]);
+        return view("save", ["row" => $row]);
     }
 
     private function doSave($params) {
-        if (!$params["id"])
-            return json(["msg" => "没有对应的积分项目，无法编辑"]);
         if (!$params["type"]) {
-            return json(["msg" => "请选择审核单位"]);
+            return json(["msg" => "请选择人才类别"]);
         }
-        if (!$params["projectType"]) {
-            return json(["msg" => "请选择审核单位"]);
+        if (!$params["name"]) {
+            return json(["msg" => "请输入项目名称"]);
         }
-        if (!$params["type"]) {
-            return json(["msg" => "请选择审核单位"]);
+        if (!$params["projectType"]) {
+            return json(["msg" => "请选择项目类别"]);
         }
-        if (!$params["enterpriseTag"] && !$params["uniCode"]) {
-            return json(["msg" => "请选择单位标签或填写例外企业统一信用代码，可同时设置"]);
+        if (!$params["active"]) {
+            return json(["msg" => "请设置启用状态"]);
         }
-        if (EnterpriseVerifyMgrApi::chkExist($params["enterpriseTag"], $params["id"]) && $params["enterpriseTag"])
-            return json(["msg" => "该标签已经存在审核配置，不需要重复配置"]);
-        if (EnterpriseVerifyMgrApi::chkUnicodeExist($params["uniCode"], $params["id"]) && $params["uniCode"])
-            return json(["msg" => "输入的例外企业统一信用代码中包含已经被其它单位设置过的企业，不能重复设置"]);
-        if (EnterpriseVerifyMgrApi::edit($params))
-            return json(["code" => 200, "msg" => "编辑单位标签审核配置成功"]);
-        return json(["msg" => "编辑单位标签审核配置失败"]);
+        if (IntegralProjectApi::chkExist($params["name"], $params["type"], $params["projectType"], $params["id"]))
+            return json(["msg" => "项目名称已经被使用"]);
+        $resultStr = $params["id"] ? "编辑" : "添加";
+        if (IntegralProjectApi::edit($params))
+            return json(["code" => 200, "msg" => "{$resultStr}积分项目成功"]);
+        return json(["msg" => "{$resultStr}积分项目失败"]);
     }
 
     /**
@@ -86,9 +73,9 @@ class IntegralMgr extends AdminController {
     public function delete() {
         if ($this->request->isPost()) {
             $id = $this->request->param("id");
-            if (EnterpriseVerifyMgrApi::delete($id))
-                return json(["code" => 200, "msg" => "删除单位标签审核配置成功"]);
-            return json(["msg" => "删除单位标签审核配置失败"]);
+            if (IntegralProjectApi::delete($id))
+                return json(["code" => 200, "msg" => "删除积分项目成功"]);
+            return json(["msg" => "删除积分项目失败"]);
         }
     }
 

app/admin/view/integral_mgr/save.html

@@ -33,7 +33,7 @@
                         <div class="rowGroup">
                             <label class="col-sm-2 control-label spacing">项目类别</label>
                             <div class="col-sm-4 spacing">
-                                <select class="form-control" id="projectType" name="projectType" selectVal="{$row.type}">
+                                <select class="form-control" id="projectType" name="projectType" selectVal="{$row.projectType}">
                                     <option value="">请选择</option>
                                     <option value="1">基础分</option>
                                     <option value="2">贡献分</option>
@@ -53,10 +53,10 @@
             </div>
             <div class="row btn-group-m-t">
                 <div class="col-sm-12" style="text-align: center;">
-                    <button type="button" class="btn btn-sm btn-info " onclick="IntegralMgr.addSubmit()" id="ensure">
+                    <button type="button" class="btn btn-sm btn-info " onclick="IntegralMgrInfo.addSubmit()" id="ensure">
                         <i class="fa fa-check"></i>&nbsp;提交
                     </button>
-                    <button type="button" class="btn btn-sm btn-danger " onclick="IntegralMgr.close()" id="cancel">
+                    <button type="button" class="btn btn-sm btn-danger " onclick="IntegralMgrInfo.close()" id="cancel">
                         <i class="fa fa-eraser"></i>&nbsp;取消
                     </button>
                 </div>

app/command/RegisterMessenger.php

@@ -10,6 +10,7 @@ use think\console\input\Argument;
 use think\console\input\Option;
 use think\console\Output;
 use think\facade\Db;
+use think\facade\Log;
 
 /**
  * 注册短信提醒后台审核
@@ -24,7 +25,11 @@ class RegisterMessenger extends Command {
 
     protected function execute(Input $input, Output $output) {
         //短信加入队列
-        queue("app\job\Messenger", ["type" => "msg", "msg" => 777, "status" => 1]);
+        //查询注册未审核的企业
+        $list = [];
+        foreach ($list as $item) {
+            queue("app\job\Messenger", ["type" => 1, "info" => $item]);
+        }
     }
 
 }

app/command/Solver.php

@@ -10,6 +10,7 @@ use think\console\input\Argument;
 use think\console\input\Option;
 use think\console\Output;
 use think\facade\Db;
+use think\facade\Log;
 use app\common\api\XwCrontab;
 
 /**
@@ -32,10 +33,9 @@ class Solver extends Command {
             $root = app()->getRootPath();
             $schedules = Db::table("new_schedule")->select();
             foreach ($schedules as $schedule) {
-                //检查时间到了没
+                //检查时间到了没                
                 if (XwCrontab::check(time(), $schedule["timeStr"]) && $schedule["state"] == 1) {
                     exec("php {$root}think " . $schedule["action"]);
-                    //queue("app\job\Messenger", []); //任务加入队列待执行
                 }
             }
             flock($lockFile, LOCK_UN);

app/common/api/IntegralItemApi.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace app\common\api;
+
+use app\common\model\IntegralItem;
+
+class IntegralItemApi {
+
+    public static function getOne($id) {
+        return IntegralItem::findOrEmpty($id);
+    }
+
+    public static function getList($params) {
+        $order = $params["order"] ?: "desc";
+        $offset = $params["offset"] ?: 0;
+        $limit = $params["limit"] ?: 10;
+        $where[] = ["delete", "=", 0];
+        if ($params["type"]) {
+            $where[] = ["type", "=", $params["type"]];
+        }
+        if ($params["name"]) {
+            $where[] = ["name", "like", "%{$params["name"]}%"];
+        }
+        if ($params["projectType"]) {
+            $where[] = ["projectType", "=", $params["projectType"]];
+        }
+        if ($params["active"]) {
+            $where[] = ["active", "=", $params["active"]];
+        }
+        $count = IntegralItem::where($where)->count();
+        $list = IntegralItem::where($where)->limit($offset, $limit)->order("updateTime desc,createTime desc")->select()->toArray();
+        return ["total" => $count, "rows" => $list];
+    }
+
+    public static function getAll() {
+        $where[] = ["delete", "=", 0];
+        $list = IntegralItem::where($where)->order("updateTime desc,createTime desc")->select()->toArray();
+        return $list;
+    }
+
+    public static function edit($params) {
+        $data["type"] = $params["type"];
+        $data["name"] = $params["name"];
+        $data["projectType"] = $params["projectType"];
+        $data["active"] = $params["active"];
+        if ($params["id"]) {
+            $data["id"] = $params["id"];
+            $data["updateTime"] = date("Y-m-d H:i:s");
+            $data["updateUser"] = session("user")["uid"];
+            return IntegralItem::update($data);
+        } else {
+            $data["createTime"] = date("Y-m-d H:i:s");
+            $data["createUser"] = session("user")["uid"];
+            return IntegralItem::insert($data);
+        }
+    }
+
+    public static function delete($id) {
+        $data["id"] = $id;
+        $data["delete"] = 1;
+        $data["updateUser"] = session("user")["uid"];
+        $data["updateTime"] = date("Y-m-d H:i:s");
+        //同时删除子项
+        $upd["delete"] = 1;
+        $upd["updateTime"] = date("Y-m-d H:i:s");
+        $upd["updateTime"] = session("user")["uid"];
+        $where[] = ["projectId", "=", $id];
+        \app\common\model\IntegralItem::where($where)->save($upd);
+        return IntegralItem::update($data);
+    }
+
+    public static function chkExist($name, $type, $projectType, $id = 0) {
+        $where = [];
+        $where[] = ["type", "=", $params["type"]];
+        $where[] = ["projectType", "=", $params["projectType"]];
+        $where[] = ["name", "=", $params["name"]];
+        $where[] = ["delete", "=", 0];
+        if ($id) {
+            $where[] = ["id", "<>", $id];
+        }
+        return IntegralItem::where($where)->find();
+    }
+
+}

app/common/api/IntegralProjectApi.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace app\common\api;
+
+use app\common\model\IntegralProject;
+
+class IntegralProjectApi {
+
+    public static function getOne($id) {
+        return IntegralProject::findOrEmpty($id);
+    }
+
+    public static function getList($params) {
+        $order = $params["order"] ?: "desc";
+        $offset = $params["offset"] ?: 0;
+        $limit = $params["limit"] ?: 10;
+        $where[] = ["delete", "=", 0];
+        if ($params["type"]) {
+            $where[] = ["type", "=", $params["type"]];
+        }
+        if ($params["name"]) {
+            $where[] = ["name", "like", "%{$params["name"]}%"];
+        }
+        if ($params["projectType"]) {
+            $where[] = ["projectType", "=", $params["projectType"]];
+        }
+        if ($params["active"]) {
+            $where[] = ["active", "=", $params["active"]];
+        }
+        $count = IntegralProject::where($where)->count();
+        $list = IntegralProject::where($where)->limit($offset, $limit)->order("updateTime desc,createTime desc")->select()->toArray();
+        return ["total" => $count, "rows" => $list];
+    }
+
+    public static function getAll() {
+        $where[] = ["delete", "=", 0];
+        $list = IntegralProject::where($where)->order("updateTime desc,createTime desc")->select()->toArray();
+        return $list;
+    }
+
+    public static function edit($params) {
+        $data["type"] = $params["type"];
+        $data["name"] = $params["name"];
+        $data["projectType"] = $params["projectType"];
+        $data["active"] = $params["active"];
+        if ($params["id"]) {
+            $data["id"] = $params["id"];
+            $data["updateTime"] = date("Y-m-d H:i:s");
+            $data["updateUser"] = session("user")["uid"];
+            return IntegralProject::update($data);
+        } else {
+            $data["createTime"] = date("Y-m-d H:i:s");
+            $data["createUser"] = session("user")["uid"];
+            return IntegralProject::insert($data);
+        }
+    }
+
+    public static function delete($id) {
+        $data["id"] = $id;
+        $data["delete"] = 1;
+        $data["updateUser"] = session("user")["uid"];
+        $data["updateTime"] = date("Y-m-d H:i:s");
+        //同时删除子项
+        $upd["delete"] = 1;
+        $upd["updateTime"] = date("Y-m-d H:i:s");
+        $upd["updateTime"] = session("user")["uid"];
+        $where[] = ["projectId", "=", $id];
+        \app\common\model\IntegralItem::where($where)->save($upd);
+        return IntegralProject::update($data);
+    }
+
+    public static function chkExist($name, $type, $projectType, $id = 0) {
+        $where = [];
+        $where[] = ["type", "=", $type];
+        $where[] = ["projectType", "=", $projectType];
+        $where[] = ["name", "=", $name];
+        $where[] = ["delete", "=", 0];
+        if ($id) {
+            $where[] = ["id", "<>", $id];
+        }
+        return IntegralProject::where($where)->find();
+    }
+
+}

app/job/Messenger.php

@@ -4,6 +4,8 @@ namespace app\job;
 
 use think\queue\Job;
 use think\facade\Log;
+use think\facade\Db;
+use app\common\api\ChuanglanSmsApi;
 
 /**
  * Description of Messenger
@@ -14,7 +16,7 @@ class Messenger {
 
     public function fire(Job $job, $data) {
         if ($this->deal($data)) {
-            Log::record(json_encode($data));
+            Log::info(json_encode($data));
             $job->delete();
             return true;
         }
@@ -33,10 +35,13 @@ class Messenger {
      */
     public function deal($data): bool {
         $type = $data["type"];
-        switch ($data) {
+        switch ($type) {
             case 1:
                 //通知单位审核注册
-                break;
+                $enterprise = $data["info"]; //企业信息
+                $msg["createTime"] = date("Y-m-d H:i:s");
+                $sender = new ChuanglanSmsApi();
+                $sender->sendSMS($mobile, $msg);
             case 2:
                 break;
         }

public/static/modular/talentIdentify/integralMgr/IntegralMgr_info.js

@@ -95,7 +95,7 @@ IntegralMgrInfo.addSubmit = function () {
     var ajax = new $ax("/admin/integral_mgr/add", function (data) {
         if (data.code == "200") {
             Feng.success(data.msg);
-            window.parent.IntegraMgr.table.refresh();
+            window.parent.IntegralMgr.table.refresh();
             IntegralMgrInfo.close();
         } else {
             Feng.error(data.msg);
@@ -119,7 +119,7 @@ IntegralMgrInfo.editSubmit = function () {
     var ajax = new $ax(Feng.ctxPath + "/admin/integral_mgr/edit", function (data) {
         if (data.code == "200") {
             Feng.success(data.msg);
-            window.parent.IntegraMgr.table.refresh();
+            window.parent.IntegralMgr.table.refresh();
             IntegralMgrInfo.close();
         } else {
             Feng.error(data.msg);
@@ -134,14 +134,14 @@ IntegralMgrInfo.editSubmit = function () {
 /**
  * 验证数据是否为空
  */
-IdentifyConditionInfoDlg.validate = function () {
+IntegralMgrInfo.validate = function () {
     $('#integraMgrInfoForm').data("bootstrapValidator").resetForm();
     $('#integraMgrInfoForm').bootstrapValidator('validate');
     return $("#integraMgrInfoForm").data('bootstrapValidator').isValid();
 }
 
 $(function () {
-    Feng.initValidator("integraMgrInfoForm", IdentifyConditionInfoDlg.validateFields);
+    Feng.initValidator("integraMgrInfoForm", IntegralMgrInfo.validateFields);
     //下拉框数据回显
     $("select").each(function () {
         $(this).val($(this).attr("selectVal"));