完善功能

app/admin/controller/asset/HouseTypeController.php

@@ -44,7 +44,7 @@ class HouseTypeController extends Curd
     {
         $data = $this->inputFilter($request->post());
         $data['asset_id'] = 'AE' . date('YmdHis') . random_string(6, 'up');
-        $data['asset_house_json'] = json_encode(['floor_plan' => str_replace(getenv('STORAGE_DOMAIN'), '', $data['floor_plan'])]);
+//        $data['asset_house_json'] = json_encode(['floor_plan' => str_replace(getenv('STORAGE_DOMAIN'), '', $data['floor_plan'])]);
         $data['asset_json'] = json_encode(['address' => $data['asset_house_address']]);
 
         return $data;

app/admin/controller/member/WellnessRecordController.php

@@ -89,6 +89,7 @@ class WellnessRecordController extends Curd
         $items = $paginator
             ->items();
         $itemsNew = [];
+        dump($items);
         foreach ($items as $item) {
             $itemNew = [
                 'wellness_record_id' => $item->wellness_record_id,
@@ -104,11 +105,10 @@ class WellnessRecordController extends Curd
             ];
             if (!empty($item->wellness_record_file_json)) {
                 $item->wellness_record_file_json = json_decode($item->wellness_record_file_json, true);
-                $upload = SysUpload::whereIn('upload_file_path', $item->wellness_record_file_json)->get();
-                foreach ($upload as $value) {
+                foreach ($item->wellness_record_file_json as $value) {
                     $itemNew['wellness_record_file_json'][] = [
-                        'url' => getenv('STORAGE_DOMAIN') . $value->upload_file_path,
-                        'name' => $value->upload_name
+                        'url' => getenv('STORAGE_DOMAIN') . $value['url'],
+                        'name' => $value['name']
                     ];
                 }
             }
@@ -207,10 +207,6 @@ class WellnessRecordController extends Curd
     {
         $data = $this->inputFilter($request->post());
         $data['wellness_record_datetime'] = date('Y-m-d H:i:s', strtotime($data['wellness_record_datetime']));
-        if (!empty($data['wellness_record_file_json'])) {
-            $data['wellness_record_file_json'] = str_replace(getenv('STORAGE_DOMAIN'), '', $data['wellness_record_file_json']);
-            $data['wellness_record_file_json'] = json_encode(explode(',', $data['wellness_record_file_json']));
-        }
 
         return $data;
     }

app/admin/controller/sys_manage/UploadController.php

@@ -53,7 +53,7 @@ class UploadController
         $config = [
             'single_limit' => 1024 * 1024 * 50,
             'nums' => 1,
-            'include' => ['doc','docx','xlsx'],
+            'include' => ['pdf','doc','docx','xls','xlsx'],
             'uri' => '/storage/files/',
             'root' => public_path() . '/storage/files/',
         ];

app/controller/Curd.php

@@ -98,12 +98,13 @@ class Curd
 
         try {
             $data = $this->insertInput($request);
+            dump($data);
             $this->doInsert($data);
         } catch (BusinessException $customException) {
             return json_fail($customException->getMessage());
         } catch (\Exception $e) {
             dump($e->getMessage());
-            return json_fail('数据写入失败');
+            return json_fail('数据写入失败11');
         }
         return json_success('success');
     }
@@ -426,7 +427,6 @@ class Curd
                 $data[$col] = null;
             }
             if (is_array($item)) {
-                dump($col,$item);
                 $data[$col] = implode(',', $item);
             }
             if ($item != '' && (strpos(strtolower($columns[$col]), 'varchar') || strpos(strtolower($columns[$col]), 'text'))) {

app/model/GoodsRunning.php

@@ -10,6 +10,8 @@ class GoodsRunning extends Model
 
     protected $primaryKey = 'join_running_goods_id';
 
+    protected $keyType = 'string';
+
     const CREATED_AT = null;
 
     const UPDATED_AT = null;