liupeng 4 rokov pred
rodič
commit
f4ff98ad05

+ 5 - 3
code/sapparent/sapservice/src/main/java/org/fouram/service/SapEmployeeTimeService.java

@@ -2,6 +2,7 @@ package org.fouram.service;
 
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.fouram.core.base.service.BaseService;
@@ -33,10 +34,11 @@ public class SapEmployeeTimeService extends BaseService {
 	@SuppressWarnings("unchecked")
 	public void saveEmployeeTimes() throws Exception {
 		List<String> allSapUserIds = wxUserService.selectSapUserId();
+		Map<String, List<String>> map = groupList(allSapUserIds, 25);
 		String url = null;
-		for (String userId : allSapUserIds) {
+		for (String key : map.keySet()) {
 			url = String.format("https://api15.sapsf.cn/odata/v2/EmployeeTime?$filter=userId in %s&$format=json",
-					userId);
+					getUserIdList(map.get(key)));
 			JsonNode node = requestService.getForObject(url, getHttpHeaders());
 			SapEmployeeTime dbEmployeeTime = null;
 			SapEmployeeTime employeeTime = null;
@@ -73,7 +75,7 @@ public class SapEmployeeTimeService extends BaseService {
 					String lastModifiedBy = JsonNodeUtil.getValue(userNode, "lastModifiedBy");
 					String workflowRequestId = JsonNodeUtil.getValue(userNode, "workflowRequestId");
 					String undeterminedEndDate = JsonNodeUtil.getValue(userNode, "undeterminedEndDate");
-//					String userId = JsonNodeUtil.getValue(userNode, "userId");
+					String userId = JsonNodeUtil.getValue(userNode, "userId");
 					String recurrenceGroup = JsonNodeUtil.getValue(userNode, "recurrenceGroup");
 					String createdBy = JsonNodeUtil.getValue(userNode, "createdBy");
 					String workflowInitiatedByAdmin = JsonNodeUtil.getValue(userNode, "workflowInitiatedByAdmin");