From f0b1e3435daf138e3a0e432fad2d07700f11ea2c Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 22 Mar 2023 13:42:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Didcard=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/route/api.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/api/route/api.php b/app/api/route/api.php index b2d545f..433f0aa 100644 --- a/app/api/route/api.php +++ b/app/api/route/api.php @@ -69,10 +69,6 @@ Route::group('/',function () { * 获取 民族等 */ Route::get('Maintainentry/getcategory', 'Maintainentry/getcategory'); - /** - * 身份证查询 - */ - Route::get('idcard', 'idcard'); /** * 获取验证码 */ From b4d2add47743e9cc5051168da14dbc56a1f757d8 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 22 Mar 2023 13:48:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Duser=5Fid=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/Maintainentry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/Maintainentry.php b/app/api/controller/Maintainentry.php index 85ac33d..ad2cd74 100644 --- a/app/api/controller/Maintainentry.php +++ b/app/api/controller/Maintainentry.php @@ -1274,7 +1274,7 @@ class Maintainentry extends BaseController $userid = Db::connect('shop')->table('eb_user')->strict(false)->insertGetId($params); //写入用户信息表 - $post['user_id'] = 0; + $post['user_id'] = $userid; $post['createtime'] = $time; $post['enter_id'] = $this->request->uid; $post['gender']= $post['gender_id']; From 5870683c226cb4c660316e8d11c2e2b479f3d130 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 22 Mar 2023 13:51:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dland=5Farea=20=E9=94=99?= =?UTF-8?q?=E8=AF=AF=20breed=5Farea=20=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/Maintainentry.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/api/controller/Maintainentry.php b/app/api/controller/Maintainentry.php index ad2cd74..b0b9584 100644 --- a/app/api/controller/Maintainentry.php +++ b/app/api/controller/Maintainentry.php @@ -754,12 +754,17 @@ class Maintainentry extends BaseController // } } } + $waste_land_area = 0; - $waste_land_area = $post['land_area'] - $mianji - $post['breed_area']; - if($waste_land_area < 0){ - $waste_land_area = 0; + if (!empty($post['land_area']) && !empty($post['breed_area'])) + { + $waste_land_area = $post['land_area'] - $mianji - $post['breed_area']; + if($waste_land_area < 0){ + $waste_land_area = 0; + } } + if ($find) { // 修改人员信息 $data['tools_msg'] = $post['tools_msg']; From f6a7078a2dba6d15d0229e89140db13946f63893 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 22 Mar 2023 14:00:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dland=5Farea=20=E9=94=99?= =?UTF-8?q?=E8=AF=AF=20breed=5Farea=20=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/Maintainentry.php | 40 +++++----------------------- 1 file changed, 7 insertions(+), 33 deletions(-) diff --git a/app/api/controller/Maintainentry.php b/app/api/controller/Maintainentry.php index b0b9584..d210ee9 100644 --- a/app/api/controller/Maintainentry.php +++ b/app/api/controller/Maintainentry.php @@ -748,10 +748,6 @@ class Maintainentry extends BaseController $breed_data['createtime'] = $time; Db::table('fa_szxc_breed')->strict(false)->insertGetId($breed_data); } -//// 计算面积 -// if($v['mianji']){ -// $mianji += $v['mianji']; -// } } } $waste_land_area = 0; @@ -774,11 +770,6 @@ class Maintainentry extends BaseController $data['land_area'] = $post['land_area']; $data['nature_of_land'] = $post['nature_of_land_id']; $data['is_wz'] = $post['is_wz']; -// $data['work_name'] = $post['work_name']; -// $data['work_gender'] = $post['work_gender']; -// $data['work_phone'] = $post['work_phone'] ?? ''; -// $data['work_relation'] = $post['work_relation']; -// $data['work_id'] = $post['work_id']; $data['waste_land_area'] = $waste_land_area; $data['user_id'] = $user_id; $data['updatetime'] = time(); @@ -797,11 +788,6 @@ class Maintainentry extends BaseController $data['land_area'] = $post['land_area']; $data['nature_of_land'] = $post['nature_of_land_id']; $data['is_wz'] = $post['is_wz']; -// $data['work_name'] = $post['work_name']; -// $data['work_gender'] = $post['work_gender']; -// $data['work_phone'] = $post['work_phone'] ?? ''; -// $data['work_relation'] = $post['work_relation']; -// $data['work_id'] = $post['work_id']; $data['waste_land_area'] = $waste_land_area; $data['user_id'] = $user_id; @@ -1387,19 +1373,16 @@ class Maintainentry extends BaseController $breed_data['createtime'] = $time; Db::table('fa_szxc_breed')->strict(false)->insertGetId($breed_data); } -//// 计算面积 -// if($v['mianji']){ -// $mianji += $v['mianji']; -// } } } + $waste_land_area = 0; - if(!isset($post['breed_area'])){ - $post['breed_area'] = 0; - } - $waste_land_area = $post['land_area'] - $mianji - $post['breed_area']; - if($waste_land_area < 0){ - $waste_land_area = 0; + if (!empty($post['land_area']) && !empty($post['breed_area'])) + { + $waste_land_area = $post['land_area'] - $mianji - $post['breed_area']; + if($waste_land_area < 0){ + $waste_land_area = 0; + } } // 写入种植信息表 $cropsarr['user_id'] = $userid; //用户id @@ -1407,10 +1390,6 @@ class Maintainentry extends BaseController $cropsarr['crops_msg'] = $post['crops_msg'];//农作物信息 $cropsarr['land_area'] = $post['land_area'];//土地面积 $cropsarr['nature_of_land'] = $post['nature_of_land'];//土地性质 -// $cropsarr['work_name'] = $post['work_name'];//劳动人姓名 -// $cropsarr['work_gender'] = $post['work_gender'];//劳动人口性别 -// $cropsarr['work_relation'] = $post['work_relation'];//劳动人与户主关系 -// $cropsarr['work_id'] = $post['work_id'];//劳动人id $cropsarr['waste_land_area'] = $waste_land_area;//荒地面积 $cropsarr['breed_msg'] = $post['breed_msg']??'';//养殖详情信息 $cropsarr['breed_area'] = $post['breed_area']??'';//养殖面积 @@ -1495,11 +1474,6 @@ class Maintainentry extends BaseController // } if ($post) { -//// 验证验证码 -// if (! Sms::check($post['phone'], $post['captcha'], 'mobilelogin')) { -// $this->apiError(__('Captcha is incorrect')); -// } - Db::startTrans(); // 获取录入人地址 $add = Db::table('fa_szxc_information_useraddress')->where('user_id',$this->request->uid)->find();