Explorar el Código

所有人才层次有关的列表加了这个过滤
$where[] = ["createTime", ">=", "2022-10-01 00:00:00"];

sugangqiang hace 9 meses
padre
commit
b5af37512e

+ 1 - 1
app/admin/controller/House.php

@@ -1427,7 +1427,7 @@ class House extends AdminController {
             exit();
         } else {
             $response->msg = "没有选择导出的名单";
-            return \StrUtil::back($response, "TalentTypeChange.callBack");
+            return \StrUtil::back($response, "Housepurchase.callBack");
         }
     }
 

+ 15 - 0
app/admin/controller/TalentTypeChange.php

@@ -76,6 +76,7 @@ class TalentTypeChange extends AdminController {
         $where[] = ["delete", "=", 0];
         switch ($process) {
             case -1:
+                $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
                 $where[] = ["type", "=", $this->user["type"]];
                 $company = \app\common\api\CompanyApi::getOne($this->user["companyId"]);
                 $where[] = ["beforeCheckCompany", "EXP", Db::raw("is not null")];
@@ -84,11 +85,13 @@ class TalentTypeChange extends AdminController {
                 }
                 break;
             case 1:
+                $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
                 $where[] = ["type", "=", $this->user["type"]];
                 $where[] = ["checkState", "not in", [3, 5]];
                 break;
             case 2:
                 //$where[] = ["ttc.type", "=", $this->user["type"]];
+                $where[] = ["ttc.createTime", ">=", "2022-10-01 00:00:00"];
                 if (ttcApi::chkUserInSuperDeptUsers()) {
                     $where[] = ["ttc.type", "=", $this->user["type"]];
                 } else {
@@ -111,14 +114,17 @@ class TalentTypeChange extends AdminController {
                 $list = ttcModel::alias("ttc")->field("ttc.*,td.companyId,td.state as depState")->leftJoin("un_talent_depcheckstate td", "td.mainId=ttc.id")->where($where)->limit($offset, $limit)->order("ttc.createTime {$order}")->select()->toArray();
                 break;
             case 3:
+                $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
                 $where[] = ["type", "=", $this->user["type"]];
                 $whereRaw = "firstDepPassTime is not null or (checkCompanyIds is null and highProcess >=1)";
                 break;
             case 4:
+                $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
                 $where[] = ["type", "=", $this->user["type"]];
                 $where[] = ["checkState", "in", [-1, 35]];
                 break;
             case 5:
+                $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
                 $where[] = ["type", "=", $this->user["type"]];
                 $where[] = ["checkState", "=", 35];
                 $where[] = ["isPublic", "=", 6];
@@ -731,6 +737,7 @@ class TalentTypeChange extends AdminController {
         $info = $this->request->param();
         $response = new \stdClass();
         $where = [];
+        $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
         $where[] = ["type", "=", $this->user["type"]];
         if ($info) {
             if (\StrUtil::isNotEmpAndNull($info["talentName"])) {
@@ -1066,6 +1073,7 @@ class TalentTypeChange extends AdminController {
         if (!strtotime($startTime) || !strtotime($endTime))
             return json(["msg" => "时间格式错误"]);
         $where = [];
+        $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
         $where[] = ["type", "=", $this->user["type"]];
         $where[] = ["publicBatch", "between", [$startTime, $endTime]];
         $list = ttcModel::where($where)->order("publicBatch")->select()->toArray();
@@ -1381,6 +1389,7 @@ class TalentTypeChange extends AdminController {
         if (!strtotime($startTime) || !strtotime($endTime))
             return json(["msg" => "时间格式错误"]);
         $where = [];
+        $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
         $where[] = ["type", "=", $this->user["type"]];
         $where[] = ["newIdentifyMonth", "between", [$startTime, $endTime]];
         $list = ttcModel::where($where)->order("newIdentifyMonth")->select()->toArray();
@@ -1677,6 +1686,7 @@ class TalentTypeChange extends AdminController {
         switch ($process) {
             case -1:
                 $where[] = ["type", "=", $this->user["type"]];
+                $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
                 $company = \app\common\api\CompanyApi::getOne($this->user["companyId"]);
                 $where[] = ["beforeCheckCompany", "EXP", Db::raw("is not null")];
                 if ($this->user["code"] != $company["code"]) {
@@ -1686,6 +1696,7 @@ class TalentTypeChange extends AdminController {
             case 1:
                 $where[] = ["type", "=", $this->user["type"]];
                 $where[] = ["checkState", "not in", [3, 5]];
+                $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
                 break;
             case 2:
                 //$where[] = ["ttc.type", "=", $this->user["type"]];
@@ -1696,6 +1707,7 @@ class TalentTypeChange extends AdminController {
                     $where[] = ["td.companyId", "=", $companyId];
                 }
                 $where[] = ["td.type", "=", ProjectState::LEVELCHANGE];
+                $where[] = ["ttc.createTime", ">=", "2022-10-01 00:00:00"];
                 switch ($checkState) {
                     case 1:
                     case 2:
@@ -1711,16 +1723,19 @@ class TalentTypeChange extends AdminController {
                 break;
             case 3:
                 $where[] = ["type", "=", $this->user["type"]];
+                $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
                 $whereRaw = "firstDepPassTime is not null or (checkCompanyIds is null and highProcess >=1)";
                 break;
             case 4:
                 $where[] = ["type", "=", $this->user["type"]];
                 $where[] = ["checkState", "in", [-1, 35]];
+                $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
                 break;
             case 5:
                 $where[] = ["type", "=", $this->user["type"]];
                 $where[] = ["checkState", "=", 35];
                 $where[] = ["isPublic", "=", 6];
+                $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
                 break;
         }
         if ($process != 2) {

+ 1 - 0
app/common/api/TalentTypeChangeApi.php

@@ -56,6 +56,7 @@ class TalentTypeChangeApi {
         $where = [];
         $where[] = ["ttc.delete", "=", 0];
         $where[] = ["ttc.type", "=", 5];
+        $where[] = ["ttc.createTime", ">=", "2022-10-01 00:00:00"];
         $where[] = ["e.medicalCommunityId", "=", $user["medicalCommunityId"]];
         $where[] = ["e.isGeneral", "=", 2];
         if ($talentName) {

+ 1 - 0
app/enterprise/api/TalentApi.php

@@ -159,6 +159,7 @@ class TalentApi {
         $where = [];
         $where[] = ["enterpriseId", "=", session("user")["uid"]];
         $where[] = ["delete", "=", 0];
+        $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
         //$whereRaw = "length(talentId) <> 19";
         if ($talentName) {
             $where[] = ["talentName", "like", "%" . $talentName . "%"];

+ 1 - 0
app/enterprise/controller/House.php

@@ -470,6 +470,7 @@ class House extends EnterpriseController {
         $where[] = ["checkState", "=", MainState::PASS];
         $where[] = ["isPublic", "=", 6];
         $where[] = [$oldStartTimeField, "<=", $year . "-12-31"];
+        $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
         $typeChanges = \app\enterprise\model\TalentTypeChange::where($where)->field("oldTalentArrange,oldIdentifyCondition,oldIdentifyGetTime,oldIdentifyOutTime,oldIdentifyConditionName,oldIdentifyMonth,oldCertificateStartTime,oldCertificateOutTime,newIdentifyMonth,newIdentifyGetTime")->order("createTime desc")->select()->toArray();
 
         if (!$typeChanges && strtotime($year . "-12-31") < strtotime($talentInfo[$identifyTimeField])) {

+ 1 - 0
app/enterprise/controller/Talent.php

@@ -1757,6 +1757,7 @@ class Talent extends EnterpriseController {
                 $whereTypeChange[] = ["talentId", "=", $info["id"]];
                 $whereTypeChange[] = ["checkState", "=", \app\common\state\MainState::PASS];
                 $whereTypeChange[] = ["isPublic", "=", 6];
+                $whereTypeChange[] = ["createTime", ">=", "2022-10-01 00:00:00"];
                 $typeChanges = \app\enterprise\model\TalentTypeChange::where($whereTypeChange)->select()->toArray();
                 if ($otherTypeChangeList[$info["card_number"]]) {
                     $typeChanges = array_merge($otherTypeChangeList[$info["card_number"]], (array) $typeChanges);

+ 2 - 0
app/enterprise/controller/TalentAllowance.php

@@ -511,6 +511,7 @@ class TalentAllowance extends EnterpriseController {
         $where[] = ["checkState", "=", MainState::PASS];
         $where[] = ["isPublic", "=", 6];
         $where[] = [$oldStartTimeField, "<=", $year . "-12-31"];
+        $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
         $typeList = TalentTypeChange::where($where)->field("oldTalentArrange,oldIdentifyCondition,oldIdentifyGetTime,oldIdentifyOutTime,oldIdentifyMonth,oldCertificateStartTime,oldCertificateOutTime,newIdentifyMonth,newIdentifyGetTime")->order("createTime desc")->select()->toArray();
 
         $typeList[] = [
@@ -1189,6 +1190,7 @@ class TalentAllowance extends EnterpriseController {
                     $whereTypeChange[] = ["idCard", "=", $info["idCard"]];
                     $whereTypeChange[] = ["checkState", "=", MainState::PASS];
                     $whereTypeChange[] = ["isPublic", "=", 6];
+                    $whereTypeChange[] = ["createTime", ">=", "2022-10-01 00:00:00"];
                     $typeChanges = TalentTypeChange::where($whereTypeChange)->select()->toArray();
                     if ($otherTypeChangeList[$info["idCard"]]) {
                         $typeChanges = array_merge($otherTypeChangeList[$info["idCard"]], (array) $typeChanges);

+ 1 - 0
app/job/Talent.php

@@ -242,6 +242,7 @@ class Talent {
                     $where[] = ["id", "=", $mainId];
                     $where[] = ["checkState", "=", \app\common\state\MainState::PASS];
                     $where[] = ["isPublic", "=", 6];
+                    $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
                     $talentTypeChange = \app\enterprise\model\TalentTypeChange::where($where)->find();
                     if (strlen($talentTypeChange["talentId"]) == 19) {
                         $where = [];

+ 1 - 0
app/job/TalentAllowance.php

@@ -202,6 +202,7 @@ class TalentAllowance {
         $where[] = ["checkState", "=", MainState::PASS];
         $where[] = ["isPublic", "=", 6];
         $where[] = [$oldStartTimeField, "<=", $year . "-12-31"];
+        $where[] = ["createTime", ">=", "2022-10-01 00:00:00"];
         $typeList = TalentTypeChange::where($where)->field("oldTalentArrange,oldIdentifyCondition,oldIdentifyGetTime,oldIdentifyOutTime,oldIdentifyMonth,oldCertificateStartTime,oldCertificateOutTime,newIdentifyMonth,newIdentifyGetTime")->order("createTime desc")->select()->toArray();
         $typeList[] = [
             "oldTalentArrange" => $talentInfo["talent_arrange"],