| 
															
																@@ -697,13 +697,13 @@ public class KuaishouItemCollectSamplesController extends BaseController { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                                       @ApiParam("开始日期") @RequestParam(value = "statDate", required = false) String startDate, 
															 | 
															
															 | 
															
																                                       @ApiParam("开始日期") @RequestParam(value = "statDate", required = false) String startDate, 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                                       @ApiParam("结束日期") @RequestParam(value = "endDate", required = false) String endDate, 
															 | 
															
															 | 
															
																                                       @ApiParam("结束日期") @RequestParam(value = "endDate", required = false) String endDate, 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                                       @ApiParam("类型,1-渠道;2-招商") @RequestParam(value = "type", required = true) String type, 
															 | 
															
															 | 
															
																                                       @ApiParam("类型,1-渠道;2-招商") @RequestParam(value = "type", required = true) String type, 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-                                      @ApiParam("媒体,1-抖音;2-快手") @RequestParam(value = "mediaId", required = false) String mediaId) { 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+                                      @ApiParam("媒体,1-抖音;2-快手 ") @RequestParam(value = "mediaId", required = false) String mediaId) { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         JSONObject returnJson = new JSONObject(); 
															 | 
															
															 | 
															
																         JSONObject returnJson = new JSONObject(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         try { 
															 | 
															
															 | 
															
																         try { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             if (Check.isNull(userId)) { 
															 | 
															
															 | 
															
																             if (Check.isNull(userId)) { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                 throw new Exception("请传入人员ID"); 
															 | 
															
															 | 
															
																                 throw new Exception("请传入人员ID"); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             } 
															 | 
															
															 | 
															
																             } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-            return kuaishouItemCollectSamplesService.getDataAnalysis(userId, startDate, endDate, type, mediaId); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            return kuaishouItemCollectSamplesService.getDataAnalysis(userId,     startDate, endDate, type, mediaId); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         } catch (Exception e) { 
															 | 
															
															 | 
															
																         } catch (Exception e) { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             e.printStackTrace(); 
															 | 
															
															 | 
															
																             e.printStackTrace(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             returnJson.put("code", 500); 
															 | 
															
															 | 
															
																             returnJson.put("code", 500); 
															 |