报表导出参数判空

backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/internal/dao/PaymentDetailsDaoImpl.java

@@ -21,7 +21,7 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
 			String purchaseSandUnit, String project, String fundType, String regionalCompany) {
 		// TODO Auto-generated method stub
 		StringBuilder hql = new StringBuilder("select ");
-		hql.append(" DATE_FORMAT( result.createTime , '%Y年%m月%d' ) AS createTime , ");// 创建时间
+		hql.append(" DATE_FORMAT( result.createTime , '%Y年%m月%d日' ) AS createTime , ");// 创建时间
 		hql.append(" result.purchaseSandUnit AS purchaseSandUnit , ");// 购砂公司
 		hql.append(" result.project AS project , ");// 项目名称
 		hql.append(" result.fundType AS fundType , ");// 资金类型

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

@@ -32,15 +32,15 @@ public class DownLoadStatisticsController {
 		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.setStartDate(obj.isNull("startDate") ? "" : obj.getString("startDate"));
+			conditionsDetailsInfo.setEndDate(obj.isNull("endDate") ? "" : obj.getString("endDate"));
+			conditionsDetailsInfo.setPurchaseSandUnit(obj.isNull("purchaseSandUnit") ? "" : obj.getString("purchaseSandUnit"));
+			conditionsDetailsInfo.setProject(obj.isNull("project") ? "" : obj.getString("project"));
+			conditionsDetailsInfo.setFundType(obj.isNull("fundType") ? "" : obj.getString("fundType"));
+			conditionsDetailsInfo.setDealYear(obj.isNull("dealYear") ? "" : obj.getString("dealYear"));
+			conditionsDetailsInfo.setRegionalCompany(obj.isNull("regionalCompany") ? "" : obj.getString("regionalCompany"));
 			conditionsDetailsInfo.setFileType(obj.getString("fileType"));
-			conditionsDetailsInfo.setStationList(obj.getString("stationList"));
+			conditionsDetailsInfo.setStationList(obj.isNull("stationList") ? "" : obj.getString("stationList"));
 			downLoadStatisticsService.downLoadStatisticsServiceTable(response, request, conditionsDetailsInfo);
 		} catch (RuntimeException e) {
 			// TODO: handle exception