fix

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

@@ -1,78 +1,92 @@
-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.dto.input.UploadHrEmpUserDTO;
-import org.fouram.entity.SapUser;
-import org.fouram.enums.UploadHrEmpUserEnum;
-import org.fouram.service.SapUserService;
-import org.fouram.service.SyncUploadService;
-import org.fouram.service.TestService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@Controller
-@RequestMapping(value = "/test")
-public class TestController extends BaseController {
-
-	@Autowired
-	private TestService testService;
-	@Autowired
-	private SapUserService sapUserService;
-	@Autowired
-	private SyncUploadService syncUploadService;
-
-	/**
-	 * http://localhost:8080/sapcms/test/saveTestAnon
-	 * 
-	 * @return
-	 * @throws Exception
-	 */
-	@PostMapping(value = "/saveTestAnon", produces = "application/json;charset=utf-8")
-	@ResponseBody
-	public Object saveTestAnon() throws Exception {
-		testService.saveTest();
-		return AppUtil.success();
-	}
-	
-	@PostMapping(value = "/syncUploadAnon", produces = "application/json;charset=utf-8")
-	@ResponseBody
-	public Object syncUploadAnon() throws Exception {
-		syncUploadService.sync();
-		return AppUtil.success();
-	}
-
-	@PostMapping(value = "/uploadDevHrEmpUserInfoAnon", produces = "application/json;charset=utf-8")
-	@ResponseBody
-	public Object uploadDevHrEmpUserInfoAnon(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 uploadMasHrEmpUserInfoAnon(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();
-	}
+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.dto.input.UploadHrEmpUserDTO;
+import org.fouram.entity.SapUser;
+import org.fouram.enums.UploadHrEmpUserEnum;
+import org.fouram.service.SapUserService;
+import org.fouram.service.SyncUploadService;
+import org.fouram.service.TestService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping(value = "/test")
+public class TestController extends BaseController {
+
+	@Autowired
+	private TestService testService;
+	@Autowired
+	private SapUserService sapUserService;
+	@Autowired
+	private SyncUploadService syncUploadService;
+
+	/**
+	 * http://localhost:8080/sapcms/test/saveTestAnon
+	 * 
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping(value = "/saveTestAnon", produces = "application/json;charset=utf-8")
+	@ResponseBody
+	public Object saveTestAnon() throws Exception {
+		testService.saveTest();
+		return AppUtil.success();
+	}
+	
+	@PostMapping(value = "/syncUploadAnon", produces = "application/json;charset=utf-8")
+	@ResponseBody
+	public Object syncUploadAnon() throws Exception {
+		syncUploadService.sync();
+		return AppUtil.success();
+	}
+
+	@PostMapping(value = "/uploadDevHrEmpUserInfoAnon", produces = "application/json;charset=utf-8")
+	@ResponseBody
+	public Object uploadDevHrEmpUserInfoAnon(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 uploadMasHrEmpUserInfoAnon(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 uploadDevEmpUserDetailInfoAnon(UploadHrEmpUserDTO dto) throws Exception {
+		List<SapUser> users = sapUserService.selectLeaveAndEntryList(dto.getDate());
+		for (SapUser user : users) {
+			if (StringUtils.isNotBlank(user.getEndDate())) {
+				sapUserService.uploadDevEmpUserDetailInfo(user, UploadHrEmpUserEnum.LEAVE.getCode());
+			} else {
+				sapUserService.uploadDevEmpUserDetailInfo(user, UploadHrEmpUserEnum.ENTRY.getCode());
+			}
+		}
+		return AppUtil.success();
+	}
 }

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

@@ -181,7 +181,7 @@ public class SapUserService extends BaseService {
 			// 更新sapPosition、wxPosition、sapFullDepart、wxFullDepart
 			updateFullDepartAndPosition(sapUser);
 			// 更新有离职时间的数据更新为无效
-			if(StringUtils.isNotBlank(sapUser.getEndDate())) {
+			if (StringUtils.isNotBlank(sapUser.getEndDate())) {
 				updateDelFlag(sapUser.getUserId(), DelFlagEnum.UNABLE);
 			}
 		}
@@ -555,4 +555,27 @@ public class SapUserService extends BaseService {
 		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);
+	}
+
+	public void uploadMasEmpUserDetailInfo(SapUser user, Integer type) throws Exception {
+		uploadEmpUserDetailInfo(user, type, false);
+	}
+
+	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";
+		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);
+	}
 }