liugc 1 рік тому
батько
коміт
eea3fd4152

+ 3 - 1
app/adminapi/logic/tenant/TenantRegisterLogic.php

@@ -110,7 +110,9 @@ class TenantRegisterLogic extends BaseLogic
                     'domain_alias_enable' => 1,
                     'domain_alias'        => $params['domain_alias']??'',
                 ])->id;
-
+                TenantRegister::where('id', $params['id'])->update([
+                    'tenant_id' => $tenant_id
+                ]);
                 //mobile real_name lon lat province city area_name
                 $worker_id = MasterWorkerRegisterLogic::createMasterWorker([
                     'mobile' => $params['mobile'],

+ 5 - 1
app/common/model/tenant/TenantAgree.php

@@ -18,6 +18,7 @@ namespace app\common\model\tenant;
 use app\common\model\BaseModel;
 use app\common\model\master_worker\MasterWorker;
 use app\common\model\master_worker\MasterWorkerInfo;
+use app\common\model\master_worker\MasterWorkerTeam;
 
 
 /**
@@ -34,5 +35,8 @@ class TenantAgree extends BaseModel
     {
         return $this->hasOne(MasterWorkerInfo::class, 'worker_id', 'worker_id');
     }
-    
+    public function masterWorkerTeam()
+    {
+        return $this->hasOne(MasterWorkerTeam::class, 'master_worker_id', 'worker_id');
+    }
 }

+ 6 - 1
app/index/controller/TenantAgreementController.php

@@ -6,6 +6,7 @@ use app\BaseController;
 use app\common\command\AddAgreementPdf;
 use app\common\model\master_worker\MasterWorkerAgree;
 use app\common\model\tenant\TenantAgree;
+use app\common\model\tenant\TenantRegister;
 use app\common\service\JsonService;
 use think\facade\View;
 
@@ -18,10 +19,14 @@ class TenantAgreementController extends BaseController
         if(empty($code)){
             return JsonService::fail('code不存在');
         }
-        $agree = TenantAgree::with('masterWorkerInfo')->where('code', $code)->findOrEmpty();
+        $agree = TenantAgree::with(['masterWorkerInfo','masterWorkerTeam'])->where('code', $code)->findOrEmpty();
+        $register_info = TenantRegister::where('tenant_id', $agree['masterWorkerTeam']['tenant_id'])->findOrEmpty();
         $agree['sign'] = $this->request->domain().'/'.$agree['sign'];
         View::assign([
             'agree'  => $agree,
+            'register_info'  => $register_info,
+            'start_date'=> date('Y年m月d日'),
+            'end_date'=> date('Y年m月d日', strtotime(date('Y-m-d'). ' +1 year')),
         ]);
         return view('tenant_agree');
     }

Різницю між файлами не показано, бо вона завелика
+ 297 - 302
app/index/view/tenant_agreement/tenant_agree.html


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