提交

application/api/controller/Approveinfo.php

@@ -5,10 +5,7 @@ namespace app\api\controller;
 use app\common\constant\CommonConstant;
 use app\common\service\ApproveService;
 use app\common\service\ApproveInfoService;
-use app\common\service\UserService;
 use hg\apidoc\annotation as Apidoc;
-use think\Db;
-use think\Exception;
 
 /**
  * @Apidoc\Title("审批申请")

application/api/controller/Dingtalk.php

@@ -2,7 +2,6 @@
 
 namespace app\api\controller;
 
-use AlibabaCloud\SDK\Dingtalk\Vedu_1_0\Models\QueryClassScheduleResponseBody\config;
 use app\common\model\Department;
 use app\common\model\User;
 use app\common\service\DingtalkService;

application/common/model/ApproveApplyGoods.php

@@ -14,7 +14,13 @@ class ApproveApplyGoods extends Model
 
     // 追加属性
     protected $append = [
-
+        'goods_stock_text',
     ];
 
+    public function getGoodsStockTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['goods_stock']) ? $data['goods_stock'] : '');
+        return $value ? json_decode($value,true) : [];
+    }
+
 }

application/common/service/ApproveInfoService.php

@@ -837,13 +837,13 @@ class ApproveInfoService
                                 ]);
                         },
                         'applyGoods' => function ($query) {
-                            $query->field('id,info_id,goods_name');
+                            $query->field('create_at',true);
                         },
                     ]);
                 } else {
                     $list = $list->with([
                         'applyGoods' => function ($query) {
-                            $query->field('id,info_id,goods_name');
+                            $query->field('create_at',true);
                         },
                     ]);
                 }

application/common/service/DingtalkService.php

@@ -133,7 +133,8 @@ class DingtalkService
         $timeStamp = time();  // 时间戳，格式为13位数字，如：1602756290
         $stringA = "jsapi_ticket=$jsapiTicket&noncestr=$nonceStr&timestamp=$timeStamp&url=$url";
         $signature = sha1($stringA); // 签名值
-        // agentId值 corpId值
+        // agentId值
+        // corpId值
         $config = config('app.dingtalk');
         $agentId = $config['agentId'];
         $corpId = $config['corpId'];