fix

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

@@ -5,6 +5,7 @@ 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.dto.input.UploadHrEmpUserDTO;
 import org.fouram.entity.SapUser;
 import org.fouram.enums.UploadHrEmpUserEnum;
 import org.fouram.service.SapUserService;
@@ -37,15 +38,29 @@ public class TestController extends BaseController {
 		return AppUtil.success();
 	}
 
-	@PostMapping(value = "/uploadHrEmpUserInfoAnon", produces = "application/json;charset=utf-8")
+	@PostMapping(value = "/uploadDevHrEmpUserInfoAnon", produces = "application/json;charset=utf-8")
 	@ResponseBody
-	public Object uploadHrEmpUserInfoAnon() throws Exception {
-		List<SapUser> users = sapUserService.select2021LeaveAndEntryList();
+	public Object uploadDevHrEmpUserInfoAnon(UploadHrEmpUserDTO dto) throws Exception {
+		List<SapUser> users = sapUserService.selectLeaveAndEntryList(dto.getDate());
 		for (SapUser user : users) {
 			if (StringUtils.isNotBlank(user.getEndDate())) {
-				sapUserService.uploadHrEmpUserInfo(user, UploadHrEmpUserEnum.LEAVE.getCode());
+				sapUserService.uploadHrEmpUserInfo(user, UploadHrEmpUserEnum.LEAVE.getCode(), true);
 			} else {
-				sapUserService.uploadHrEmpUserInfo(user, UploadHrEmpUserEnum.ENTRY.getCode());
+				sapUserService.uploadHrEmpUserInfo(user, UploadHrEmpUserEnum.ENTRY.getCode(), true);
+			}
+		}
+		return AppUtil.success();
+	}
+	
+	@PostMapping(value = "/uploadMasHrEmpUserInfoAnon", produces = "application/json;charset=utf-8")
+	@ResponseBody
+	public Object uploadMasHrEmpUserInfoAnon(UploadHrEmpUserDTO dto) throws Exception {
+		List<SapUser> users = sapUserService.selectLeaveAndEntryList(dto.getDate());
+		for (SapUser user : users) {
+			if (StringUtils.isNotBlank(user.getEndDate())) {
+				sapUserService.uploadHrEmpUserInfo(user, UploadHrEmpUserEnum.LEAVE.getCode(), false);
+			} else {
+				sapUserService.uploadHrEmpUserInfo(user, UploadHrEmpUserEnum.ENTRY.getCode(), false);
 			}
 		}
 		return AppUtil.success();

code/sapparent/sapservice/src/main/java/org/fouram/dto/input/UploadHrEmpUserDTO.java

@@ -0,0 +1,21 @@
+package org.fouram.dto.input;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class UploadHrEmpUserDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String date;
+}

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

@@ -38,7 +38,7 @@ public class MessageSchedule {
 						.append("<a href=\"https://studybom.suggest.vip/#/userSync/list\">立即同步</a>");
 				sapUserService.sendEntryMessage(messageContent.toString(), sapUser, messageUsers);
 				
-				sapUserService.uploadHrEmpUserInfo(sapUser, UploadHrEmpUserEnum.ENTRY.getCode());
+				sapUserService.uploadHrEmpUserInfo(sapUser, UploadHrEmpUserEnum.ENTRY.getCode(), false);
 			}
 			// 离职
 			sapUsers = sapUserService.selectNotSendLeaveMessageList();
@@ -51,7 +51,7 @@ public class MessageSchedule {
 						.append("<a href=\"https://studybom.suggest.vip/#/userSync/list\">立即同步</a>");
 				sapUserService.sendLeaveMessage(messageContent.toString(), sapUser, messageUsers);
 				
-				sapUserService.uploadHrEmpUserInfo(sapUser, UploadHrEmpUserEnum.LEAVE.getCode());
+				sapUserService.uploadHrEmpUserInfo(sapUser, UploadHrEmpUserEnum.LEAVE.getCode(), false);
 			}
 		} catch (Exception e) {
 			WXCpMessageUtil.sendAdminError(Tools.getExceptionAllInfo(e));

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

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

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

@@ -524,16 +524,19 @@ public class SapUserService extends BaseService {
 	}
 
 	@SuppressWarnings("unchecked")
-	public List<SapUser> select2021LeaveAndEntryList() throws Exception {
-		return (List<SapUser>) findList("SapUserMapper.select2021LeaveAndEntryList", null);
+	public List<SapUser> selectLeaveAndEntryList(String date) throws Exception {
+		return (List<SapUser>) findList("SapUserMapper.selectLeaveAndEntryList", date);
 	}
 
-	public void uploadHrEmpUserInfo(SapUser user, Integer type) throws Exception {
+	public void uploadHrEmpUserInfo(SapUser user, Integer type, boolean devFlag) throws Exception {
 		UploadModifyEmpDTO reqdata = UploadModifyEmpDTO.builder().username(user.getName())
 				.entryDate(user.getStartDate()).resignDate(user.getEndDate()).type(type).phone(user.getFormatMobile())
 				.cardId(user.getCardId()).cardType(CardTypeEnum.getEnumBySapCode(user.getCardType()).getMyCode())
 				.jobNumber(user.getJobNumber()).build();
 		String url = "http://cmcadmin.info666.com/hr/emp/modifyEmpInfo";
+		if(!devFlag) {
+			url = "manage.inet.cmcinc.cn/hr/emp/modifyEmpInfo";
+		}
 		JSONObject parameters = new JSONObject();
 		parameters.put("reqdata", reqdata);
 		String result = HttpClientUtil.postJson(url, parameters.toJSONString());