fix

code/sapparent/sapcms/src/main/java/org/fouram/controller/TestController.java

@@ -1,7 +1,13 @@
 package org.fouram.controller;
 
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
 import org.fouram.core.base.controller.BaseController;
 import org.fouram.core.util.AppUtil;
+import org.fouram.entity.SapUser;
+import org.fouram.enums.UploadHrEmpUserEnum;
+import org.fouram.service.SapUserService;
 import org.fouram.service.TestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -15,6 +21,8 @@ public class TestController extends BaseController {
 
 	@Autowired
 	private TestService testService;
+	@Autowired
+	private SapUserService sapUserService;
 
 	/**
 	 * http://localhost:8080/sapcms/test/saveTestAnon
@@ -28,4 +36,18 @@ public class TestController extends BaseController {
 		testService.saveTest();
 		return AppUtil.success();
 	}
+
+	@PostMapping(value = "/uploadHrEmpUserInfoAnon", produces = "application/json;charset=utf-8")
+	@ResponseBody
+	public Object uploadHrEmpUserInfoAnon() throws Exception {
+		List<SapUser> users = sapUserService.select2021LeaveAndEntryList();
+		for (SapUser user : users) {
+			if (StringUtils.isNotBlank(user.getEndDate())) {
+				sapUserService.uploadHrEmpUserInfo(user, UploadHrEmpUserEnum.LEAVE.getCode());
+			} else {
+				sapUserService.uploadHrEmpUserInfo(user, UploadHrEmpUserEnum.ENTRY.getCode());
+			}
+		}
+		return AppUtil.success();
+	}
 }

code/sapparent/sapservice/src/main/java/org/fouram/job/CheckTaskSchedule.java

@@ -66,6 +66,7 @@ public class CheckTaskSchedule {
 		wxCheckService.saveCheckInOffOuts(startDay, endDay);
 		LoggerUtil.info("saveCheckInOffOuts:" + DateUtil.getTime());
 		// 判断打卡记录小于10条记录认为是假期
+		System.out.println(wxCheckService.queryCheckInTotal());
 		if (wxCheckService.queryCheckInTotal() < 10) {
 			return;
 		}

code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapCheckMapper.xml

@@ -260,6 +260,6 @@
 	</update>
 	
 	<select id="queryCheckInTotal" resultType="Long">
-		SELECT count(1) from sap_checkin
+		SELECT count(1) from sap_checkin where groupName not like '华人影业-今涂%'
 	</select>
 </mapper>

code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapUserMapper.xml

@@ -177,4 +177,9 @@
 		set sendLeaveMessageFlag=#{sendLeaveMessageFlag} 
 		where userId=#{userId}
 	</update>
+	
+	<select id="select2021LeaveAndEntryList" resultType="SapUser">
+		select * from sap_user 
+		where isPrimary = 1 and (startDate like '2021%' or endDate like '2021%') 
+	</select>
 </mapper>

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

@@ -304,7 +304,7 @@ public class SapUserService extends BaseService {
 	public List<SapUser> selectListByPersonId(String personId) throws Exception {
 		return (List<SapUser>) findList("SapUserMapper.selectListByPersonId", personId);
 	}
-
+	
 	public void updateAllDelFlag(Integer delFlag) throws Exception {
 		update("SapUserMapper.updateAllDelFlag", delFlag);
 	}
@@ -521,6 +521,11 @@ public class SapUserService extends BaseService {
 		SapUser sapUser = SapUser.builder().userId(userId).sendEntryMessageFlag(sendEntryMessageFlag).build();
 		update("SapUserMapper.updateSendLeaveMessageFlag", sapUser);
 	}
+	
+	@SuppressWarnings("unchecked")
+	public List<SapUser> select2021LeaveAndEntryList() throws Exception {
+		return (List<SapUser>) findList("SapUserMapper.select2021LeaveAndEntryList", null);
+	}
 
 	public void uploadHrEmpUserInfo(SapUser user, Integer type) throws Exception {
 		UploadModifyEmpDTO reqdata = UploadModifyEmpDTO.builder().username(user.getUsername())
@@ -529,6 +534,7 @@ public class SapUserService extends BaseService {
 		String url = "http://cmcadmin.info666.com/hr/emp/modifyEmpInfo";
 		JSONObject parameters = new JSONObject();
 		parameters.put("reqdata", reqdata);
-		HttpClientUtil.postJson(url, parameters.toJSONString());
+		String result = HttpClientUtil.postJson(url, parameters.toJSONString());
+		LoggerUtil.info("uploadHrEmpUserInfo->result->" + result);
 	}
 }