完善功能

app/admin/controller/asset/HouseTypeController.php

@@ -74,16 +74,11 @@ class HouseTypeController extends Curd
             throw new BusinessException('记录不存在', 2);
         }
 
-
         if (!empty($request->post('floor_plan'))) {
-            $assetHouseJson = json_decode($model->asset_house_json, true);
-            $assetHouseJson['floor_plan'] = str_replace(getenv('STORAGE_DOMAIN'), '', $request->post('floor_plan'));
-            $data['asset_house_json'] = json_encode($assetHouseJson);
+            $data['asset_house_json'] = json_encode(['floor_plan' => str_replace(getenv('STORAGE_DOMAIN'), '', $request->post('floor_plan'))]);
         }
-        if (!empty($request->post('asset_house_address'))) {
-            $assetJson = json_decode($model->asset_json, true);
-            $assetJson['address'] = $request->post('asset_house_address');
-            $data['asset_json'] = json_encode($assetJson);
+        if (empty($request->post('asset_house_address'))) {
+            $data['asset_json'] = json_encode(['address' => $request->post('asset_house_address')]);
         }
 
         unset($data[$primary_key]);

app/admin/controller/member/CheckupController.php

@@ -100,7 +100,7 @@ class CheckupController extends Curd
                         'name' => $value['name']
                     ];
                 }
-                $this->wellness_record_file_json = $wellnessRecordFileJson;
+                $item->wellness_record_file_json = $wellnessRecordFileJson;
             }
         }
 

app/admin/controller/member/VisitingController.php

@@ -97,7 +97,7 @@ class VisitingController extends Curd
                         'name' => $value['name']
                     ];
                 }
-                $this->wellness_record_file_json = $wellnessRecordFileJson;
+                $item->wellness_record_file_json = $wellnessRecordFileJson;
             }
         }
 

app/admin/controller/member/WellnessRecordController.php

@@ -122,6 +122,56 @@ class WellnessRecordController extends Curd
         return json(['code' => 200, 'msg' => 'success', 'data' => $data]);
     }
 
+    /**
+     * @Desc 我的档案
+     * @Author Gorden
+     * @Date 2024/4/22 10:46
+     *
+     * @param $memberId
+     * @return Response
+     */
+    public function archives($memberId)
+    {
+        $query = $this->model->where('wellness_record_category', '档案')
+            ->where('join_wellness_record_member_id', $memberId)
+            ->orderBy('wellness_record_addtimes', 'desc');
+        $paginator = $query->paginate(20);
+        $total = $paginator->total();
+        $items = $paginator->items();
+        $itemsNew = [];
+        foreach ($items as $item) {
+            $itemNew = [
+                'wellness_record_id' => $item->wellness_record_id,
+                'join_wellness_record_member_id' => $item->join_wellness_record_member_id,
+                'wellness_record_status' => $item->wellness_record_status,
+                'wellness_record_name' => $item->wellness_record_name,
+                'wellness_record_datetime' => $item->wellness_record_datetime,
+                'wellness_record_json' => $item->wellness_record_json,
+                'wellness_record_content' => $item->wellness_record_content,
+                'wellness_record_remark' => $item->wellness_record_remark,
+                'wellness_record_extend_json' => $item->wellness_record_extend_json,
+                'wellness_record_addtimes' => $item->wellness_record_addtimes,
+            ];
+            if (!empty($item->wellness_record_file_json)) {
+                $item->wellness_record_file_json = json_decode($item->wellness_record_file_json, true);
+                foreach ($item->wellness_record_file_json as $value) {
+                    $itemNew['wellness_record_file_json'][] = [
+                        'url' => isset($value['url']) ? getenv('STORAGE_DOMAIN') . $value['url'] : '',
+                        'name' => isset($value['name']) ? $value['name'] : ''
+                    ];
+                }
+            }
+
+            $itemsNew[] = $itemNew;
+        }
+
+        $data = [
+            'total' => $total,
+            'rows' => $itemsNew
+        ];
+        return json(['code' => 200, 'msg' => 'success', 'data' => $data]);
+    }
+
     /**
      * @Desc 查询列表
      * @Author Gorden

app/model/Asset.php

@@ -2,6 +2,7 @@
 
 namespace app\model;
 
+use DateTimeInterface;
 use support\Model;
 
 class Asset extends Model
@@ -17,4 +18,9 @@ class Asset extends Model
     const CREATED_AT = 'asset_addtimes';
 
     const UPDATED_AT = null;
+
+    public function serializeDate(DateTimeInterface $date)
+    {
+        return $date->format('Y-m-d H:i:s');
+    }
 }

route/admin.php

@@ -503,6 +503,7 @@ Route::group('/admin', function () {
         Route::group('/wellnessRecord', function () {
             Route::get('/my/{id:[0-9a-zA-Z]+}', [\app\admin\controller\member\WellnessRecordController::class, 'my']);
             Route::get('/advice/{id:[0-9a-zA-Z]+}', [\app\admin\controller\member\WellnessRecordController::class, 'advice']);
+            Route::get('/archives/{id:[0-9a-zA-Z]+}', [\app\admin\controller\member\WellnessRecordController::class, 'archives']);
             Route::get('/list', [\app\admin\controller\member\WellnessRecordController::class, 'select']);
             Route::post('/add', [\app\admin\controller\member\WellnessRecordController::class, 'insert']);
             Route::post('/update', [\app\admin\controller\member\WellnessRecordController::class, 'update']);