Merge branch 'feature/form_statistics_05' into 'develop'

修改数据下载请求方式为表单

See merge request kunlun/xyst_dinas/xyst_dinas_backend!30

backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/web/DownLoadStatisticsController.java

@@ -9,9 +9,12 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.beecode.inz.basis.team.pojo.ResponseObj;
+import com.beecode.xlib.json.JSONException;
+import com.beecode.xlib.json.JSONObject;
 import com.xyst.dinas.statistics.service.DownLoadStatisticsService;
 import com.xyst.dinas.statistics.web.Info.ConditionsDetailsInfo;
 
@@ -20,10 +23,24 @@ public class DownLoadStatisticsController {
 	@Autowired
 	DownLoadStatisticsService downLoadStatisticsService;
 
-	@PostMapping(value ="/DownLoadStatistics/downLoadStatisticsService", consumes = "application/json")
-	public void downLoadStatisticsService(HttpServletResponse response, HttpServletRequest request,
-			@RequestBody ConditionsDetailsInfo conditionsDetailsInfo) {
+	@PostMapping(value = "/DownLoadStatistics/downLoadStatisticsService")
+	public void downLoadStatisticsService(HttpServletResponse response, HttpServletRequest request) throws JSONException {
+		String exportParamStr = request.getParameter("exportParamStr");
+		response.reset();
+		response.setCharacterEncoding("UTF-8");
+		response.setContentType("application/x-www-form-urlencoded");
+		JSONObject obj = new JSONObject(exportParamStr);
 		try {
+			ConditionsDetailsInfo conditionsDetailsInfo = new ConditionsDetailsInfo();
+			conditionsDetailsInfo.setStartDate(obj.getString("startDate"));
+			conditionsDetailsInfo.setEndDate(obj.getString("endDate"));
+			conditionsDetailsInfo.setPurchaseSandUnit(obj.getString("purchaseSandUnit"));
+			conditionsDetailsInfo.setProject(obj.getString("project"));
+			conditionsDetailsInfo.setFundType(obj.getString("fundType"));
+			conditionsDetailsInfo.setDealYear(obj.getString("dealYear"));
+			conditionsDetailsInfo.setRegionalCompany(obj.getString("regionalCompany"));
+			conditionsDetailsInfo.setFileType(obj.getString("fileType"));
+			conditionsDetailsInfo.setStationList(obj.getString("stationList"));
 			downLoadStatisticsService.downLoadStatisticsServiceTable(response, request, conditionsDetailsInfo);
 		} catch (RuntimeException e) {
 			// TODO: handle exception