shish преди 2 години
родител
ревизия
78100299bd
променени са 2 файла, в които са добавени 105 реда и са изтрити 17 реда
  1. 11 2
      app-ghs/controllers/BookIoController.php
  2. 94 15
      biz-ghs/book/classes/BookIoClass.php

+ 11 - 2
app-ghs/controllers/BookIoController.php

@@ -32,8 +32,17 @@ class BookIoController extends BaseController
     //明细 ssh 20240715
     public function actionGetCombine()
     {
-        //BookIoClass::getCombine();
-        util::success(['list'=>[]]);
+        $get = Yii::$app->request->get();
+        $ioId = $get['ioId'] ?? 0;
+        $ioRes = BookIoClass::getById($ioId,true);
+        if (empty($ioRes)) {
+            util::fail('没有找到');
+        }
+        if($ioRes->mainId!=$this->mainId){
+            util::fail('不是你的哦');
+        }
+        $list = BookIoClass::getCombine($ioRes);
+        util::success(['list'=>$list]);
     }
 
 }

+ 94 - 15
biz-ghs/book/classes/BookIoClass.php

@@ -18,26 +18,105 @@ class BookIoClass extends BaseClass
         return $data;
     }
 
-    public static function getCombine()
+    public static function getCombine($ioRes)
     {
+        $id = $ioRes->id??0;
+        $arr =[];
 
-        BookChangeGlobalClass::getByCondition([]);
-        BookCgChangeGlobalClass::getByCondition([]);
+        $arr[] = '汇总';
+        $arr[] = '------';
+        $list1 = BookChangeGlobalClass::getAllByCondition(['relateId'=>$id],null,'*');
+        if(!empty($list1)){
+            foreach($list1 as $key1 => $val1){
+                $event1 = $val1['event']??'';
+                $arr[] = $event1;
+            }
+        }
+        $list2 = BookOnChangeGlobalClass::getAllByCondition(['relateId'=>$id],null,'*');
+        if(!empty($list2)){
+            foreach($list2 as $key2 => $val2){
+                $event2 = $val2['event']??'';
+                $arr[] = $event2;
+            }
+        }
+        $list3 = BookRoadChangeGlobalClass::getAllByCondition(['relateId'=>$id],null,'*');
+        if(!empty($list3)){
+            foreach($list3 as $key3 => $val3){
+                $event3 = $val3['event']??'';
+                $arr[] = $event3;
+            }
+        }
+        $list4 = BookCgChangeGlobalClass::getAllByCondition(['relateId'=>$id],null,'*');
+        if(!empty($list4)){
+            foreach($list4 as $key4 => $val4){
+                $event4 = $val4['event']??'';
+                $arr[] = $event4;
+            }
+        }
 
-        BookChangeClass::getByCondition([]);
-        BookCgChangeClass::getByCondition([]);
+        $arr[] = '按客户';
+        $arr[] = '------';
+        $list5 = BookCustomChangeClass::getAllByCondition(['relateId'=>$id],null,'*');
+        if(!empty($list5)){
+            foreach($list5 as $key5 => $val5){
+                $event5 = $val5['event']??'';
+                $arr[] = $event5;
+            }
+        }
+        $list6 = BookCustomCgChangeClass::getAllByCondition(['relateId'=>$id],null,'*');
+        if(!empty($list6)){
+            foreach($list6 as $key6 => $val6){
+                $event6 = $val6['event']??'';
+                $arr[] = $event6;
+            }
+        }
+        $list7 = BookCustomRoadChangeClass::getAllByCondition(['relateId'=>$id],null,'*');
+        if(!empty($list7)){
+            foreach($list7 as $key7 => $val7){
+                $event7 = $val7['event']??'';
+                $arr[] = $event7;
+            }
+        }
+        $list8 = BookCustomOnChangeClass::getAllByCondition(['relateId'=>$id],null,'*');
+        if(!empty($list8)){
+            foreach($list8 as $key8 => $val8){
+                $event8 = $val8['event']??'';
+                $arr[] = $event8;
+            }
+        }
 
-        BookCustomChangeClass::getByCondition([]);
-        BookCustomCgChangeClass::getByCondition([]);
-
-        BookRoadChangeGlobalClass::getByCondition([]);
-        BookRoadChangeClass::getByCondition([]);
-        BookCustomRoadChangeClass::getByCondition([]);
-
-        BookOnChangeGlobalClass::getByCondition([]);
-        BookOnChangeClass::getByCondition([]);
-        BookCustomOnChangeClass::getByCondition([]);
+        $arr[] = '详细';
+        $arr[] = '------';
+        $list9 = BookChangeClass::getAllByCondition(['relateId'=>$id],null,'*');
+        if(!empty($list9)){
+            foreach($list2 as $key2 => $val2){
+                $event2 = $val2['event']??'';
+                $arr[] = $event2;
+            }
+        }
+        $list10 = BookOnChangeClass::getAllByCondition(['relateId'=>$id],null,'*');
+        if(!empty($list10)){
+            foreach($list10 as $key10 => $val10){
+                $event10 = $val10['event']??'';
+                $arr[] = $event10;
+            }
+        }
+        $list11 = BookRoadChangeClass::getAllByCondition(['relateId'=>$id],null,'*');
+        if(!empty($list11)){
+            foreach($list11 as $key11 => $val11){
+                $event11 = $val11['event']??'';
+                $arr[] = $event11;
+            }
+        }
+        $list12 = BookCgChangeClass::getAllByCondition(['relateId'=>$id],null,'*');
+        if(!empty($list12)){
+            foreach($list12 as $key12 => $val12){
+                $event12 = $val12['event']??'';
+                $arr[] = $event12;
+            }
+        }
 
+        return $arr;
     }
 
 }