Merge remote-tracking branch 'origin/dev' into dev

app/adminapi/lists/project_process_management/ApplyWithSealLists.php

@@ -39,6 +39,7 @@ class ApplyWithSealLists extends BaseAdminDataLists implements ListsSearchInterf
     {
         return [
             '=' => ['num'],
+
         ];
     }
 
@@ -55,7 +56,6 @@ class ApplyWithSealLists extends BaseAdminDataLists implements ListsSearchInterf
     public function lists(): array
     {
         return ApplyWithSeal::where($this->searchWhere)
-            ->field(['id', 'dataid', 'num', 'types', 'filetype', 'ridingseam', 'name', 'frequency', 'limit', 'depar', 'stampman', 'project', 'principal', 'content', 'loan', 'borrow', 'returndate', 'applicant', 'date', 'sjborrow', 'sjborrower', 'sjreturn', 'returnee', 'annex'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()

app/adminapi/lists/project_process_management/ProjectProgressPaymentLists.php

@@ -59,6 +59,9 @@ class ProjectProgressPaymentLists extends BaseAdminDataLists implements ListsSea
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
+            ->each(function($item){
+                $item['annex'] = json_decode($item['annex'], true);
+            })
             ->toArray();
     }
 

app/adminapi/logic/project_process_management/ApplyWithSealLogic.php

@@ -41,8 +41,8 @@ class ApplyWithSealLogic extends BaseLogic
         Db::startTrans();
         try {
             ApplyWithSeal::create([
-                'dataid' => $params['dataid'],
+                'dataid' => generate_sn(ApplyWithSeal::class, 'dataid'),
-                'num' => $params['num'],
+                'num' => generate_sn(ApplyWithSeal::class, 'num'),
                 'types' => $params['types'],
                 'filetype' => $params['filetype'],
                 'ridingseam' => $params['ridingseam'],
@@ -63,7 +63,7 @@ class ApplyWithSealLogic extends BaseLogic
                 'sjborrower' => $params['sjborrower'],
                 'sjreturn' => $params['sjreturn'],
                 'returnee' => $params['returnee'],
-                'annex' => $params['annex'],
+                'annex' => json_encode($params['annex']),
             ]);
 
             Db::commit();
@@ -88,8 +88,6 @@ class ApplyWithSealLogic extends BaseLogic
         Db::startTrans();
         try {
             ApplyWithSeal::where('id', $params['id'])->update([
-                'dataid' => $params['dataid'],
-                'num' => $params['num'],
                 'types' => $params['types'],
                 'filetype' => $params['filetype'],
                 'ridingseam' => $params['ridingseam'],
@@ -110,7 +108,7 @@ class ApplyWithSealLogic extends BaseLogic
                 'sjborrower' => $params['sjborrower'],
                 'sjreturn' => $params['sjreturn'],
                 'returnee' => $params['returnee'],
-                'annex' => $params['annex'],
+                'annex' => json_encode($params['annex'])
             ]);
 
             Db::commit();
@@ -145,6 +143,8 @@ class ApplyWithSealLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return ApplyWithSeal::findOrEmpty($params['id'])->toArray();
+        $data = ApplyWithSeal::findOrEmpty($params['id'])->toArray();
+        $data['annex'] = json_decode($params['annex'], true);
+        return $data;
     }
 }

app/adminapi/logic/project_process_management/ProjectChangeVisaContentLogic.php

@@ -41,7 +41,7 @@ class ProjectChangeVisaContentLogic extends BaseLogic
         Db::startTrans();
         try {
             ProjectChangeVisaContent::create([
-                'project_change_visa_dataid' => $params['project_change_visa_dataid'],
+                'project_change_visa_id' => $params['project_change_visa_id'],
                 'directory' => $params['directory'],
                 'unit_name' => $params['unit_name'],
                 'time' => $params['time'],

app/adminapi/logic/project_process_management/ProjectChangeVisaLogic.php

@@ -17,6 +17,7 @@ namespace app\adminapi\logic\project_process_management;
 
 use app\common\model\project_process_management\ProjectChangeVisa;
 use app\common\logic\BaseLogic;
+use app\common\model\project_process_management\ProjectChangeVisaContent;
 use think\facade\Db;
 
 
@@ -110,6 +111,8 @@ class ProjectChangeVisaLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return ProjectChangeVisa::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
+        $data =  ProjectChangeVisa::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
+        $data['project_change_visa_content'] = ProjectChangeVisaContent::where('project_change_visa_id', $data['id'])->select();
+        return $data;
     }
 }

app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php

@@ -40,7 +40,7 @@ class ProjectProgressPaymentLogic extends BaseLogic
     {
         Db::startTrans();
         try {
-            ProjectProgressPayment::create([
+            $p = ProjectProgressPayment::create([
                 'dataid' => generate_sn(ProjectProgressPayment::class, 'dataid'),
                 'num' => generate_sn(ProjectProgressPayment::class, 'num'),
                 'project_id' => $params['project_id'],
@@ -49,9 +49,12 @@ class ProjectProgressPaymentLogic extends BaseLogic
                 'sbhj' => $params['sbhj'],
                 'shhj' => $params['shhj'],
                 'ljhj' => $params['ljhj'],
-                'annex' => $params['annex'],
+                'annex' => json_encode($params['annex'])
             ]);
-
+            foreach ($params['project_progress_payment_detail'] as $item) {
+                $item['project_progress_payment_id'] = $p->id;
+                ProjectChangeVisaContentLogic::add($item);
+            }
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -80,7 +83,7 @@ class ProjectProgressPaymentLogic extends BaseLogic
                 'sbhj' => $params['sbhj'],
                 'shhj' => $params['shhj'],
                 'ljhj' => $params['ljhj'],
-                'annex' => $params['annex'],
+                'annex' => json_encode($params['annex'])
             ]);
 
             Db::commit();
@@ -115,6 +118,8 @@ class ProjectProgressPaymentLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return ProjectProgressPayment::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
+        $data = ProjectProgressPayment::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
+        $data['annex'] = json_decode($data['annex'], true);
+        return $data;
     }
 }

app/adminapi/logic/project_process_management/ProjectSurveySignatureLogic.php

@@ -55,6 +55,7 @@ class ProjectSurveySignatureLogic extends BaseLogic
                 'content' => $params['content'],
                 'result' => $params['result'],
                 'remark' => $params['remark'],
+                'annex'  => json_encode($params['annex'])
             ]);
 
             Db::commit();
@@ -91,6 +92,7 @@ class ProjectSurveySignatureLogic extends BaseLogic
                 'content' => $params['content'],
                 'result' => $params['result'],
                 'remark' => $params['remark'],
+                'annex'  => json_encode($params['annex'])
             ]);
 
             Db::commit();
@@ -125,6 +127,8 @@ class ProjectSurveySignatureLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return ProjectSurveySignature::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
+        $data = ProjectSurveySignature::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
+        $data['annex'] = json_decode($data['annex'], true);
+        return $data;
     }
 }