wupengfei 1 jaar geleden
bovenliggende
commit
2d656d85ca

+ 4 - 2
.idea/workspace.xml

@@ -3,7 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/operate/view/demand_report/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/demand_report/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Report.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Report.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/model/UserReport.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/UserReport.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/CommentReport.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/CommentReport.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -379,7 +381,7 @@
       <workItem from="1689900489647" duration="18483000" />
       <workItem from="1690159826319" duration="22343000" />
       <workItem from="1690246325106" duration="23791000" />
-      <workItem from="1690332708631" duration="16322000" />
+      <workItem from="1690332708631" duration="16677000" />
     </task>
     <servers />
   </component>

+ 1 - 1
application/api/controller/Report.php

@@ -50,7 +50,7 @@ class Report extends Base
      * @url /api/Report/userReport
      * @method POST
      * @header name:Authorization require:1 desc:Token
-     * @param name:type type:int default:1 desc:举报类型(1视频2视频评论3会员,4资料,5图文6问题,7新闻8图文评论9新闻评论,10资料评论,11问题的回答,12问题||回答评论举报,13=>供应商产品,14供应商产品评论,15活动,16需求)
+     * @param name:type type:int default:1 desc:举报类型(1视频2视频评论3会员,4资料,5图文6问题,7新闻8图文评论9新闻评论,10资料评论,11问题的回答,12问题||回答评论举报,13=>供应商产品,14供应商产品评论,15活动,16需求,17需求评论
      * @param name:report_id type:int default:-- desc:举报内容的id
      * @param name:case_ids type:string default:-- desc:举报类目id串(逗号隔开)
      * @param name:content type:string default:-- desc:举报内容

+ 1 - 1
application/common/model/UserReport.php

@@ -7,7 +7,7 @@ class UserReport extends Model
 
     /**
      * @param $user_id
-     * @param $type 1视频2视频评论3会员,4资料,5图文6问题,7新闻8图文评论9新闻评论,10资料评论,11问题回答,12问题&&回答评论举报,13=>供应商产品,14供应商产品评论,15活动,16需求)
+     * @param $type 1视频2视频评论3会员,4资料,5图文6问题,7新闻8图文评论9新闻评论,10资料评论,11问题回答,12问题&&回答评论举报,13=>供应商产品,14供应商产品评论,15活动,16需求,17需求评论
      * @param $report_id
      * @param $case_ids
      */

+ 7 - 0
application/nutrition/controller/CommentReport.php

@@ -84,6 +84,13 @@ class CommentReport extends Controller
                         ->where('a.id', $val['object_info']['goods_id'])
                         ->find()->toArray();
                     break;
+                case 16:
+                    $val['object_info'] = \app\common\model\DemandComment::where('id',$val['report_id'])->find()->toArray();
+                    $val['be_report'] = \app\common\model\PlatformDemand::field('a.id second_id,a.title second_title')
+                        ->alias('a')
+                        ->where('a.id', $val['object_info']['demand_id'])
+                        ->find()->toArray();
+                    break;
 
             }
         });