fix

code/sapparent/sapservice/src/main/java/org/fouram/core/base/service/BaseService.java

@@ -13,6 +13,7 @@ import org.fouram.core.util.Tools;
 import org.fouram.entity.SapUser;
 import org.springframework.http.HttpHeaders;
 
+import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 
 /**
@@ -122,4 +123,11 @@ public abstract class BaseService {
 
 		return map;
 	}
+	
+	public static JSONObject getPageResult(List<? extends Object> list, Object total){
+		JSONObject object = new JSONObject();
+		object.put("totalRecords", total);// 实际的行数
+		object.put("data", list);// 要以JSON格式返回
+		return object;
+	}
 }

code/sapparent/sapservice/src/main/java/org/fouram/service/SapCheckService.java

@@ -17,6 +17,7 @@ import org.fouram.entity.SapEmployeeTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
@@ -210,8 +211,17 @@ public class SapCheckService extends BaseService {
 		return false;
 	}
 
-	public Object findUserReports(String startDate, String endDate, String departId, String name, String state,
+	public JSONObject findUserReportPage(String startDate, String endDate, String departId, String name, String state,
 			Integer pageSize, Integer pageNumber) throws Exception {
+		List<Map<String, String>> list = findUserReports(startDate, endDate, departId, name, state, pageSize,
+				pageNumber);
+		List<Map<String, String>> totalList = findUserReports(startDate, endDate, departId, name, state, null, null);
+		return getPageResult(list, totalList.size());
+	}
+
+	@SuppressWarnings("unchecked")
+	public List<Map<String, String>> findUserReports(String startDate, String endDate, String departId, String name,
+			String state, Integer pageSize, Integer pageNumber) throws Exception {
 		if (StringUtils.isNotBlank(departId) && departId.endsWith(",")) {
 			departId = departId.substring(0, departId.length() - 1);
 		}
@@ -228,10 +238,10 @@ public class SapCheckService extends BaseService {
 		pd.put("departId", departId);
 		pd.put("name", name);
 		pd.put("state", state);
-		if(pageSize != null) {
+		if (pageSize != null) {
 			pd.put("pageCurrent", String.valueOf(pageSize * (pageNumber - 1)));
 			pd.put("pageSize", String.valueOf(pageSize));
 		}
-		return findList("SapCheckMapper.findUserReports", pd);
+		return (List<Map<String, String>>) findList("SapCheckMapper.findUserReports", pd);
 	}
 }