liupeng 4 年之前
父节点
当前提交
3497d9908f

+ 49 - 0
code/sapparent/sapservice/src/main/java/org/fouram/dto/input/UploadUpdateEmpDTO.java

@@ -0,0 +1,49 @@
+package org.fouram.dto.input;
+
+import java.io.Serializable;
+import java.util.List;
+
+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 UploadUpdateEmpDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String accountBank;
+	private String accountBankName;
+	private String birthDate;
+	private String cardId;
+	private Integer cardType;
+	private String email;
+	private String entryDate;
+	private String jobNumber;
+	private String legalPerson;
+	private String phone;
+	private String resignDate;
+	private String socialArea;
+	private Integer type;
+	private String username;
+	private List<AddFamilyDTO> familyList;
+	
+	@Data
+	@Builder
+	@NoArgsConstructor
+	@AllArgsConstructor
+	@JsonIgnoreProperties(ignoreUnknown = true)
+	public static class AddFamilyDTO implements Serializable {
+		private static final long serialVersionUID = 1L;
+		
+		private String birthDate;
+		private String name;
+		private Integer relation;
+	}
+}

+ 7 - 6
code/sapparent/sapservice/src/main/java/org/fouram/service/SapUserService.java

@@ -22,6 +22,7 @@ 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.output.GetIngoreListOutput;
 import org.fouram.dto.output.GetToBeConfirmedListOutput;
 import org.fouram.entity.SapMessageUser;
@@ -565,13 +566,13 @@ public class SapUserService extends BaseService {
 	}
 
 	private void uploadEmpUserDetailInfo(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";
+		UploadUpdateEmpDTO reqdata = UploadUpdateEmpDTO.builder().username(user.getName())
+				.entryDate(user.getStartDate()).resignDate(user.getEndDate()).cardId(user.getCardId())
+				.cardType(CardTypeEnum.getEnumBySapCode(user.getCardType()).getMyCode()).jobNumber(user.getJobNumber())
+				.build();
+		String url = "http://cmcadmin.info666.com/hr/emp/updateEmpInfo";
 		if (!devFlag) {
-			url = "https://manage.inet.cmcinc.cn/hr/emp/modifyEmpInfo";
+			url = "https://manage.inet.cmcinc.cn/hr/emp/updateEmpInfo";
 		}
 		JSONObject parameters = new JSONObject();
 		parameters.put("reqdata", reqdata);