rsbi %!s(int64=4) %!d(string=hai) anos
pai
achega
2a3a9fd40d

+ 3 - 0
src/main/java/com/ruisitech/bi/entity/bireport/OlapInfo.java

@@ -1,5 +1,6 @@
 package com.ruisitech.bi.entity.bireport;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruisitech.bi.entity.common.BaseEntity;
 import com.ruisitech.bi.util.RSBIUtils;
 
@@ -11,7 +12,9 @@ public class OlapInfo extends BaseEntity {
 	private Integer userId;
 	private String pageInfo;
 	private String pageName;
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date crtDate;
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date updateDate;
 	private String crtuser;
 	

+ 8 - 3
src/main/java/com/ruisitech/bi/web/bireport/MyReportController.java

@@ -22,10 +22,15 @@ public class MyReportController extends BaseController {
 	private OlapService service;
 	
 	@RequestMapping(value="/listReport.action")
-	public String list(String keyword, ModelMap model){
+	public @ResponseBody Object list(String keyword){
 		List<OlapInfo> ret = service.listreport(keyword);
-		model.addAttribute("ls", ret);
-		return "bireport/MyReport-list";
+		return super.buildSucces(ret);
+	}
+
+	@RequestMapping(value="/getReport.action")
+	public @ResponseBody Object getReport(Integer pageId){
+		OlapInfo olap = service.getOlap(pageId);
+		return super.buildSucces(olap);
 	}
 	
 	@RequestMapping(value="/saveReport.action", method = RequestMethod.POST)