|
@@ -2,7 +2,6 @@ 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;
|
|
@@ -34,11 +33,10 @@ 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 key : map.keySet()) {
|
|
|
+ for (String userId : allSapUserIds) {
|
|
|
url = String.format("https://api15.sapsf.cn/odata/v2/EmployeeTime?$filter=userId in %s&$format=json",
|
|
|
- getUserIdList(map.get(key)));
|
|
|
+ userId);
|
|
|
JsonNode node = requestService.getForObject(url, getHttpHeaders());
|
|
|
SapEmployeeTime dbEmployeeTime = null;
|
|
|
SapEmployeeTime employeeTime = null;
|
|
@@ -75,7 +73,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");
|