wang jun 2 роки тому
батько
коміт
56f4ebef6d

+ 101 - 90
prjcenter/prjKLY/base/AboutActivity.php

@@ -144,10 +144,11 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
             }
 
             $backdata["btr_canBreakoff"] = false;
-            if (
-                intval($backdata["status"]) >= 2 //提前违约
-                && ((intval($backdata["settle_catalog"]) == 0
-                ) || (intval($backdata["settle_catalog"]) > 0
+            if (intval($backdata["status"]) >= 2//提前违约
+                 && ((
+                    intval($backdata["settle_catalog"]) == 0
+                ) || (
+                    intval($backdata["settle_catalog"]) > 0
                 ))
             ) {
                 $backdata["btr_canBreakoff"] = true;
@@ -284,8 +285,7 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
                 case "unset":
                     $sqlParam[":istop"] = 0;
                     break;
-                default:
-                    throw new GeneralException("", "不支持的todo");
+                default:throw new GeneralException("", "不支持的todo");
             }
             $sqlTemp = ""; //不设置remark避免覆盖
             $sqlTemp .= " update biz_trader_recruit set updatetime=:nowtime,istop=:istop where 1=1 {$query};";
@@ -367,6 +367,7 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
                 if ($bizTrader["catalog"] == 1 && empty($bizTrader["bizlicense_pic"])) {
                     throw new GeneralException("", "您尚未完成实名认证(提交营业执照),暂时无法发布新招聘信息");
                 }
+
             }
             $bizData = isset($ajaxdata["bizData"]) ? $ajaxdata["bizData"] : $GPC["bizData"];
             if (empty($bizData)) {
@@ -376,10 +377,8 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
             /***字段参数收集并校验**start***/
             $saveData = array();
             $saveData["title"] = trim($bizData["title"]);
-            if (
-                mb_strlen($saveData["title"]) <= 0 || mb_strlen($saveData["title"]) > 180
-                || !preg_match("/^.*$/", $saveData["title"])
-            ) {
+            if (mb_strlen($saveData["title"]) <= 0 || mb_strlen($saveData["title"]) > 180
+                || !preg_match("/^.*$/", $saveData["title"])) {
                 throw new GeneralException("", "标题必填,且长度范围为1-180!");
             }
 
@@ -409,6 +408,7 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
                 if (intval($saveData["begin_datetime"]) < strtotime(date("Y-m-d", time()))) {
                     throw new GeneralException("lessToday", "开始日期不能小于今天");
                 }
+
             }
             $saveData["finish_datetime"] = intval(strtotime(date("Y-m-d", strtotime($bizData["finish_datetime"]))));
             if ($handleMode == "upsertLaunchAudit") { //只在提交审核时验证
@@ -419,6 +419,7 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
                 if (($saveData["finish_datetime"] - $saveData["begin_datetime"]) > 3600 * 24 * 6) {
                     throw new GeneralException("", "完工结日期跨度不能大于7天!");
                 }
+
             }
 
             $saveData["begin_hour"] = trim($bizData["begin_hour"]);
@@ -438,6 +439,7 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
                 if ((intval($saveData["begin_datetime"]) + (intval($saveData["begin_hour2"]))) <= time()) {
                     throw new GeneralException("overdue", "开工时间请大于当前时间");
                 }
+
             }
 
             $saveData["finish_hour"] = trim($bizData["finish_hour"]);
@@ -472,10 +474,8 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
             $saveData["linker_name"] = trim($bizData["linker_name"]);
             if ($handleMode == "upsertLaunchAudit") //只在提交审核时验证
             {
-                if (
-                    mb_strlen($saveData["linker_name"]) <= 0 || mb_strlen($saveData["linker_name"]) > 30
-                    || !preg_match("/^.*$/", $saveData["linker_name"])
-                ) {
+                if (mb_strlen($saveData["linker_name"]) <= 0 || mb_strlen($saveData["linker_name"]) > 30
+                    || !preg_match("/^.*$/", $saveData["linker_name"])) {
                     throw new GeneralException("", "联系人姓名必填,且长度范围为1-30!");
                 }
             }
@@ -568,6 +568,7 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
                     $sqlParam += $upsertSet["params"]; //合并参数集合
                     $sqlTemp .= " insert into biz_trader_recruit set " . $upsertSet["fields"] . ";";
                     $sqlTemp .= " set @bizid=LAST_INSERT_ID();";
+
                 } else {
                     $oldData = pdo_fetch("select * from biz_trader_recruit where id=" . intval($bizData["id"]));
                     if (empty($oldData)) {
@@ -648,7 +649,7 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
                         $sqlParam[":auto_nowtime"] = time();
                         $sqlParam[":auto_status"] = 2;
                         $sqlParam[":auto_remark"] = "[" . date("Y-m-d H:i:s", time()) . "] 自动审核通过 \n";
-                        //                        feeper和salary
+//                        feeper和salary
                         $sqlTemp .= " update biz_trader_recruit set updatetime=:auto_nowtime, `status`=:auto_status, remark=concat(:auto_remark,ifnull(remark,''))
                         ,plat_fetchrate=:plat_fetchrate,plat_fetchmoney=:plat_fetchmoney
                         ,sharer_fetchrate=:sharer_fetchrate,sharer_fetchmoney=:sharer_fetchmoney
@@ -832,8 +833,7 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
                         $plat_fetchmoney = $plat_fetchmoney < 0 ? 0 : $plat_fetchmoney;
                         $plat_fetchrate = round($plat_fetchmoney / floatval($recruit["feetotal"]) * 100, 2);
                         break;
-                    default:
-                        throw new GeneralException("", "platcutMode参数不正确!");
+                    default:throw new GeneralException("", "platcutMode参数不正确!");
                 }
                 $sharecutMode = isset($ajaxdata["sharecutMode"]) ? $ajaxdata["sharecutMode"] : $GPC["sharecutMode"];
                 $sharecutValue = isset($ajaxdata["sharecutValue"]) ? $ajaxdata["sharecutValue"] : $GPC["sharecutValue"];
@@ -848,8 +848,7 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
                         $sharer_fetchmoney = $sharer_fetchmoney < 0 ? 0 : $sharer_fetchmoney;
                         $sharer_fetchrate = round($sharer_fetchmoney / $plat_fetchmoney * 100, 2);
                         break;
-                    default:
-                        throw new GeneralException("", "platcutMode参数不正确!");
+                    default:throw new GeneralException("", "platcutMode参数不正确!");
                 }
                 $sqlParams[":status"] = 2;
                 $sqlParams[":remark"] = "[" . date("Y-m-d H:i:s", time()) . "] {$operatorName}审核通过 \n";
@@ -909,7 +908,7 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
             $sqlParam[":biz_traderid"] = intval($bizTrader["id"]);
             $sqlParam[":remark"] = "[" . date("Y-m-d H:i:s", time()) . "] 终止招聘 $reason \n";
 
-            //            $sql = "select * from biz_todowork  where biz_recruitid= 476 and ( `status`=-1 or `status`=-3 or `status`>=2 or `status`!=5)";
+//            $sql = "select * from biz_todowork  where biz_recruitid= 476 and ( `status`=-1 or `status`=-3 or `status`>=2 or `status`!=5)";
             //            $recruit = pdo_fetch($sql, array());
             //            var_dump($recruit);
             //            die;
@@ -1136,6 +1135,7 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
                     if (intval($nowDelegate["biz_trader2id"]) != intval($bizTrader2["id"])) {
                         throw new GeneralException("otherGrabed", "其他人已抢先获取到了此招聘的授权!");
                     }
+
                 } else {
                     $sqlParam = array();
                     $sqlParam[":nowtime"] = time();
@@ -1159,6 +1159,7 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
                     if (empty($nowDelegate)) {
                         throw new GeneralException("", "异常!");
                     }
+
                 }
                 $nowDelegate["begin_datetime"] = date("Y-m-d H:i:s", $nowDelegate["begin_datetime"]);
                 $nowDelegate["finish_datetime"] = date("Y-m-d H:i:s", $nowDelegate["finish_datetime"]);
@@ -1194,8 +1195,7 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
                     $plat_fetchmoney = $plat_fetchmoney < 0 ? 0 : $plat_fetchmoney;
                     $plat_fetchrate = round($plat_fetchmoney / floatval($recruit["feetotal"]) * 100, 2);
                     break;
-                default:
-                    throw new GeneralException("", "platcutMode参数不正确!");
+                default:throw new GeneralException("", "platcutMode参数不正确!");
             }
             $sharecutMode = isset($ajaxdata["sharecutMode"]) ? $ajaxdata["sharecutMode"] : $GPC["sharecutMode"];
             $sharecutValue = isset($ajaxdata["sharecutValue"]) ? $ajaxdata["sharecutValue"] : $GPC["sharecutValue"];
@@ -1210,8 +1210,7 @@ function bizbase_recruitEntityHandle($fromSubSystem, $baseUser, $bizUser, $handl
                     $sharer_fetchmoney = $sharer_fetchmoney < 0 ? 0 : $sharer_fetchmoney;
                     $sharer_fetchrate = round($sharer_fetchmoney / $plat_fetchmoney * 100, 2);
                     break;
-                default:
-                    throw new GeneralException("", "platcutMode参数不正确!");
+                default:throw new GeneralException("", "platcutMode参数不正确!");
             }
 
             if (is_nan($plat_fetchrate)) {
@@ -1357,7 +1356,8 @@ function bizbase_recruitFieldAttrMap($fromSubSystem, $direct, $data)
         "remark" => "work_remark",
     );
     if (intval($fromSubSystem) !== intval(SUBSYS_PLAT_PCWEB)) {
-        $mapTable = array();
+        $mapTable = array(
+        );
     }
     foreach ($mapTable as $front => $backend) {
         if ($direct == "FtoB") {
@@ -1367,11 +1367,11 @@ function bizbase_recruitFieldAttrMap($fromSubSystem, $direct, $data)
             $src = $backend;
             $des = $front;
         }
-        $data[$des] = (isset($data[$src]) ? $data[$src] : null);
-        unset($data[$src]);
+        $data[$des] = (isset($data[$src]) ? $data[$src] : null);unset($data[$src]);
     }
     //附加特殊情况
     if ($direct == "FtoB") {
+
     } else {
         $data["arrivalTime"] = $data["startTime"];
         $data["workingHours"] = $data["startTime"] . "--" . $data["finishTime"] . ";" . $data["startHour"] . "--" . $data["finisHour"];
@@ -1642,7 +1642,7 @@ function bizbase_recruitAboutQuery($fromSubSystem, $baseUser, $bizUser, $handleM
             $query = isset($ajaxdata["query"]) ? $ajaxdata["query"] : $GPC["query"];
             $query = empty(trim($exportExcel)) ? $query : json_decode($query, true);
 
-            //            $pageData = pdo_fetchall("select * from biz_trader_recruit order by id desc ", array());
+//            $pageData = pdo_fetchall("select * from biz_trader_recruit order by id desc ", array());
             //            print_r($pageData);die;
 
             if (empty($query) && !is_array($query)) { //验证一下query信息集
@@ -1906,7 +1906,7 @@ function bizbase_recruitAboutQuery($fromSubSystem, $baseUser, $bizUser, $handleM
                     $orderby = " order by btr.istop desc,btr.id desc ";
                     break;
             }
-            //            print_r($sqlBody);die;
+//            print_r($sqlBody);die;
             //构建sql串
             //            $sqlBody.="  from biz_trader_recruit as     btr ";
             $sqlBody .= " FROM (SELECT *, CONCAT(FROM_UNIXTIME(begin_datetime,\"%Y%m%d\"), REPLACE(begin_hour,':','')) AS begin_time_new FROM biz_trader_recruit ) btr ";
@@ -1928,14 +1928,14 @@ function bizbase_recruitAboutQuery($fromSubSystem, $baseUser, $bizUser, $handleM
             $sqlFetch .= " ,(select count(*) from biz_todowork btdw where btdw.biz_recruitid=btr.id and ( btdw.`status`>=1 ) ) as now_worker_total000"; //已报及有效报名人数/无效报名次数扣减总数
             $sqlFetch .= " ,(select count(*) from biz_todowork btdw where btdw.biz_recruitid=btr.id and ( btdw.`status`=-1 or btdw.`status`=-3 ) ) as num_abnormal_total ";
             $sqlFetch .= " {$sqlSelectExt} {$sqlBody} {$orderby} ";
-            //            print_r($sqlFetch);
+//            print_r($sqlFetch);
             //            print_r($sqlParam);die;
             $exportExcel = isset($ajaxdata["exportExcel"]) ? $ajaxdata["exportExcel"] : $GPC["exportExcel"];
             if (trim($exportExcel) != "true") { //正常输出
                 $start = (intval($pageIndex) - 1) * $pageSize;
                 $sqlFetch .= " limit {$start},{$pageSize} ";
                 $pageData = pdo_fetchall($sqlFetch, $sqlParam);
-                //                print_r($sqlFetch);
+//                print_r($sqlFetch);
                 //                print_r($sqlParam);
                 //                die;
                 foreach ($pageData as &$item) { //后端到前端数据转换
@@ -2039,8 +2039,7 @@ function bizbase_recruitAboutQuery($fromSubSystem, $baseUser, $bizUser, $handleM
                 });
             }
             break;
-        default:
-            throw new GeneralException("", "不支持的handleMode!");
+        default:throw new GeneralException("", "不支持的handleMode!");
     }
 }
 
@@ -2115,6 +2114,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                 if (empty($sharerWorker)) {
                     throw new GeneralException("", "分享者id没有对应的记录,请核查!");
                 }
+
             }
             $bizArgs = array("handleMode" => $handleMode, "bizWorker" => $bizWorker, "recruitInfo" => $recruitInfo, "sharerWorkerId" => $sharerWorkerId);
             $backdata = bizbase_recruitWorkLock($recruitId, $planDotime, $bizArgs, function ($recruitId, $planDotime, $bizArgs, $mainRemain, $dateRemain, $restRemain) {
@@ -2295,8 +2295,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                     $sqlParam[":remark"] = "[" . date("Y-m-d H:i:s", time()) . "] 拒绝参团 $reason \n";
                     $sqlParam[":teamstatus"] = -1; //参团状态:0-待参团;1-已提交参团;2-已入团;-1-参团被驳回;-2-参团被踢出;-3-已解散;
                     break;
-                default:
-                    throw new GeneralException("", "不支持的todo!");
+                default:throw new GeneralException("", "不支持的todo!");
             }
             $sqlTemp = "";
             $sqlTemp .= " update biz_todowork set updatetime=:nowtime,`teamstatus`=:teamstatus";
@@ -2428,6 +2427,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                 if (intval($teamInfo["tdwk_biz_traderid"]) != intval($bizTrader["id"])) {
                     throw new GeneralException("", "此团组不是报的您家的名,请核查!");
                 }
+
             }
             $teamInfo["iamleader"] = ($teamInfo["leader_workerid"] == intval($bizWorker["id"]));
             $teamInfo["createtime"] = date("Y-m-d H:i:s", $teamInfo["createtime"]);
@@ -2493,6 +2493,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                 if (intval($workInfo["tdwk_biz_traderid"]) != intval($bizTrader["id"])) {
                     throw new GeneralException("", "此订单不是报的您家的名,请核查!");
                 }
+
             }
             if (!empty($bizTrader2)) {
                 bizTrader2_verifyRecuritDelegate($bizTrader2, $workInfo["biz_recruitid"]);
@@ -2579,6 +2580,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                 if (empty($sharerWorker)) {
                     throw new GeneralException("", "分享者id没有对应的记录,请核查!");
                 }
+
             }
             $accountInfo = bizbase_workerAccountInfo($bizWorker);
             $balance = round(floatval($accountInfo["balance"]), 2);
@@ -2626,10 +2628,8 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                     $sqlParam[":cancel_teamstatus"] = -4; //0-待参团;1-已提交参团;2-已入团;-1-参团被驳回;-2-参团被踢出;-3-已解散;-4-被动取消;
                     $sqlParam[":workDateStart"] = intval($recruitInfo["begin_datetime"]);
                     $sqlParam[":workDateFinish"] = $sqlParam[":workDateStart"];
-                    if (
-                        intval($recruitInfo["settle_catalog"]) <= 0 //普通招聘的多日招聘
-                        && intval($recruitInfo["begin_datetime"]) < intval($recruitInfo["finish_datetime"])
-                    ) {
+                    if (intval($recruitInfo["settle_catalog"]) <= 0//普通招聘的多日招聘
+                         && intval($recruitInfo["begin_datetime"]) < intval($recruitInfo["finish_datetime"])) {
                         $sqlParam[":workDateFinish"] = intval($recruitInfo["finish_datetime"]);
                     }
 
@@ -2672,7 +2672,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                     if ($nowPayMoney <= 0) {
                         $nowPayMoney = 0;
                     }
-                    //过滤掉0收支明细
+//过滤掉0收支明细
                     $sqlParam = array();
                     $sqlParam[":nowtime"] = time();
                     $sqlParam[":biz_recruitid"] = intval($recruitId);
@@ -2828,10 +2828,8 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                     $sqlParam[":cancel_teamstatus"] = -4; //0-待参团;1-已提交参团;2-已入团;-1-参团被驳回;-2-参团被踢出;-3-已解散;-4-被动取消;
                     $sqlParam[":workDateStart"] = intval($recruitInfo["begin_datetime"]);
                     $sqlParam[":workDateFinish"] = $sqlParam[":workDateStart"];
-                    if (
-                        intval($recruitInfo["settle_catalog"]) <= 0 //普通招聘的多日招聘
-                        && intval($recruitInfo["begin_datetime"]) < intval($recruitInfo["finish_datetime"])
-                    ) {
+                    if (intval($recruitInfo["settle_catalog"]) <= 0//普通招聘的多日招聘
+                         && intval($recruitInfo["begin_datetime"]) < intval($recruitInfo["finish_datetime"])) {
                         $sqlParam[":workDateFinish"] = intval($recruitInfo["finish_datetime"]);
                     }
 
@@ -3022,7 +3020,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                     $sqlTemp .= " update biz_todowork set updatetime=:nowtime,`status`=:wkstatus, remark=concat(:wkremark,ifnull(remark,'')) ";
                     $sqlTemp .= "    where id=" . intval($workInfo["id"]) . ";";
                     $sqlTemp .= " insert into biz_worker_account ( `biz_workerid`, `createtime`,`type`,          `money`, `status`, `biz_catalog`,`biz_id`, remark )";
-                    //                    $sqlTemp .="    select                         biz_workerid ,    :nowtime ,    0 ,  enroll_premoney,        1,            5 ,      id, :wkremark ";
+//                    $sqlTemp .="    select                         biz_workerid ,    :nowtime ,    0 ,  enroll_premoney,        1,            5 ,      id, :wkremark ";
                     $sqlTemp .= "    select                         biz_workerid ,    :nowtime ,    0 ,  enroll_premoney,        1,            7 ,      id, :wkremark ";
                     $sqlTemp .= "    from biz_todowork where id=" . intval($workInfo["id"]) . ";";
                 }
@@ -3069,7 +3067,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
             $teamid = isset($ajaxdata["teamid"]) ? $ajaxdata["teamid"] : $GPC["teamid"];
             $minaCode = isset($ajaxdata["minaCode"]) ? $ajaxdata["minaCode"] : $GPC["minaCode"];
 
-            //            $update_sql = "update biz_worker_account set status=1 where biz_workerid = 314";
+//            $update_sql = "update biz_worker_account set status=1 where biz_workerid = 314";
             //            $backdata=pdo_query3($update_sql,array());
             //            var_dump($backdata);die;
 
@@ -3161,10 +3159,8 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                 $sqlParams[":cancel_teamstatus"] = -4; //0-待参团;1-已提交参团;2-已入团;-1-参团被驳回;-2-参团被踢出;-3-已解散;-4-被动取消;
                 $sqlParams[":workDateStart"] = intval($recruitInfo["begin_datetime"]);
                 $sqlParams[":workDateFinish"] = $sqlParams[":workDateStart"];
-                if (
-                    intval($recruitInfo["settle_catalog"]) <= 0 //普通招聘的多日招聘
-                    && intval($recruitInfo["begin_datetime"]) < intval($recruitInfo["finish_datetime"])
-                ) {
+                if (intval($recruitInfo["settle_catalog"]) <= 0//普通招聘的多日招聘
+                     && intval($recruitInfo["begin_datetime"]) < intval($recruitInfo["finish_datetime"])) {
                     $sqlParams[":workDateFinish"] = intval($recruitInfo["finish_datetime"]);
                 }
 
@@ -3245,7 +3241,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                             if ($nowPayMoney <= 0) {
                                 $nowPayMoney = 0;
                             }
-                            //将来在收支明细中过滤掉money=0的记录;
+//将来在收支明细中过滤掉money=0的记录;
                             $sqlParam = array();
                             $sqlParam[":nowtime"] = time();
                             $sqlParam[":biz_traderid"] = $bizTrader["id"];
@@ -3396,8 +3392,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                     $sqlParam[":status"] = 4;
                     $sqlParam[":remark"] = "[" . date("Y-m-d H:i:s", time()) . "] 结束工作 $remark \n";
                     break;
-                default:
-                    throw new GeneralException("", "不支持的todo!");
+                default:throw new GeneralException("", "不支持的todo!");
             }
             foreach ($todoworkList as $item) {
                 if (intval($item["deleted"]) != 0) {
@@ -3418,7 +3413,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                             throw new GeneralException("", "订单不是待开工状态!");
                         }
 
-                        //                        if (strtotime(date("Y-m-d",intval($item["todo_begindate"]))) > strtotime(date("Y-m-d",time())))
+//                        if (strtotime(date("Y-m-d",intval($item["todo_begindate"]))) > strtotime(date("Y-m-d",time())))
                         //                            throw new GeneralException("", "还未到开工日期,还不能开工!");
                         //                        if ((strtotime(date("Y-m-d",intval($item["todo_begindate"])))+intval($item["btr_begin_hour2"])) > time())
                         //                            throw new GeneralException("", "还未到开工时间,还不能开工!");
@@ -3463,8 +3458,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                                 break;
                         }
                         break;
-                    default:
-                        throw new GeneralException("", "不支持的todo!");
+                    default:throw new GeneralException("", "不支持的todo!");
                 }
                 $sqlTemp .= " update biz_todowork set updatetime=:nowtime  ";
                 $sqlTemp .= "     ,`status`=:status, remark=concat(:remark,ifnull(remark,''))";
@@ -3555,13 +3549,13 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                     $sqlParam[":workid"] = intval($workInfo["id"]);
                     $sqlTemp = "";
 
-                    //                    阿东【进行修改,下方注释代码,为原来代码】退还押金 2020-06-18 16:20
+//                    阿东【进行修改,下方注释代码,为原来代码】退还押金 2020-06-18 16:20
                     $ratio = isset($ajaxdata["ratio"]) ? $ajaxdata["ratio"] : $GPC["ratio"]; //比例
                     if ($ratio > 1) {
                         throw new GeneralException("", "比例错误,不能大于 1 ");
                     }
 
-                    //                    为0的时候,代表商家预付款全额返还,即“完全会员责任”,此时需要将会员的押金补偿给商家,
+//                    为0的时候,代表商家预付款全额返还,即“完全会员责任”,此时需要将会员的押金补偿给商家,
                     //                    0-1之间为比例,大于0时商家预付款30%表示支付给会员的金额,70%商家,会员押金原路返还
                     if ($ratio == 0) {
                         //商家押金收入进账
@@ -3583,10 +3577,10 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                         $sqlTemp .= " insert into biz_worker_account ( `biz_workerid`, `createtime`,`type`,          `money`, `status`, `biz_catalog`,`biz_id`, remark )";
                         $sqlTemp .= "    select                         biz_workerid ,    :nowtime ,    0 ,  enroll_premoney,        1,            7 ,      id, concat(:nowtime2,'会员押金解冻\n') ";
                         $sqlTemp .= "    from biz_todowork where id=:workid;";
-                        //                        工单金额
+//                        工单金额
                         $feetotal = pdo_fetch("select btr.feetotal as feetotal from biz_todowork tdwk left join biz_trader_recruit btr on btr.id=tdwk.biz_recruitid where tdwk.id={$workInfo["id"]};");
 
-                        //                        会员应得工单的%$ratio = 金额
+//                        会员应得工单的%$ratio = 金额
 
                         $user_money = round($feetotal['feetotal'] * $ratio, 2);
 
@@ -3596,7 +3590,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                         $sqlTemp .= "    select                         biz_workerid ,    :nowtime ,    0 ,  :user_money,        1,            0 ,      id, :nowtime3 ";
                         $sqlTemp .= "    from biz_todowork where id=:workid;";
 
-                        //                        商户应得工单的 = 总工单金额- 会员应得的金额
+//                        商户应得工单的 = 总工单金额- 会员应得的金额
                         $sqlParam[":shop_money"] = $feetotal['feetotal'] - $user_money;
                         $sqlTemp .= " insert into biz_trader_account ( `biz_traderid`, `createtime`,`type`,              `money`, `status`, `biz_catalog`, `biz_id`, remark )";
                         $sqlTemp .= "    select                      btr.biz_traderid,    :nowtime ,    0 , :shop_money,        1,             7, tdwk.id, :nowtime3  ";
@@ -3608,7 +3602,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                     $backdata = pdo_query3($sqlTemp, $sqlParam);
                     return $backdata;
 
-                    //                    //会员押金解冻
+//                    //会员押金解冻
                     //                    $sqlTemp.=" insert into biz_worker_account ( `biz_workerid`, `createtime`,`type`,          `money`, `status`, `biz_catalog`,`biz_id`, remark )";
                     //                    $sqlTemp.="    select                         biz_workerid ,    :nowtime ,    0 ,  enroll_premoney,        1,            7 ,      id, concat(:nowtime2,'会员违约时,先将押金解冻\n') ";
                     //                    $sqlTemp.="    from biz_todowork where id=:workid;";
@@ -3650,6 +3644,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                 if (empty($workInfo)) {
                     throw new GeneralException("", "订单id没有对应的记录,请核查!");
                 }
+
             } else {
                 $workPayCode = isset($ajaxdata["workPayCode"]) ? $ajaxdata["workPayCode"] : $GPC["workPayCode"];
                 if (empty(trim($workPayCode))) {
@@ -3664,6 +3659,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                 if (empty($workInfo)) {
                     throw new GeneralException("", "订单核销码没有对应的记录,请核查!");
                 }
+
             }
             $moneyUserId = intval($workInfo["biz_traderid"]);
             $moneyRoleType = 0;
@@ -3671,11 +3667,13 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                 if (intval($workInfo["biz_workerid"] != intval($bizWorker["id"]))) {
                     throw new GeneralException("", "此订单不是您的记录,请核查!");
                 }
+
             }
             if ($handleMode == "waitPayByTrader") {
                 if (intval($workInfo["biz_traderid"] != intval($bizTrader["id"]))) {
                     throw new GeneralException("", "此订单所对应的招聘信息不是您的,请核查!");
                 }
+
             }
             if ($handleMode == "waitPayByTrader2") {
                 $delegateInfo = bizTrader2_getRecuritDelegate(intval($workInfo["biz_recruitid"]));
@@ -3747,6 +3745,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                 if (empty($workInfo)) {
                     throw new GeneralException("", "订单id没有对应的记录,请核查!");
                 }
+
             } else {
                 $workPayCode = isset($ajaxdata["workPayCode"]) ? $ajaxdata["workPayCode"] : $GPC["workPayCode"];
                 if (empty(trim($workPayCode))) {
@@ -3761,6 +3760,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                 if (empty($workInfo)) {
                     throw new GeneralException("", "订单核销码没有对应的记录,请核查!");
                 }
+
             }
             $minaCode = isset($ajaxdata["minaCode"]) ? $ajaxdata["minaCode"] : $GPC["minaCode"];
             $params = array("handleMode" => $handleMode, "baseUser" => $baseUser, "bizUser" => $bizUser, "bizTrader" => $bizTrader, "bizTrader2" => $bizTrader2, "srcWorkInfo" => $workInfo, "minaCode" => $minaCode);
@@ -3794,24 +3794,27 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
                     if (intval($workInfo["biz_traderid"] != intval($bizTrader["id"]))) {
                         throw new GeneralException("", "此订单所对应的招聘信息不是您的,请核查!");
                     }
+
                 }
                 if ($handleMode == "paySettleByTrader2") {
                     $delegateInfo = bizTrader2_getRecuritDelegate(intval($workInfo["biz_recruitid"]));
                     if (empty($delegateInfo) || intval($delegateInfo["biz_trader2id"]) != intval($bizTrader2["id"])) {
                         throw new GeneralException("", "您没有被授权此订单所对应的招聘信息,或授权已过期,请核查!");
                     }
+
                 }
                 if ($handleMode == "paySettleByPlater") {
                     if (!(intval($workInfo["status"]) == 4 || intval($workInfo["status"]) == -5 || intval($workInfo["status"]) == -8)) {
                         throw new GeneralException("", "此订单不是待结算或拒绝支付或超48小时未结算状态,请核查!");
                     }
+
                 } else {
                     /*
-                    *  改为 录用即可核销
-                    *  20220929 wj
-                    */
+                     *  改为 录用即可核销
+                     *  20220929 wj
+                     */
                     /*if (intval($workInfo["status"]) != 4) {
-                        throw new GeneralException("", "此订单不是待结算状态,请核查!");
+                    throw new GeneralException("", "此订单不是待结算状态,请核查!");
                     }*/
                     if (!in_array(intval($workInfo["status"]), [2, 4])) {
                         throw new GeneralException("", "此订单不是可结算状态,请核查!");
@@ -4070,8 +4073,7 @@ function bizbase_todoWorkEntityHandle($fromSubSystem, $baseUser, $bizUser, $hand
             $backdata = pdo_query3($sqlTemp, $sqlParam);
             return array("payqr" => $payqr, "paycode" => $sqlParam[":paycode"]);
             break;
-        default:
-            throw new GeneralException("", "不支持的handleMode!");
+        default:throw new GeneralException("", "不支持的handleMode!");
     }
 }
 function bizbase_todoWorkPayCore($prePayArgs, $bizArgs)
@@ -4225,10 +4227,8 @@ function bizbase_todoWorkEnrollVerify($handleMode, $bizWorker, $recruitInfo, $pl
     }
     $workDateStart = intval($recruitInfo["begin_datetime"]);
     $workDateFinish = $workDateStart;
-    if (
-        intval($recruitInfo["settle_catalog"]) <= 0 //普通招聘的多日招聘
-        && intval($recruitInfo["begin_datetime"]) < intval($recruitInfo["finish_datetime"])
-    ) {
+    if (intval($recruitInfo["settle_catalog"]) <= 0//普通招聘的多日招聘
+         && intval($recruitInfo["begin_datetime"]) < intval($recruitInfo["finish_datetime"])) {
         $workDateFinish = intval($recruitInfo["finish_datetime"]);
     }
 
@@ -4236,7 +4236,7 @@ function bizbase_todoWorkEnrollVerify($handleMode, $bizWorker, $recruitInfo, $pl
         $workDateStart = strtotime(date("Y-m-d", $planDotime));
         $workDateFinish = strtotime(date("Y-m-d 23:59:59", $planDotime));
     }
-    //    if(($workDateStart+intval($recruitInfo["begin_hour2"]))<=time()+3600*2)
+//    if(($workDateStart+intval($recruitInfo["begin_hour2"]))<=time()+3600*2)
     if (($workDateStart + intval($recruitInfo["begin_hour2"])) <= time()) {
         throw new GeneralException("overdue", "已过招聘可报名时间,不能再报名!");
     }
@@ -4478,7 +4478,7 @@ function bizbase_todoWorkAboutQuery($fromSubSystem, $baseUser, $bizUser, $handle
             }
             $status = $all['status'];
             $start = (intval($pageIndex) - 1) * $pageSize;
-            //            if status=1 查看招聘,条件:没有开始的任务根据开始时间和时间进行判断
+//            if status=1 查看招聘,条件:没有开始的任务根据开始时间和时间进行判断
             $sql = "";
             //where发布人
             //            if($status == 1){
@@ -4540,10 +4540,10 @@ function bizbase_todoWorkAboutQuery($fromSubSystem, $baseUser, $bizUser, $handle
             foreach ($list as $k => $v) {
                 $list[$k]['begin_datetime_bright'] = date('Y-m-d', $v['begin_datetime']);
                 $list[$k]['finish_datetime_bright'] = date('Y-m-d', $v['finish_datetime']);
-                //                    已录用的数量
+//                    已录用的数量
                 $accepted_ok_sql = "SELECT COUNT(*) as count FROM biz_todowork where biz_recruitid = {$v['id']} AND status = 2";
                 $list[$k]['accepted_ok'] = pdo_fetch($accepted_ok_sql, array())['count'];
-                //                    待录用
+//                    待录用
                 $accepted_no_sql = "SELECT COUNT(*) as count FROM biz_todowork where biz_recruitid = {$v['id']} AND status = 1";
                 $list[$k]['accepted_no'] = pdo_fetch($accepted_no_sql, array())['count'];
 
@@ -4552,7 +4552,7 @@ function bizbase_todoWorkAboutQuery($fromSubSystem, $baseUser, $bizUser, $handle
                 $list[$k]['todowork_status_three'] = pdo_fetch($status_three, array())['count'];
 
                 //                    待结算
-                $status_four = "SELECT COUNT(*) as count FROM biz_todowork where biz_recruitid = {$v['id']} AND status = 4";
+                $status_four = "SELECT COUNT(*) as count FROM biz_todowork where biz_recruitid = {$v['id']} AND status in (2,3,4)";
                 $list[$k]['todowork_status_four'] = pdo_fetch($status_four, array())['count'];
 
                 //                    已结算
@@ -4567,7 +4567,7 @@ function bizbase_todoWorkAboutQuery($fromSubSystem, $baseUser, $bizUser, $handle
                     ":btrid" => intval($bizId),
                 ));
             }
-            //            发布招聘的条数
+//            发布招聘的条数
             //            $sql_one=" FROM (SELECT *, CONCAT(FROM_UNIXTIME(begin_datetime,\"%Y%m%d\"), REPLACE(begin_hour,':','')) AS begin_time_new FROM biz_trader_recruit WHERE biz_traderid={$baseUser['biz_userid']}) t ";
             //            $sql_one .= " where t.begin_time_new > ".date('YmdHi',time());
             //            $sql_one .= " AND t.status != -2";
@@ -4579,7 +4579,7 @@ function bizbase_todoWorkAboutQuery($fromSubSystem, $baseUser, $bizUser, $handle
             $sql_one = "select count(*) as count from biz_todowork as bit join biz_trader_recruit  as btr on btr.id = bit.biz_recruitid where bit.`status`=1 and btr.`status`=2 and btr.biz_traderid = '{$baseUser['biz_userid']}' ";
             $sumDataOne = pdo_fetch($sql_one);
 
-            //            查看工作的条数
+//            查看工作的条数
             //            $sql_two=" FROM (SELECT *, CONCAT(FROM_UNIXTIME(begin_datetime,\"%Y%m%d\"), REPLACE(begin_hour,':','')) AS begin_time_new FROM biz_trader_recruit WHERE biz_traderid={$baseUser['biz_userid']}) t ";
             //            $sql_two .= "left join biz_todowork tdwk on t.id=tdwk.biz_recruitid ";
             //            $sql_two .= " where t.begin_time_new < ".date('YmdHi',time());
@@ -4589,7 +4589,7 @@ function bizbase_todoWorkAboutQuery($fromSubSystem, $baseUser, $bizUser, $handle
             $count_two = "SELECT COUNT(*) as count FROM ( SELECT *,( SELECT count(*) FROM biz_todowork WHERE biz_todowork.biz_recruitid = biz_trader_recruit.id AND status IN (2,3,4,90,-8,-7,-6) ) AS biz_todowork_count FROM	biz_trader_recruit WHERE biz_traderid = {$baseUser['biz_userid']} ) t  WHERE t.biz_todowork_count >= 1  AND t.is_delete = 0 ";
             $sumDataTwo = pdo_fetch($count_two, array());
 
-            //            历史发布
+//            历史发布
             //            $sql_three=" FROM (SELECT *, CONCAT(FROM_UNIXTIME(begin_datetime,\"%Y%m%d\"), REPLACE(begin_hour,':','')) AS begin_time_new FROM biz_trader_recruit WHERE biz_traderid={$baseUser['biz_userid']}) t ";
             //            $sql_three .= " where t.begin_time_new < ".date('YmdHi',time());
             //            $sql_three .= " OR t.status = -2";
@@ -4723,6 +4723,7 @@ function bizbase_todoWorkAboutQuery($fromSubSystem, $baseUser, $bizUser, $handle
                 if (intval($teamInfo["biz_traderid"]) != intval($bizTrader["id"])) {
                     throw new GeneralException("", "此团组不是报的您家的名,请核查!");
                 }
+
             }
         case "fetchallByPlater":
         case "fetchallByTrader":
@@ -5288,10 +5289,11 @@ left join biz_trader_account tdwkat2 on tdwk.`status`=5 and tdwkat2.`status`=1 a
                     }
 
                     $data["btr_canBreakoff"] = false;
-                    if (
-                        intval($data["recruit_status"]) == 2 //提前违约
-                        && ((intval($data["btr_settle_catalog"]) == 0
-                        ) || (intval($data["btr_settle_catalog"]) > 0
+                    if (intval($data["recruit_status"]) == 2//提前违约
+                         && ((
+                            intval($data["btr_settle_catalog"]) == 0
+                        ) || (
+                            intval($data["btr_settle_catalog"]) > 0
                         ))
                     ) {
                         $data["btr_canBreakoff"] = true;
@@ -5331,7 +5333,7 @@ left join biz_trader_account tdwkat2 on tdwk.`status`=5 and tdwkat2.`status`=1 a
                     $sqlSummary = " select count(*) as count from (select tdwk.id " . $sqlBody . " ) as temp;";
                 }
                 $sumData = pdo_fetch($sqlSummary, $sqlParam);
-                //                foreach ($pageData as $k=>$v){
+//                foreach ($pageData as $k=>$v){
                 //                    $pageData[$k]['enrolled_heads'] = explode(',',$v['enrolled_heads']);
                 //                }
                 return array(
@@ -5371,7 +5373,12 @@ left join biz_trader_account tdwkat2 on tdwk.`status`=5 and tdwkat2.`status`=1 a
                         $wk_name = json_decode($wk_name);
                         $pageData[] = array(
                             //intval($datarow["worked_begintime"])<=0?"":"\t".date("Y-m-d H:i:s", $datarow["worked_begintime"])
-                            (intval($datarow["btr_begindatetime"]) <= 0 ? "" : "\t" . date("Y-m-d", $datarow["btr_begindatetime"])) . " " . $datarow["btr_begin_hour"], $wk_name, "\t" . $datarow["wk_idcard"], "\t" . $datarow["bu_mobile"], base_buildSNById("WK", $datarow["id"], 12, 12), $datarow["recruit_title"],
+                            (intval($datarow["btr_begindatetime"]) <= 0 ? "" : "\t" . date("Y-m-d", $datarow["btr_begindatetime"])) . " " . $datarow["btr_begin_hour"]
+                            , $wk_name
+                            , "\t" . $datarow["wk_idcard"]
+                            , "\t" . $datarow["bu_mobile"]
+                            , base_buildSNById("WK", $datarow["id"], 12, 12)
+                            , $datarow["recruit_title"],
                         );
                     }
                     return array("pagedata" => $pageData, "args" => $args);
@@ -5483,8 +5490,7 @@ function bizbase_mactivityEntityHandle($fromSubSystem, $baseUser, $bizUser, $han
                 case "unset":
                     $sqlParam[":istop"] = 0;
                     break;
-                default:
-                    throw new GeneralException("", "不支持的todo");
+                default:throw new GeneralException("", "不支持的todo");
             }
             $sqlTemp = ""; //不设置remark避免覆盖
             $sqlTemp .= " update biz_market_activity set updatetime=:nowtime,istop=:istop where 1=1 {$query};";
@@ -5695,7 +5701,7 @@ function bizbase_mactivityEntityHandle($fromSubSystem, $baseUser, $bizUser, $han
                 if ($nowPayMoney <= 0) {
                     $nowPayMoney = 0;
                 }
-                //过滤掉0收支明细
+//过滤掉0收支明细
                 $sqlParam = array();
                 $sqlParam[":nowtime"] = time();
                 $sqlParam[":market_activityid"] = $activity["id"];
@@ -6447,7 +6453,12 @@ function bizbase_mactivityAboutQuery($fromSubSystem, $baseUser, $bizUser, $handl
                             $age = intval($interval->format('%Y'));
                         }
                         $pageData[] = array(
-                            "\t" . date("Y-m-d H:i:s", $subdata["begin_datetime"]), $subdata["true_name"], "\t" . $subdata["idcard"], intval($subdata["gender"]) < 0 ? "" : (intval($subdata["gender"]) == 0 ? "男" : "女"), $age, "\t" . $subdata["bu_mobile"],
+                            "\t" . date("Y-m-d H:i:s", $subdata["begin_datetime"])
+                            , $subdata["true_name"]
+                            , "\t" . $subdata["idcard"]
+                            , intval($subdata["gender"]) < 0 ? "" : (intval($subdata["gender"]) == 0 ? "男" : "女")
+                            , $age
+                            , "\t" . $subdata["bu_mobile"],
                         );
                     }
                     return array("pagedata" => $pageData, "args" => $args);

+ 15 - 7
prjcenter/prjKLY/service/task_common.php

@@ -102,16 +102,22 @@ service_init("KLY", "快来优通用任务  kly-autotask", 30, function () {
                 try {
                     switch (intval($data["status"])) {
                         case 2:
-                            /*if (($data['btr_begin_datetime'] + $data['btr_begin_hour2']) <= time()) {
-                                pdo_query("update biz_todowork set updatetime=:nowtime,worked_begintime=:nowtime,`status`=3,remark=concat(:remark,ifnull(remark,'')) where id=:id", array(
-                                    ":nowtime" => time(), ":id" => intval($data["id"]), ":remark" => "[" . date("Y-m-d H:i:s", time()) . "] 系统自动处理为开始工作 \n",
-                                ));
-                            }*/
+                            if (($data['btr_begin_datetime'] + $data['btr_begin_hour2']) <= time()) {
+                                /*pdo_query("update biz_todowork set updatetime=:nowtime,worked_begintime=:nowtime,`status`=3,remark=concat(:remark,ifnull(remark,'')) where id=:id", array(
+                                ":nowtime" => time(), ":id" => intval($data["id"]), ":remark" => "[" . date("Y-m-d H:i:s", time()) . "] 系统自动处理为开始工作 \n",
+                                ));*/
+                                /*pdo_query("update biz_todowork set updatetime=:nowtime,`status`=3,remark=concat(:remark,ifnull(remark,'')) where id=:id", array(
+                                    ":id" => intval($data["id"]), ":remark" => "[" . date("Y-m-d H:i:s", time()) . "] 系统自动处理为开始工作 \n",
+                                ));*/
+                            }
                             break;
                         case 3:
                             if (($data['btr_finish_datetime'] + $data['btr_finish_hour2']) <= time()) {
-                                pdo_query("update biz_todowork set updatetime=:nowtime,worked_finishtime=:nowtime,`status`=4,remark=concat(:remark,ifnull(remark,'')) where id=:id", array(
-                                    ":nowtime" => time(), ":id" => intval($data["id"]), ":remark" => "[" . date("Y-m-d H:i:s", time()) . "] 系统自动处理为结束工作 \n",
+                                /*pdo_query("update biz_todowork set updatetime=:nowtime,worked_finishtime=:nowtime,`status`=4,remark=concat(:remark,ifnull(remark,'')) where id=:id", array(
+                                ":nowtime" => time(), ":id" => intval($data["id"]), ":remark" => "[" . date("Y-m-d H:i:s", time()) . "] 系统自动处理为结束工作 \n",
+                                ));*/
+                                pdo_query("update biz_todowork set updatetime=:nowtime,`status`=4,remark=concat(:remark,ifnull(remark,'')) where id=:id", array(
+                                    ":id" => intval($data["id"]), ":remark" => "[" . date("Y-m-d H:i:s", time()) . "] 系统自动处理为结束工作 \n",
                                 ));
                             }
                             break;
@@ -170,6 +176,7 @@ service_init("KLY", "快来优通用任务  kly-autotask", 30, function () {
         }
         //------------------------------------------------
         //超时自动结算
+        /*
         myecho("处理内容:超时自动结算");
         try {
             $pageIndex = 1;
@@ -293,6 +300,7 @@ service_init("KLY", "快来优通用任务  kly-autotask", 30, function () {
         } catch (Throwable $e) {
             myecho("超时48小时未结算处理发生异常22:" . $e->getMessage());
         }
+        */
         //------------------------------------------------
         //录用满员处理
         myecho("处理内容:录用满员处理");