|
|
@@ -4,10 +4,7 @@ import com.malk.Util.UtilDateTime;
|
|
|
import com.malk.server.common.McException;
|
|
|
import com.malk.server.common.McR;
|
|
|
import com.malk.server.fxiaoke.FXKConf;
|
|
|
-import com.malk.service.dingtalk.DDClient;
|
|
|
-import com.malk.service.dingtalk.DDClient_Attendance;
|
|
|
-import com.malk.service.dingtalk.DDClient_Contacts;
|
|
|
-import com.malk.service.dingtalk.DDClient_Workflow;
|
|
|
+import com.malk.service.dingtalk.*;
|
|
|
import com.malk.service.fxiaoke.FXKClient;
|
|
|
import com.malk.xiding.repository.dao.XdDdApproveRecordDao2;
|
|
|
import com.malk.xiding.repository.dao.XdDdFxkRelationDao;
|
|
|
@@ -54,6 +51,16 @@ public class XDController {
|
|
|
@Autowired
|
|
|
private XdDdFxkRelationDao relationDao;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private DDService ddService;
|
|
|
+
|
|
|
+ @GetMapping("test")
|
|
|
+ McR test() {
|
|
|
+
|
|
|
+ boolean isMarketing = ddService.matchDepartment(ddClient.getAccessToken(), "20443665131248560", Arrays.asList(37263540L));
|
|
|
+ return McR.success(isMarketing);
|
|
|
+ }
|
|
|
+
|
|
|
@PostMapping("test3")
|
|
|
McR test3(@RequestParam String name) {
|
|
|
|
|
|
@@ -86,9 +93,10 @@ public class XDController {
|
|
|
|
|
|
log.info("###### [XD]考勤数据同步 ######, {}", year + "-" + mouth + "-" + day_s + " ~ " + year + "-" + mouth + "-" + day_e);
|
|
|
McException.assertAccessException(day_s > day_e, "开始时间不能大于结束时间");
|
|
|
- for (int i = 1; i <= 3; i++) {
|
|
|
- Date sTime = UtilDateTime.parseDateTime(year + "-" + mouth + "-" + day_s + " 00:00:00");
|
|
|
- Date eTime = UtilDateTime.parseDateTime(year + "-" + mouth + "-" + day_s + " 23:59:59");
|
|
|
+ for (int i = day_s; i <= day_e; i++) {
|
|
|
+ Date sTime = UtilDateTime.parseDateTime(year + "-" + mouth + "-" + i + " 00:00:00");
|
|
|
+ Date eTime = UtilDateTime.parseDateTime(year + "-" + mouth + "-" + i + " 23:59:59");
|
|
|
+ log.info("###### [XD]考勤数据同步 ######, {} ~ {}", sTime, eTime);
|
|
|
xdService.syncAttendance(0, sTime, eTime);
|
|
|
xdService.syncAttendanceForCC(0, sTime, eTime);
|
|
|
|
