更新人才直认的数据日志

app/common/api/TalentLogApi.php

@@ -181,4 +181,29 @@ class TalentLogApi {
         return TalentLog::update($data);
     }
 
+    public static function system($type, $mainId, $state = [], $description = "", $active = 0, $fileType = null, $fileId = null) {
+
+        $last_log = self::getLastLog($mainId, $type);
+        $log["last_state"] = $last_log["state"] ?: 0;
+        $log["id"] = getStringId();
+        if (is_array($state)) {
+            $log["state"] = $state[0];
+            $log["new_state"] = $state[1];
+            if ($state[2]) {
+                $log["step"] = $state[2];
+            }
+        } else {
+            $log["state"] = $log["new_state"] = $state;
+        }
+        $log["type"] = $type;
+        $log["mainId"] = $mainId;
+        $log["typeFileId"] = $fileType;
+        $log["fileId"] = $fileId;
+        $log["active"] = $active;
+        $log["description"] = $description;
+        $log["createUser"] = '系统';
+        $log["createTime"] = date("Y-m-d H:i:s");
+        return TalentLog::create($log);
+    }
+
 }

app/index/controller/Auth.php

@@ -3,6 +3,7 @@
 namespace app\index\controller;
 
 use app\BaseController;
+use app\common\api\TalentLogApi;
 use app\common\api\UserApi;
 use think\facade\Db;
 
@@ -224,8 +225,8 @@ class Auth extends BaseController {
     }
 
     public function test(){
-        $sms = new \app\common\api\ChuanglanSmsApi();
-        $sms->sendSMS('18060002035', "您好，您的机构信息仍需完善，请登录晋江市人才综合服务申报平台进行完善，您的用户名为：test，密码为：test。");
+        $log = TalentLogApi::system(1, 35,9,"直认数据导入",1);
+
     }
 
 }

app/job/Import.php

@@ -2,6 +2,8 @@
 
 namespace app\job;
 
+use app\common\api\TalentLogApi;
+use app\common\model\TalentChecklog;
 use think\queue\Job;
 use think\facade\Log;
 use think\facade\Db;
@@ -85,7 +87,7 @@ class Import {
                                     }
                                     break;
                                 case 2:
-                                    $info = Db::table("un_enterprise")->where('idCard', $row[$i])->findOrEmpty();
+                                    $info = Db::table("un_enterprise")->where('idCard', $row[$i])->where('delete',0)->findOrEmpty();
                                     if ($info) {
                                         array_push($msg, "机构代码已存在，请检查");
                                     } else {
@@ -144,7 +146,19 @@ class Import {
                             $sheet->setCellValue('L' . ($index + 2), '导入成功，初始账号为：' . $item['idCard'] . '，初始密码为：' . $password);
                             $sender = new ChuanglanSmsApi();
                             $sender->sendSMS($item['agentPhone'], "您好，您的机构信息仍需完善，请登录晋江市人才综合服务申报平台进行完善，您的用户名为：{$item['idCard']}，密码为：{$password}。");
-
+                            TalentChecklog::create([
+                                'id' => getStringId(),
+                                'mainId' => $item['id'],
+                                'type' => 10,
+                                'typeField' => null,
+                                'active' => 1,
+                                'state' => 1,
+                                'step' => 100,
+                                'stateChange' => '直认导入',
+                                'description' => '机构注册',
+                                'createTime' => date("Y-m-d H:i:s", time()),
+                                'createUser' => '系统'
+                            ]);
                         }
                     }
 
@@ -193,7 +207,7 @@ class Import {
                                     }
                                     break;
                                 case 1:
-                                    $info = Db::table("un_enterprise")->where('idCard', $row[$i])->findOrEmpty();
+                                    $info = Db::table("un_enterprise")->where('idCard', $row[$i])->where('delete',0)->findOrEmpty();
                                     if (!$info) {
                                         array_push($msg, "机构代码不存在，请检查");
                                     } else {
@@ -277,7 +291,6 @@ class Import {
                         //$item['source'] = 1;
                         $item['fj_talent_info'] = $str;
                         $item["checkState"] = \app\common\api\TalentState::SCND_SAVE; //保存未提交
-                        $item["highProcess"] = 5; //最高进度
                         $item["isImport"] = 1;//导入人才的标志
                         $item['fjImport'] = 1;
                         if (count($msg) >= 1) {
@@ -287,14 +300,19 @@ class Import {
                                 $item['updateTime'] = date("Y-m-d H:i:s", time());
                                 Db::table("new_talent_info")->where('id', $talent_info['id'])->update($item);
                                 $sheet->setCellValue('AL' . ($index + 2), '更新成功');
+
                             } else {
+                                $item["highProcess"] = 5; //最高进度
                                 $item['createTime'] = date("Y-m-d H:i:s", time());
                                 Db::table("new_talent_info")->insert($item);
                                 $sheet->setCellValue('AL' . ($index + 2), '导入成功');
+
                             }
+                            $log = TalentLogApi::system(1, $talent_info["id"],8,"直认数据导入");
                         }
                     }
 
+
                     $writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Xlsx');
                     $writer->save($path . "/public/storage/" . $res['task_file']);
                     Db::table("new_talent_zhiren")->where('id', $id)->update(['task_result' => $res['task_file'], 'task_status' => 1, 'updateTime' => date("Y-m-d H:i:s", time())]);
@@ -342,7 +360,7 @@ class Import {
                                     }
                                     break;
                                 case 1:
-                                    $info = Db::table("un_enterprise")->where('idCard', $row[$i])->findOrEmpty();
+                                    $info = Db::table("un_enterprise")->where('idCard', $row[$i])->where('delete',0)->findOrEmpty();
                                     if (!$info) {
                                         array_push($msg, "机构代码不存在，请检查");
                                     } else {
@@ -449,6 +467,7 @@ class Import {
                                 Db::table("new_talent_info")->insert($item);
                                 $sheet->setCellValue('AC' . ($index + 2), '导入成功');
                             }
+                            $log = TalentLogApi::system(1, $talent_info["id"],8,"直认数据导入");
                         }
                     }
 

public/static/modular/system/messageRecord/messageRecord.js

@@ -93,7 +93,7 @@ MessageRecord.showSendMessageModal = function(){
                 return ;
             }
             var operation = function(){
-                var ajax = new $ax(Feng.ctxPath + "/messageRecord/sendMessage", function (data) {
+                var ajax = new $ax(Feng.ctxPath + "/admin/message_record/sendMessage", function (data) {
                     if(data.code==200){
                         Feng.success(data.msg);
                         layer.close(index);
@@ -149,7 +149,7 @@ MessageRecord.resendMessage = function(){
             Feng.info("当前记录未发送失败，无法重发");
             return ;
         }
-        var ajax = new $ax(Feng.ctxPath + "/messageRecord/resendMessage", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/admin/message_record/resendMessage", function (data) {
             if(data.code==200){
                 Feng.success(data.msg);
                 MessageRecord.table.refresh();
@@ -165,7 +165,7 @@ MessageRecord.resendMessage = function(){
 }
 
 MessageRecord.refreshMessageState = function(){
-    var ajax = new $ax(Feng.ctxPath + "/messageRecord/refreshMessageState", function (data) {
+    var ajax = new $ax(Feng.ctxPath + "/admin/message_record/refreshMessageState", function (data) {
         if(data.code==200){
             Feng.success(data.msg);
             MessageRecord.table.refresh();
@@ -181,7 +181,7 @@ MessageRecord.refreshMessageState = function(){
 
 MessageRecord.export = function(){
     var queryData = MessageRecord.formParams();
-    var url = Feng.ctxPath + "/messageRecord/export?"+
+    var url = Feng.ctxPath + "/admin/message_record/export?"+
         "&name=" + queryData.name +
         "&type=" + queryData.type +
         "&phone=" + queryData.phone +
@@ -227,7 +227,7 @@ MessageRecord.reset = function (){
 
 $(function () {
     var defaultColunms = MessageRecord.initColumn();
-    var table = new BSTable(MessageRecord.id, "/messageRecord/list", defaultColunms);
+    var table = new BSTable(MessageRecord.id, "/admin/message_record/list", defaultColunms);
     table.setPaginationType("server");
     MessageRecord.table = table.init();
     //批量加载时间控件