update

prjcenter/prjKLY/base/AboutActivity.php

@@ -4237,7 +4237,7 @@ function bizbase_todoWorkEnrollVerify($handleMode, $bizWorker, $recruitInfo, $pl
     $oldList = pdo_fetch("select tdwk.* from biz_todowork tdwk
         left join biz_trader_recruit btr on btr.id=tdwk.biz_recruitid
         left join biz_todoworkteam   tdwkt on tdwkt.id=tdwk.workteamid
-        where tdwk.id<>:nowWorkId and tdwk.biz_workerid=:biz_workerid and ifnull(tdwk.`status`,0)>=2
+        where tdwk.id<>:nowWorkId and tdwk.biz_workerid=:biz_workerid and ifnull(tdwk.`status`,0)>=2 and ifnull(tdwk.`status`,0)!=5
         and(
             (tdwk.todo_begindate>=:plandoDateStart and tdwk.todo_begindate<=:plandoDateFinish)
             or(:nowSettleCatalog=0 and tdwk.todo_begindate>=:workDateStart and tdwk.todo_begindate<=:workDateFinish)

prjcenter/prjKLY/base/AboutWorker.php

@@ -135,19 +135,12 @@ function bizbase_workerAccountInfo($bizWorker)
             case 3: //微信充值
                 $wxchargein = round(floatval($item["total"]), 2);
                 break;
-            case 5: //解冻报名押金 超时自动解冻
-                $frozenIn = bcadd($frozenIn, round(floatval($item["total"]), 2), 2);
-                break;
             case 7: //解冻报名押金
-                $frozenIn = bcadd($frozenIn, round(floatval($item["total"]), 2), 2);
-                //$frozenIn = round(floatval($item["total"]), 2);
+                $frozenIn = round(floatval($item["total"]), 2);
                 break;
         }
     }
-    //$frozenBalance = round($frozenOut - $frozenIn, 2); //冻结余额，即当前实际冻结的金额
-    $frozenSql = "select ifnull(sum(ifnull(money,0)),0) as sum from biz_worker_account where biz_id in (select id from biz_todowork as btw where btw.biz_workerid=:workerid and btw.`status` in (1,2,4) ) and biz_catalog=2";
-    $frozenBalance = pdo_fetch($frozenSql, [':workerid' => intval($bizWorker["id"])]);
-    $frozenBalance = round(floatval($frozenBalance['sum']), 2);
+    $frozenBalance = round($frozenOut - $frozenIn, 2); //冻结余额，即当前实际冻结的金额
     $balance = round($income - $outgoing, 2);
     return array(
         "balance" => $balance,
@@ -162,7 +155,6 @@ function bizbase_workerAccountInfo($bizWorker)
         "frozenBalance" => $frozenBalance,
 //        "frozenBalance"=> $frozenIn,
     );
-
 }
 function bizbase_workerStatistics($bizWorker)
 {
@@ -867,8 +859,8 @@ function bizbase_workerAboutQuery($fromSubSystem, $baseUser, $bizUser, $handleMo
             //构建sql串
             $sqlBody = "";
             $sqlBody .= "  from  biz_worker_account      bwa  ";
-            $sqlBody .= "  inner join biz_trader_account bta  on bta.id=bwa.biz_id  ";
-            $sqlBody .= "  inner join biz_todowork       tdwk on tdwk.id=bta.biz_id  ";
+            //$sqlBody .= "  inner join biz_trader_account bta  on bta.id=bwa.biz_id  ";
+            $sqlBody .= "  inner join biz_todowork       tdwk on tdwk.id=bwa.biz_id  ";
             $sqlBody .= "  left  join biz_trader_recruit btr  on btr.id=tdwk.biz_recruitid  ";
             $sqlBody .= "  left  join biz_trader         bt   on bt.id=btr.biz_traderid ";
             $sqlBody .= "  left  join base_user          btbu on btbu.id=bt.base_userid  ";