fix

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

@@ -48,34 +48,6 @@ public class TestController extends BaseController {
 		return AppUtil.success();
 	}
 
-	@PostMapping(value = "/uploadDevHrEmpUserInfoAnon", produces = "application/json;charset=utf-8")
-	@ResponseBody
-	public Object uploadDevHrEmpUserInfo(UploadHrEmpUserDTO dto) throws Exception {
-		List<SapUser> users = sapUserService.selectLeaveAndEntryList(dto.getDate());
-		for (SapUser user : users) {
-			if (StringUtils.isNotBlank(user.getEndDate())) {
-				sapUserService.uploadDevHrEmpUserInfo(user, UploadHrEmpUserEnum.LEAVE.getCode());
-			} else {
-				sapUserService.uploadDevHrEmpUserInfo(user, UploadHrEmpUserEnum.ENTRY.getCode());
-			}
-		}
-		return AppUtil.success();
-	}
-	
-	@PostMapping(value = "/uploadMasHrEmpUserInfoAnon", produces = "application/json;charset=utf-8")
-	@ResponseBody
-	public Object uploadMasHrEmpUserInfo(UploadHrEmpUserDTO dto) throws Exception {
-		List<SapUser> users = sapUserService.selectLeaveAndEntryList(dto.getDate());
-		for (SapUser user : users) {
-			if (StringUtils.isNotBlank(user.getEndDate())) {
-				sapUserService.uploadMasHrEmpUserInfo(user, UploadHrEmpUserEnum.LEAVE.getCode());
-			} else {
-				sapUserService.uploadMasHrEmpUserInfo(user, UploadHrEmpUserEnum.ENTRY.getCode());
-			}
-		}
-		return AppUtil.success();
-	}
-	
 	@PostMapping(value = "/uploadDevEmpUserDetailInfoAnon", produces = "application/json;charset=utf-8")
 	@ResponseBody
 	public Object uploadDevEmpUserDetailInfo(UploadHrEmpUserDTO dto) throws Exception {

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

@@ -1,28 +0,0 @@
-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 UploadModifyEmpDTO implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String cardId;
-	private Integer cardType;
-	private String entryDate;
-	private String jobNumber;
-	private String phone;
-	private String resignDate;
-	private Integer type;
-	private String username;
-}

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

@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class UploadUpdateEmpDTO implements Serializable {
 	private static final long serialVersionUID = 1L;
-
+	
 	private String accountBank;
 	private String accountBankName;
 	private String cardId;
@@ -32,6 +32,7 @@ public class UploadUpdateEmpDTO implements Serializable {
 	private Integer type;
 	private String username;
 	private String provinceName;
+	private String businessUnit;
 	private List<AddFamilyDTO> familyList;
 	
 	@Data

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

@@ -1,61 +1,61 @@
-package org.fouram.job;
-
-import java.util.List;
-
-import org.fouram.core.plugin.weixin.cp.util.WXCpMessageUtil;
-import org.fouram.core.util.LoggerUtil;
-import org.fouram.core.util.Tools;
-import org.fouram.entity.SapMessageUser;
-import org.fouram.entity.SapUser;
-import org.fouram.enums.UploadHrEmpUserEnum;
-import org.fouram.service.SapMessageUserService;
-import org.fouram.service.SapUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class MessageSchedule {
-
-	@Autowired
-	private SapUserService sapUserService;
-	@Autowired
-	private SapMessageUserService sapMessageUserService;
-
-	public void taskBiz() throws Exception {
-		try {
-			List<SapMessageUser> messageUsers = sapMessageUserService.selectList(null);
-			if (messageUsers.isEmpty()) {
-				return;
-			}
-			// 入职
-			List<SapUser> sapUsers = sapUserService.selectNotSendEntryMessageList();
-			StringBuffer messageContent = null;
-			for (SapUser sapUser : sapUsers) {
-				messageContent = new StringBuffer();
-				messageContent.append("有一个新员工入职，待同步企业微信").append("\n").append("员工姓名：").append(sapUser.getName())
-						.append("\n").append("手机号：").append(sapUser.getFormatMobile()).append("\n").append("邮箱：")
-						.append(sapUser.getRealEmail()).append("\n")
-						.append("<a href=\"https://studybom.suggest.vip/#/userSync/list\">立即同步</a>");
-				sapUserService.sendEntryMessage(messageContent.toString(), sapUser, messageUsers);
-				
-				sapUserService.uploadMasHrEmpUserInfo(sapUser, UploadHrEmpUserEnum.ENTRY.getCode());
-			}
-			// 离职
-			sapUsers = sapUserService.selectNotSendLeaveMessageList();
-			messageContent = null;
-			for (SapUser sapUser : sapUsers) {
-				messageContent = new StringBuffer();
-				messageContent.append("有一个新员工离职，待同步企业微信").append("\n").append("员工姓名：").append(sapUser.getName())
-						.append("\n").append("手机号：").append(sapUser.getFormatMobile()).append("\n").append("邮箱：")
-						.append(sapUser.getRealEmail()).append("\n")
-						.append("<a href=\"https://studybom.suggest.vip/#/userSync/list\">立即同步</a>");
-				sapUserService.sendLeaveMessage(messageContent.toString(), sapUser, messageUsers);
-				
-				sapUserService.uploadMasHrEmpUserInfo(sapUser, UploadHrEmpUserEnum.LEAVE.getCode());
-			}
-		} catch (Exception e) {
-			WXCpMessageUtil.sendAdminError(Tools.getExceptionAllInfo(e));
-			LoggerUtil.error(e);
-		}
-	}
-}
+package org.fouram.job;
+
+import java.util.List;
+
+import org.fouram.core.plugin.weixin.cp.util.WXCpMessageUtil;
+import org.fouram.core.util.LoggerUtil;
+import org.fouram.core.util.Tools;
+import org.fouram.entity.SapMessageUser;
+import org.fouram.entity.SapUser;
+import org.fouram.enums.UploadHrEmpUserEnum;
+import org.fouram.service.SapMessageUserService;
+import org.fouram.service.SapUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MessageSchedule {
+
+	@Autowired
+	private SapUserService sapUserService;
+	@Autowired
+	private SapMessageUserService sapMessageUserService;
+
+	public void taskBiz() throws Exception {
+		try {
+			List<SapMessageUser> messageUsers = sapMessageUserService.selectList(null);
+			if (messageUsers.isEmpty()) {
+				return;
+			}
+			// 入职
+			List<SapUser> sapUsers = sapUserService.selectNotSendEntryMessageList();
+			StringBuffer messageContent = null;
+			for (SapUser sapUser : sapUsers) {
+				messageContent = new StringBuffer();
+				messageContent.append("有一个新员工入职，待同步企业微信").append("\n").append("员工姓名：").append(sapUser.getName())
+						.append("\n").append("手机号：").append(sapUser.getFormatMobile()).append("\n").append("邮箱：")
+						.append(sapUser.getRealEmail()).append("\n")
+						.append("<a href=\"https://studybom.suggest.vip/#/userSync/list\">立即同步</a>");
+				sapUserService.sendEntryMessage(messageContent.toString(), sapUser, messageUsers);
+				
+				sapUserService.uploadMasEmpUserDetailInfo(sapUser, UploadHrEmpUserEnum.ENTRY.getCode());
+			}
+			// 离职
+			sapUsers = sapUserService.selectNotSendLeaveMessageList();
+			messageContent = null;
+			for (SapUser sapUser : sapUsers) {
+				messageContent = new StringBuffer();
+				messageContent.append("有一个新员工离职，待同步企业微信").append("\n").append("员工姓名：").append(sapUser.getName())
+						.append("\n").append("手机号：").append(sapUser.getFormatMobile()).append("\n").append("邮箱：")
+						.append(sapUser.getRealEmail()).append("\n")
+						.append("<a href=\"https://studybom.suggest.vip/#/userSync/list\">立即同步</a>");
+				sapUserService.sendLeaveMessage(messageContent.toString(), sapUser, messageUsers);
+				
+				sapUserService.uploadMasEmpUserDetailInfo(sapUser, UploadHrEmpUserEnum.LEAVE.getCode());
+			}
+		} catch (Exception e) {
+			WXCpMessageUtil.sendAdminError(Tools.getExceptionAllInfo(e));
+			LoggerUtil.error(e);
+		}
+	}
+}

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

@@ -21,7 +21,6 @@ import org.fouram.core.util.LoggerUtil;
 import org.fouram.core.util.Tools;
 import org.fouram.dto.input.GetIngoreListDTO;
 import org.fouram.dto.input.GetToBeConfirmedListDTO;
-import org.fouram.dto.input.UploadModifyEmpDTO;
 import org.fouram.dto.input.UploadUpdateEmpDTO;
 import org.fouram.dto.input.UploadUpdateEmpDTO.AddFamilyDTO;
 import org.fouram.dto.output.GetIngoreListOutput;
@@ -549,30 +548,6 @@ public class SapUserService extends BaseService {
 		return (List<SapUser>) findList("SapUserMapper.selectLeaveAndEntryList", date);
 	}
 
-	public void uploadDevHrEmpUserInfo(SapUser user, Integer type) throws Exception {
-		uploadHrEmpUserInfo(user, type, true);
-	}
-
-	public void uploadMasHrEmpUserInfo(SapUser user, Integer type) throws Exception {
-		uploadHrEmpUserInfo(user, type, false);
-
-	}
-
-	private 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 = "https://manage.inet.cmcinc.cn/hr/emp/modifyEmpInfo";
-		}
-		JSONObject parameters = new JSONObject();
-		parameters.put("reqdata", reqdata);
-		String result = HttpClientUtil.postJson(url, parameters.toJSONString());
-		LoggerUtil.info("uploadHrEmpUserInfo->result->" + result);
-	}
-
 	public void uploadDevEmpUserDetailInfo(SapUser user, Integer type) throws Exception {
 		uploadEmpUserDetailInfo(user, type, true);
 	}
@@ -590,10 +565,11 @@ public class SapUserService extends BaseService {
 					.relation(relationship.getRelationshipType()).build();
 			familyList.add(family);
 		}
-		UploadUpdateEmpDTO reqdata = UploadUpdateEmpDTO.builder().cardId(user.getCardId())
-				.cardType(CardTypeEnum.getEnumBySapCode(user.getCardType()).getMyCode()).email(user.getEmail())
-				.entryDate(user.getStartDate()).jobNumber(user.getJobNumber()).phone(user.getFormatMobile())
-				.resignDate(user.getEndDate()).type(type).username(user.getName()).familyList(familyList).build();
+		UploadUpdateEmpDTO reqdata = UploadUpdateEmpDTO.builder().businessUnit(user.getFirstOrgName())
+				.cardId(user.getCardId()).cardType(CardTypeEnum.getEnumBySapCode(user.getCardType()).getMyCode())
+				.email(user.getEmail()).entryDate(user.getStartDate()).jobNumber(user.getJobNumber())
+				.phone(user.getFormatMobile()).resignDate(user.getEndDate()).type(type).username(user.getName())
+				.familyList(familyList).build();
 
 		SapBank sapBank = sapBankService.selectOneByPersonId(user.getPersonId());
 		if (sapBank != null) {
@@ -613,9 +589,9 @@ public class SapUserService extends BaseService {
 			reqdata.setProvinceName(empJob.getLocationName());
 		}
 
-		String url = "http://cmcadmin.info666.com/hr/emp/updateEmpInfo";
+		String url = "http://cmcadmin.info666.com/hr/emp/modifyEmpInfo";
 		if (!devFlag) {
-			url = "https://manage.inet.cmcinc.cn/hr/emp/updateEmpInfo";
+			url = "https://manage.inet.cmcinc.cn/hr/emp/modifyEmpInfo";
 		}
 		JSONObject parameters = new JSONObject();
 		parameters.put("reqdata", reqdata);