|
@@ -4,6 +4,7 @@ namespace app\mainapp\controller;
|
|
|
|
|
|
use app\common\model\RensheCode;
|
|
|
use app\common\model\WorkerThird;
|
|
|
+use app\common\service\RensheService;
|
|
|
use app\mainapp\BaseController;
|
|
|
use think\facade\Db;
|
|
|
|
|
@@ -50,7 +51,14 @@ class Index extends BaseController
|
|
|
|
|
|
public function listComjobs()
|
|
|
{
|
|
|
- ComjobsModel::where('enddate', '<', time() - 86400)->where('status', '=', 3)->update(['status' => 4]);
|
|
|
+ $ids = ComjobsModel::where('enddate', '<', time() - 86400)->where('status', '=', 3)->column('id');
|
|
|
+ if (!empty($ids)) {
|
|
|
+ ComjobsModel::where('id', 'in', $ids)->update(['status' => 4]);
|
|
|
+ foreach ($ids as $id) {
|
|
|
+ $service = new RensheService();
|
|
|
+ $service->jobInfoByComId($id);
|
|
|
+ }
|
|
|
+ }
|
|
|
$ppage = input('ppage/d', 1);
|
|
|
$psize = input('psize/d', 20);
|
|
|
$map[] = ['createtime', '<=', time()];
|
|
@@ -106,9 +114,9 @@ class Index extends BaseController
|
|
|
$row = Db::query("select * ," . $sql . "as distance from echo_comjobs where deletetime=0 and status in (3,4) order by distance limit " . $pagelistcount * ($page - 1) . "," . $pagelistcount);
|
|
|
|
|
|
//第三方id和工作列表
|
|
|
- $third_ids = [];
|
|
|
- $third_lists = [];
|
|
|
- $worker_ids = [];
|
|
|
+ $third_ids = [];
|
|
|
+ $third_lists = [];
|
|
|
+ $worker_ids = [];
|
|
|
$worker_lists = [];
|
|
|
foreach ($row as $l) {
|
|
|
if (!empty($l['third_id'])) {
|
|
@@ -150,12 +158,12 @@ class Index extends BaseController
|
|
|
$map[] = ['priority', '>', 0];
|
|
|
$map[] = ['status', 'in', '3,4'];
|
|
|
|
|
|
- $userid = input('userid/d',0);
|
|
|
+ $userid = input('userid/d', 0);
|
|
|
if (!empty($userid)) {
|
|
|
- $user = UserModel::where('id',$userid)->find();
|
|
|
+ $user = UserModel::where('id', $userid)->find();
|
|
|
if (!empty($user['com_cate'])) {
|
|
|
- $ids = ComjobsCateModel::where('title','in',$user['com_cate'])->column('id');
|
|
|
- $map[] = ['cateid','in',$ids];
|
|
|
+ $ids = ComjobsCateModel::where('title', 'in', $user['com_cate'])->column('id');
|
|
|
+ $map[] = ['cateid', 'in', $ids];
|
|
|
}
|
|
|
}
|
|
|
$plist = ComjobsModel::with(['worker'])->where($map)->order(['status' => 'asc', 'priority' => 'desc', 'updatetime' => 'desc', 'id' => 'desc'])->page($ppage)->limit($psize)->select();
|
|
@@ -187,7 +195,7 @@ class Index extends BaseController
|
|
|
|
|
|
public function getRensheCode()
|
|
|
{
|
|
|
- $type = input('type','');
|
|
|
+ $type = input('type', '');
|
|
|
if (empty($type)) {
|
|
|
page_result(0, "", []);
|
|
|
}
|
|
@@ -198,7 +206,7 @@ class Index extends BaseController
|
|
|
|
|
|
public function getComCate()
|
|
|
{
|
|
|
- $catelist = ComjobsCate::order(['priority' => 'desc', 'id' => 'desc'])->select();
|
|
|
+ $catelist = ComjobsCate::order(['priority' => 'desc', 'id' => 'desc'])->select();
|
|
|
page_result(0, "", $catelist);
|
|
|
}
|
|
|
}
|