liupeng hace 5 años
padre
commit
399d43764a

+ 9 - 6
code/sapparent/sapservice/src/main/java/org/fouram/core/plugin/weixin/cp/util/WXCpOaUtil.java

@@ -2,7 +2,6 @@ package org.fouram.core.plugin.weixin.cp.util;
 
 import static org.fouram.core.plugin.weixin.cp.core.WXCpOaBase.oaService;
 
-import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
 
@@ -11,6 +10,7 @@ import org.fouram.core.util.DateUtil;
 import com.google.common.collect.Lists;
 
 import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.cp.bean.WxCpApprovalDataResult;
 import me.chanjar.weixin.cp.bean.WxCpCheckinData;
 import me.chanjar.weixin.cp.bean.WxCpCheckinOption;
 
@@ -44,10 +44,13 @@ public class WXCpOaUtil {
 		}
 	}
 
-	public static void main(String[] args) throws ParseException {
-		List<WxCpCheckinData> checkinDatas = WXCpOaUtil.getCheckinData(
-				DateUtil.sdfTime.parse("2020-04-01 00:00:00"), DateUtil.sdfTime.parse("2020-04-30 23:59:59"),
-				Lists.newArrayList("500017"));
-		System.out.println(checkinDatas);
+	public static WxCpApprovalDataResult getApprovalData(Date startTime, Date endTime) throws WxErrorException {
+		return oaService.getApprovalData(startTime, endTime, null);
+	}
+
+	public static void main(String[] args) throws Exception {
+		WxCpApprovalDataResult approvalDataResult = WXCpOaUtil.getApprovalData(
+				DateUtil.sdfTime.parse("2020-04-01 00:00:00"), DateUtil.sdfTime.parse("2020-04-30 23:59:59"));
+		System.out.println(approvalDataResult);
 	}
 }

+ 4 - 0
code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapEmployeeTimeMapper.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="SapEmployeeTimeMapper">
+	<update id="truncateEmployeeTime">
+		truncate table sap_employee_time
+	</update>
+
 	<insert id="saveOne">
 		insert into sap_employee_time(externalCode,lastModifiedDateTime,endDate,endDateTime,loaActualReturnDate,
 			createdDateTime,timeType,loaExpectedReturnDate,flexibleRequesting,

+ 2 - 0
code/sapparent/sapservice/src/main/java/org/fouram/service/SapEmployeeTimeService.java

@@ -29,6 +29,8 @@ public class SapEmployeeTimeService extends BaseService {
 	}
 
 	public void saveEmployeeTimes() throws Exception {
+		update("SapEmployeeTimeMapper.truncateEmployeeTime", null);
+		
 		List<String> sapUsers = checkService.selectCheckUserList();
 		String url = "https://api15.sapsf.cn/odata/v2/EmployeeTime?$filter=userId in %s&$format=json";
 		url = String.format(url, getUserIdList(sapUsers));