wang jun 5 місяців тому
батько
коміт
ae77919b36

Різницю між файлами не показано, бо вона завелика
+ 366 - 373
application/index/controller/Checkinfo.php


+ 25 - 0
application/index/controller/Worker.php

@@ -72,6 +72,31 @@ class Worker extends Controller {
 
         return json_encode($res_r, 320);
     }
+    /**
+     * 查询已不在公司项目的历史工作人员
+     * 仅限于森一人员使用
+     *
+     * @return void
+     * @author wj
+     * @date 2025-02-17
+     */
+    public function getnotinprojectuserlist() {
+        $queryinfo = request()->param();
+        $pagenum = $queryinfo['pageNum'];
+        $pagesize = $queryinfo['pageSize'];
+
+        $workerlogic = new workermanger();
+        $w_list = $workerlogic->getnotinprojectuserlist($pagenum, $pagesize);
+        if ($w_list) {
+            $res_r['code'] = 200;
+            $res_r['resultData']['list'] = $w_list;
+        } else {
+            $res_r['code'] = 0;
+            $res_r['msg'] = '查询失败';
+        }
+
+        return json_encode($res_r, 320);
+    }
 
     public function addworker() {
         $workerinfo = request()->param();

+ 13 - 0
application/index/logic/workermanger.php

@@ -54,6 +54,19 @@ class workermanger {
         //var_dump($userinfo);
         return $worker_list;
     }
+    /**
+     * 查询已不在公司项目的历史工作人员
+     *
+     * @return void
+     * @author wj
+     * @date 2025-02-17
+     */
+    public function getnotinprojectuserlist($pagenum, $pagesize) {
+        $start = ($pagenum - 1) * $pagesize;
+        $workertable = new gworkermodel();
+        $worker_list = $workertable->getnotinprojectuserlist($start, $pagesize);
+        return $worker_list;
+    }
     /*
      * 20200212
      * steelxu

+ 112 - 92
application/index/model/gworkermodel.php

@@ -10,25 +10,25 @@ namespace app\index\model;
 use think\Model;
 use think\Log;
 
-class gworkermodel extends Model{
-    protected $table='t_workerinfo';
-
-    public function getidbytel($tel){
-        $recordlist=$this->where('telno',$tel)->find();
-        if ($recordlist){
-        return $recordlist['id'];
-        }else{
+class gworkermodel extends Model {
+    protected $table = 't_workerinfo';
+
+    public function getidbytel($tel) {
+        $recordlist = $this->where('telno', $tel)->find();
+        if ($recordlist) {
+            return $recordlist['id'];
+        } else {
             return 0;
         }
     }
 
     //获取所有工人信息,并带项目名称
-    public function getallworker($start,$rlen){
-        $strsql="select a.*,c.pname,c.is_worker ";
-        $strsql=$strsql."from t_workerinfo a left join t_p2wrelation b on a.id=b.wid and b.checkstatus=1 left join t_pinfo c on b.pid=c.id";
-        $strsql=$strsql." limit ".$start.",".$rlen;
+    public function getallworker($start, $rlen) {
+        $strsql = "select a.*,c.pname,c.is_worker ";
+        $strsql = $strsql . "from t_workerinfo a left join t_p2wrelation b on a.id=b.wid and b.checkstatus=1 left join t_pinfo c on b.pid=c.id";
+        $strsql = $strsql . " limit " . $start . "," . $rlen;
 
-        $workerlist=$this->query($strsql);
+        $workerlist = $this->query($strsql);
         return $workerlist;
 
     }
@@ -37,42 +37,63 @@ class gworkermodel extends Model{
      * 20230214
      * 获取一个企业的项目的所有工人
      */
-    public function getallworkerbycid($start,$rlen,$cid){
-        $strsql="select a.*,c.pname,c.is_worker ";
-        $strsql=$strsql."from t_workerinfo a left join t_p2wrelation b on a.id=b.wid and b.checkstatus=1 left join t_pinfo c on b.pid=c.id";
-        $strsql=$strsql." where c.companyid=".$cid;
-        $strsql=$strsql." order by a.dayprice,create_date desc";
-        $strsql=$strsql." limit ".$start.",".$rlen;
-
-        $workerlist=$this->query($strsql);
+    public function getallworkerbycid($start, $rlen, $cid) {
+        $strsql = "select a.*,c.pname,c.is_worker ";
+        $strsql = $strsql . "from t_workerinfo a left join t_p2wrelation b on a.id=b.wid and b.checkstatus=1 left join t_pinfo c on b.pid=c.id";
+        $strsql = $strsql . " where c.companyid=" . $cid;
+        $strsql = $strsql . " order by a.dayprice,create_date desc";
+        $strsql = $strsql . " limit " . $start . "," . $rlen;
+
+        $workerlist = $this->query($strsql);
         return $workerlist;
+    }
+
+    /**
+     *
+     *
+     * @param  [type] $start
+     * @param  [type] $rlen
+     * @param  [type] $cid
+     * @return void
+     * @author wj
+     * @date 2025-02-17
+     */
+    public function getnotinprojectuserlist($start, $rlen) {
+        $strsql = "select a.*,c.pname,c.is_worker ";
+        $strsql = $strsql . "from t_workerinfo a left join t_p2wrelation b on a.id=b.wid and b.checkstatus=1 left join t_pinfo c on b.pid=c.id";
+        $strsql = $strsql . " where a.isactive=1 and a.cprojectid=3";
+        $strsql = $strsql . " order by a.dayprice,create_date desc";
+        $strsql = $strsql . " limit " . $start . "," . $rlen;
 
+        $workerlist = $this->query($strsql);
+        return $workerlist;
     }
+
     /*
      * steelxu
      * 20200212
      * 获取指定项目员工
      */
-    public function getprjworker($start,$rlen,$pid){
-        $strsql="select * ";
-        $strsql=$strsql."from t_workerinfo ";
-        $strsql=$strsql." where cprojectid=".$pid;
-        $strsql=$strsql." order by wname";
-        $strsql=$strsql." limit ".$start.",".$rlen;
-
-        $workerlist=$this->query($strsql);
+    public function getprjworker($start, $rlen, $pid) {
+        $strsql = "select * ";
+        $strsql = $strsql . "from t_workerinfo ";
+        $strsql = $strsql . " where cprojectid=" . $pid;
+        $strsql = $strsql . " order by wname";
+        $strsql = $strsql . " limit " . $start . "," . $rlen;
+
+        $workerlist = $this->query($strsql);
         return $workerlist;
     }
     /*
      * 20200303
      * 预检查是否有索引字段重复
      */
-    private function precheckindex($info){
-        $where_arr['telno']=$info['telno'];
-        $rec=$this->where($where_arr)->find();
-        if ($rec){
+    private function precheckindex($info) {
+        $where_arr['telno'] = $info['telno'];
+        $rec = $this->where($where_arr)->find();
+        if ($rec) {
             return false;
-        }else{
+        } else {
             return true;
         }
     }
@@ -81,19 +102,19 @@ class gworkermodel extends Model{
  * edit
  * 有索引表,增加预检 *
  */
-    public function saveworkerinfo($worker){
+    public function saveworkerinfo($worker) {
         //预检
-        $ishave=$this->precheckindex($worker);
+        $ishave = $this->precheckindex($worker);
         Log::info($ishave);
-        if (!$ishave){
+        if (!$ishave) {
             return -1;
         }
         Log::info($worker);
-        $sid=$this->allowField(true)->isUpdate(false)->setAttr('id',null)->save($worker);
+        $sid = $this->allowField(true)->isUpdate(false)->setAttr('id', null)->save($worker);
 
-        if ($sid==1){
+        if ($sid == 1) {
             return $this->id;
-        }else{
+        } else {
             return $sid;
         }
 
@@ -104,10 +125,10 @@ class gworkermodel extends Model{
      * 更新工人的cprojectid,
      * 实现工人指量设置,换项目的功能
      * */
-    public function updateprj($pid,$wid){
-        $where_arr['id']=$wid;
-        $update_arr['cprojectid']=$pid;
-      $res=$this->where($where_arr)->update($update_arr);
+    public function updateprj($pid, $wid) {
+        $where_arr['id'] = $wid;
+        $update_arr['cprojectid'] = $pid;
+        $res = $this->where($where_arr)->update($update_arr);
         return $res;
     }
 
@@ -116,9 +137,9 @@ class gworkermodel extends Model{
      * 20200211
      * 根据工人ID获取信息
      */
-    public function getinfobyid($wid){
-        $where_arr['id']=$wid;
-        $rec=$this->where($where_arr)->find();
+    public function getinfobyid($wid) {
+        $where_arr['id'] = $wid;
+        $rec = $this->where($where_arr)->find();
         return $rec;
     }
 
@@ -126,10 +147,10 @@ class gworkermodel extends Model{
      * 20200325
      * 获取所有工人的id和身份证
      */
-    public function selshengfengzhenglist(){
-        $strsql="select id,shengfengid ";
-        $strsql=$strsql." from t_workerinfo";
-        $wlist=$this->query($strsql);
+    public function selshengfengzhenglist() {
+        $strsql = "select id,shengfengid ";
+        $strsql = $strsql . " from t_workerinfo";
+        $wlist = $this->query($strsql);
         return $wlist;
     }
 
@@ -137,21 +158,21 @@ class gworkermodel extends Model{
      * 2030215
      * 只返回公司的员工id和身份证
      */
-    public function selcompanyshengfengzhenglist($cid){
-        $strsql="select a.id,a.shengfengid ";
-        $strsql=$strsql." from t_workerinfo a left join t_pinfo b on a.cprojectid=b.id";
-        $strsql=$strsql." where b.companyid=".$cid;
-        $wlist=$this->query($strsql);
+    public function selcompanyshengfengzhenglist($cid) {
+        $strsql = "select a.id,a.shengfengid ";
+        $strsql = $strsql . " from t_workerinfo a left join t_pinfo b on a.cprojectid=b.id";
+        $strsql = $strsql . " where b.companyid=" . $cid;
+        $wlist = $this->query($strsql);
         return $wlist;
     }
 /*
  * 20200417
  * 根据电话获取用户信息
-  *
+ *
  */
-    public function seluinfobytel($tel){
-        $where_arr['telno']=$tel;
-        $rec=$this->where($where_arr)->find();
+    public function seluinfobytel($tel) {
+        $where_arr['telno'] = $tel;
+        $rec = $this->where($where_arr)->find();
         return $rec;
     }
 
@@ -159,9 +180,9 @@ class gworkermodel extends Model{
      * 20200515
      * 根据身份证获取数据
      */
-    public function selinfobysfz($sfzid){
-        $where_arr['shengfengid']=$sfzid;
-        $rec=$this->where($where_arr)->find();
+    public function selinfobysfz($sfzid) {
+        $where_arr['shengfengid'] = $sfzid;
+        $rec = $this->where($where_arr)->find();
         return $rec;
 
     }
@@ -170,10 +191,10 @@ class gworkermodel extends Model{
      * 20210311
      * 根据姓名获取数据
      */
-    public function selinfobyname($name){
-        $strsql="select * from t_workerinfo where wname like '%".$name."%' order by id,cprojectid";
-        $rlist=$this->query($strsql);
-        $rlist=collection($rlist)->toArray();
+    public function selinfobyname($name) {
+        $strsql = "select * from t_workerinfo where wname like '%" . $name . "%' order by id,cprojectid";
+        $rlist = $this->query($strsql);
+        $rlist = collection($rlist)->toArray();
         return $rlist;
     }
 
@@ -181,26 +202,25 @@ class gworkermodel extends Model{
      * 20210416
      * 获取生日是今天的员工
      */
-    public function selworklistbybirthday($birthday){
-        if($birthday!='0301') {
-            $strsql="select * from t_workerinfo where SUBSTR(shengfengid FROM 11 FOR 4)='".$birthday."'";
-        }else{
-            $strsql="select * from t_workerinfo where SUBSTR(shengfengid FROM 11 FOR 4)='".$birthday."' or SUBSTR(shengfengid FROM 11 FOR 4)='0209'";
+    public function selworklistbybirthday($birthday) {
+        if ($birthday != '0301') {
+            $strsql = "select * from t_workerinfo where SUBSTR(shengfengid FROM 11 FOR 4)='" . $birthday . "'";
+        } else {
+            $strsql = "select * from t_workerinfo where SUBSTR(shengfengid FROM 11 FOR 4)='" . $birthday . "' or SUBSTR(shengfengid FROM 11 FOR 4)='0209'";
         }
-        $rlist=$this->query($strsql);
-        $rlist=collection($rlist)->toArray();
+        $rlist = $this->query($strsql);
+        $rlist = collection($rlist)->toArray();
         return $rlist;
 
-
     }
 
     /*
      * 20210416
      * 更新工人年龄
      */
-    public function updwagebyid($id,$wage){
-        $where_arr['id']=$id;
-        $upd_arr['wage']=$wage;
+    public function updwagebyid($id, $wage) {
+        $where_arr['id'] = $id;
+        $upd_arr['wage'] = $wage;
         $this->where($where_arr)->update($upd_arr);
     }
 
@@ -208,9 +228,9 @@ class gworkermodel extends Model{
      * 20210427
      * 更新工人信息(电话、工种)
      */
-    public function updinfobyid($id,$arr){
-        $where_arr['id']=$id;
-        $count=$this->where($where_arr)->update($arr);
+    public function updinfobyid($id, $arr) {
+        $where_arr['id'] = $id;
+        $count = $this->where($where_arr)->update($arr);
         return $count;
 
     }
@@ -219,13 +239,13 @@ class gworkermodel extends Model{
      * 20210725
      * 获取每个工地的人数统计
      */
-    public function selwcountbyprj(){
-        $strsql='select cprojectid, count(*) as pwcount ';
-        $strsql=$strsql.' from t_workerinfo ';
-        $strsql=$strsql." where cprojectid>3";
-        $strsql=$strsql." group by cprojectid";
-        $rlist=$this->query($strsql);
-        $rlist=collection($rlist)->toArray();
+    public function selwcountbyprj() {
+        $strsql = 'select cprojectid, count(*) as pwcount ';
+        $strsql = $strsql . ' from t_workerinfo ';
+        $strsql = $strsql . " where cprojectid>3";
+        $strsql = $strsql . " group by cprojectid";
+        $rlist = $this->query($strsql);
+        $rlist = collection($rlist)->toArray();
         return $rlist;
 
     }
@@ -234,10 +254,10 @@ class gworkermodel extends Model{
      * 20210807
      * 获取所有cprojectid>3的用户
      */
-    public function selinfolistwithprjid(){
-        $strsql='select * from t_workerinfo where cprojectid>3';
-        $rlist=$this->query($strsql);
-        $rlist=collection($rlist)->toArray();
+    public function selinfolistwithprjid() {
+        $strsql = 'select * from t_workerinfo where cprojectid>3';
+        $rlist = $this->query($strsql);
+        $rlist = collection($rlist)->toArray();
         return $rlist;
     }
 

Деякі файли не було показано, через те що забагато файлів було змінено