商品修改报表优化

app/admin/controller/Report.php

@@ -1231,6 +1231,7 @@ class Report extends Base
             ->leftJoin('good_basic gb', 'gb.spuCode=cl.code AND gb.is_del=0')
             ->leftJoin('supplier s', 's.code=gb.supplierNo AND s.is_del=0')
             ->where($where)
+            ->order('cl.addtime', 'desc')
             ->page($param['page'], $param['size'])
             ->cursor();
 
@@ -1244,7 +1245,40 @@ class Report extends Base
 
             $value['before_info'] = [];
             foreach ($after_info as $kk => $vv) {
-                $value['before_info'][$kk] = $before_info[$kk];
+
+                //特殊字段处理
+                switch ($kk) {
+                    case 'brand_id':
+                        $value['before_info'][$kk] = Db::name('brand')->where(['id' => $before_info[$kk], 'is_del' => 0])->value('brand_name', '');
+                        $after_info[$kk] = Db::name('brand')->where(['id' => $vv, 'is_del' => 0])->value('brand_name', '');
+                        break;
+
+                    case 'cat_id':
+                        $value['before_info'][$kk] = Db::name('cat')->where(['id' => $before_info[$kk], 'is_del' => 0])->value('cat_name', '');
+                        $after_info[$kk] = Db::name('cat')->where(['id' => $vv, 'is_del' => 0])->value('cat_name', '');
+                        break;
+
+                    case 'delivery_place':
+                        $delivery_place = explode(',', $before_info[$kk]);
+                        $value['before_info'][$kk] = GetAddr(json_encode(['provice_code' => $delivery_place[0] ?? '', 'city_code' => $delivery_place[1] ?? '', 'area_code' => $delivery_place[2] ?? '']));
+
+                        $delivery_place_2 = explode(',', $value['delivery_place']);
+                        $after_info[$kk] = GetAddr(json_encode(['provice_code' => $delivery_place_2[0] ?? '', 'city_code' => $delivery_place_2[1] ?? '', 'area_code' => $delivery_place_2[2] ?? '']));
+                        break;
+
+                    case 'origin_place':
+                        $origin_place = explode(',', $before_info[$kk]);
+                        $value['before_info'][$kk] = GetAddr(json_encode(['provice_code' => $origin_place[0] ?? '', 'city_code' => $origin_place[1] ?? '', 'area_code' => $origin_place[2] ?? '']));
+
+                        $origin_place_2 = explode(',', $value['delivery_place']);
+                        $after_info[$kk] = GetAddr(json_encode(['provice_code' => $origin_place_2[0] ?? '', 'city_code' => $origin_place_2[1] ?? '', 'area_code' => $origin_place_2[2] ?? '']));
+                        break;
+
+                    default:
+                        $value['before_info'][$kk] = $before_info[$kk];
+                        break;
+                }
+
             }
 
             $value['after_info'] = $after_info;