报备

app/common/model/Comjobs.php

@@ -30,6 +30,7 @@ class Comjobs extends Model
         'companydetails'   => 'string',
         'retmoney'         => 'int',
         'wtype'            => 'tinyint',
+        'sex'              => 'tinyint',
         'bwagall'          => 'string',
         'zwagall'          => 'string',
         'fwagall'          => 'string',
@@ -73,6 +74,12 @@ class Comjobs extends Model
         return $wtype[$data['wtype']];
     }
 
+    public function getSexTextAttr($value, $data)
+    {
+        $sex = ['不限', '男', '女'];
+        return $sex[$data['sex']];
+    }
+
     public function getRecruitmentCateTextAttr($value, $data)
     {
         $recruitment_cate = [1 => '普通招聘', 2 => '悬赏聘'];

app/mainapp/controller/Broker.php

@@ -175,11 +175,19 @@ class Broker extends BaseController
             page_result(1, $e->getError());
         }
 
-        $check  = DemandReportModel::where('snatchid', $snatchid)->where('mobile', $data['mobile'])->whereOr('idcard', $data['idcard'])->find();
-        if (!empty($check)) {
+        $mobile_check  = DemandReportModel::where('snatchid', $snatchid)->where('mobile', $data['mobile'])->find();
+        if (!empty($mobile_check)) {
             exit(json_encode([
                 'code' => 1,
-                'msg'  => "该手机号或身份证号已报备，请勿重复",
+                'msg'  => "该手机号已报备，请勿重复",
+            ]));
+        }
+
+        $idcard_check = DemandReportModel::where('snatchid', $snatchid)->where('idcard', $data['idcard'])->find();
+        if (!empty($idcard_check)) {
+            exit(json_encode([
+                'code' => 1,
+                'msg'  => "该身份证号已报备，请勿重复",
             ]));
         }
 

app/mainapp/controller/Comjobs.php

@@ -18,6 +18,7 @@ use app\common\model\Broker as BrokerModel;
 use app\common\model\ComjobsReport as ComjobsReportModel;
 use app\common\model\UserParam as UserParamModel;
 use app\common\model\UserIntegral as UserIntegralModel;
+use app\common\model\UserFollow as UserFollowModel;
 
 use chuanglan\Chuanglan;
 use echowx\WxProgram;

app/mainapp/controller/Wcomjobs.php

@@ -317,6 +317,7 @@ class Wcomjobs extends BaseController
             'video'            => input('video/s', ""),
             'companydetails'   => input('companydetails/s', ""),
             'wtype'            => $wtype,
+            'sex'              => input('sex/d', 0),
             'bwagall'          => input('bwagall/s', ""),
             'zwagall'          => $zwagall,
             'fwagall'          => input('fwagall/s', ""),

app/worker/controller/Comjobs.php

@@ -344,6 +344,7 @@ class Comjobs extends BaseController
             'picall'           => input('picall/a', []),
             'recruit_num'      => input('recruit_num/d', 1),
             'wtype'            => $wtype,
+            'sex'              => input('sex/d', 0),
             'bwagall'          => input('bwagall/s', ""),
             'zwagall'          => $zwagall,
             'fwagall'          => input('fwagall/s', ""),
@@ -403,7 +404,7 @@ class Comjobs extends BaseController
             ]);
         } else {
             $data['updatetime'] = time();
-            $data['status']     = input('status/d', 0);
+            $data['status']     = 2;
             $old_video          = input('old_video/s', '');
             $new_video          = input('new_video/s', '');
             if (!empty($new_video)) {
@@ -656,7 +657,7 @@ class Comjobs extends BaseController
         }
 
         $service = new ComjobsService();
-        $res = $service->importComjobs($file_url,$workerid);
+        $res     = $service->importComjobs($file_url, $workerid);
         if (empty($res['code'])) {
             exit(json_encode([
                 'code' => 1,
@@ -664,6 +665,6 @@ class Comjobs extends BaseController
             ]));
         }
 
-        exit(json_encode(['code'  => 0]));
+        exit(json_encode(['code' => 0]));
     }
 }

app/worker/controller/Demand.php

@@ -867,7 +867,7 @@ class Demand extends BaseController
                     'msg'  => "订单不存在 ",
                 ]));
             }
-            if ($demand != 3) {
+            if ($demand['status'] != 3) {
                 exit(json_encode([
                     'code' => 1,
                     'msg'  => "订单已结束",
@@ -999,13 +999,20 @@ class Demand extends BaseController
                 ]));
             }
 
-            $mobile = input('mobile/s', '');
-            $idcard = input('idcard/s', '');
-            $check  = DemandReportModel::where('snatchid', $id)->where('mobile', $mobile)->whereOr('idcard', $idcard)->find();
-            if (!empty($check)) {
+            $mobile       = input('mobile/s', '');
+            $idcard       = input('idcard/s', '');
+            $mobile_check = DemandReportModel::where('snatchid', $id)->where('mobile', $mobile)->find();
+            if (!empty($mobile_check)) {
                 exit(json_encode([
                     'code' => 1,
-                    'msg'  => "该手机号或身份证号已报备，请勿重复",
+                    'msg'  => "该手机号已报备，请勿重复",
+                ]));
+            }
+            $idcard_check = DemandReportModel::where('snatchid', $id)->where('idcard', $idcard)->find();
+            if (!empty($idcard_check)) {
+                exit(json_encode([
+                    'code' => 1,
+                    'msg'  => "该身份证号已报备，请勿重复",
                 ]));
             }
 

app/worker/view/comjobs/comjobsform.html

@@ -213,6 +213,14 @@
 								<input type="radio" name="wtype" value="5" title="其他" {eq name="comjobs.wtype" value="5"}checked{/eq}>
 							</div>
 						</div>
+						<div class="layui-form-item" pane>
+							<label class="layui-form-label">性别要求</label>
+							<div class="layui-input-block">
+								<input type="radio" name="sex" value="0" title="不限" {eq name="comjobs.sex|default=0" value="0"}checked{/eq}>
+								<input type="radio" name="sex" value="1" title="男" {eq name="comjobs.sex" value="1"}checked{/eq}>
+								<input type="radio" name="sex" value="2" title="女" {eq name="comjobs.sex" value="2"}checked{/eq}>
+							</div>
+						</div>
 						<div class="layui-form-item">
 							<label class="layui-form-label">基本工资</label>
 							<div class="layui-input-block">

app/worker/view/demand/allhall.html

@@ -103,7 +103,7 @@
 		table.render({
 			elem: '#LAY-demand-demandlist-table',
 			height: 'full-20',
-			url: setter.baseWorkerUrl + 'demand/demandList',
+			url: setter.baseWorkerUrl + 'demand/allhall',
 			cols: [
 				[
 					{ type: 'checkbox', fixed: 'left' },