身份证号查询信息

coolstore-partner-service/src/main/java/com/cool/store/service/TempUserDetailService.java

@@ -1,5 +1,6 @@
 package com.cool.store.service;
 
+import com.cool.store.dto.ehr.StaffBaseInfoDTO;
 import com.cool.store.request.TempUserDetailRequest;
 import com.cool.store.vo.TempUserDetailInfoVO;
 import com.cool.store.vo.TempUserDetailListVO;
@@ -19,4 +20,6 @@ public interface TempUserDetailService {
 
 
     TempUserDetailInfoVO getUserInfoByIdUserDetailId(Long id);
+
+    StaffBaseInfoDTO getUserInfoByIdCard(String idCard);
 }

coolstore-partner-service/src/main/java/com/cool/store/service/XfsgEhrService.java

@@ -21,8 +21,6 @@ public interface XfsgEhrService {
      */
     FranchiseeInfoDTO getFranchiseeInfoByFrId(String frId);
 
-    StaffBaseInfoDTO getUserInfoByIdCard(String idCard);
-
 
 
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java

@@ -3,23 +3,28 @@ package com.cool.store.service.impl;
 import com.cool.store.dao.EnterpriseUserDAO;
 import com.cool.store.dao.ShopInfoDAO;
 import com.cool.store.dao.TempUserDetailDAO;
+import com.cool.store.dto.ehr.StaffBaseInfoDTO;
 import com.cool.store.entity.EnterpriseUserDO;
 import com.cool.store.entity.ShopInfoDO;
 import com.cool.store.entity.TempUserDetailDO;
+import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.request.TempUserDetailRequest;
 import com.cool.store.service.TempUserDetailService;
+import com.cool.store.service.XfsgEhrService;
 import com.cool.store.utils.StringUtil;
 import com.cool.store.vo.TempUserDetailInfoVO;
 import com.cool.store.vo.TempUserDetailListVO;
 import com.cool.store.vo.TempUserDetailVO;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author byd
@@ -37,6 +42,9 @@ public class TempUserDetailServiceImpl implements TempUserDetailService {
     @Resource
     private EnterpriseUserDAO enterpriseUserDAO;
 
+    @Autowired
+    private XfsgEhrService xfsgEhrService;
+
     @Override
     public TempUserDetailListVO userList(Long shopId) {
         List<TempUserDetailDO> tempUserDetailDOList = tempUserDetailDAO.userList(shopId);
@@ -128,4 +136,19 @@ public class TempUserDetailServiceImpl implements TempUserDetailService {
         return tempUserDetailInfoVO;
     }
 
+    @Override
+    public StaffBaseInfoDTO getUserInfoByIdCard(String idCard) {
+        if (StringUtil.isBlank(idCard)) {
+            throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
+        }
+        EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoByThirdOaUniqueFlag(idCard);
+        if(Objects.isNull(enterpriseUserDO)){
+            throw new ServiceException(ErrorCodeEnum.USER_NOT_EXIST);
+        }
+        if (StringUtil.isBlank(enterpriseUserDO.getJobnumber())) {
+            throw new ServiceException(ErrorCodeEnum.JOBNUMBER_NOT_EXIST);
+        }
+        return xfsgEhrService.getUserInfoByCode(enterpriseUserDO.getJobnumber());
+    }
+
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/XfsgEhrServiceImpl.java

@@ -83,21 +83,6 @@ public class XfsgEhrServiceImpl implements XfsgEhrService {
         return franchiseeInfoDTO;
     }
 
-    @Override
-    public StaffBaseInfoDTO getUserInfoByIdCard(String idCard) {
-        if (StringUtil.isBlank(idCard)) {
-            throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
-        }
-        EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoByThirdOaUniqueFlag(idCard);
-        if(Objects.isNull(enterpriseUserDO)){
-            throw new ServiceException(ErrorCodeEnum.USER_NOT_EXIST);
-        }
-        if (StringUtil.isBlank(enterpriseUserDO.getJobnumber())) {
-            throw new ServiceException(ErrorCodeEnum.JOBNUMBER_NOT_EXIST);
-        }
-        return this.getUserInfoByCode(enterpriseUserDO.getJobnumber());
-    }
-
     private void fillSignatureInfo(Map<String, Object> requestMap) {
         long timestamp = System.currentTimeMillis();
         String signature = SecureUtil.getSignature(timestamp);

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TempUserDetailController.java

@@ -28,9 +28,6 @@ public class TempUserDetailController {
     @Autowired
     private TempUserDetailService tempUserDetailService;
 
-    @Autowired
-    private XfsgEhrService xfsgEhrService;
-
     @GetMapping(path = "/getUserList")
     @ApiOperation("登记员工列表")
     @ApiImplicitParams({
@@ -46,7 +43,7 @@ public class TempUserDetailController {
     })
     @ApiOperation("培训登记-身份证号查询信息")
     public ResponseResult<StaffBaseInfoDTO> getUserInfoByIdCard(@RequestParam(value = "idCard") String idCard) {
-        return ResponseResult.success(xfsgEhrService.getUserInfoByIdCard((idCard)));
+        return ResponseResult.success(tempUserDetailService.getUserInfoByIdCard((idCard)));
     }
 
     @PostMapping(path = "/addTempUserDetail")

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TrainingRegistController.java

@@ -32,12 +32,6 @@ public class TrainingRegistController {
         return ResponseResult.success(xfsgEhrService.getUserInfoByCode(staffNumber));
     }
 
-    @ApiOperation("根据身份证号获取人员主数据")
-    @GetMapping("/getUserInfoByIdCard")
-    public ResponseResult<StaffBaseInfoDTO> getUserInfoByIdCard(@RequestParam("idCard") String idCard) {
-        return ResponseResult.success(xfsgEhrService.getUserInfoByIdCard(idCard));
-    }
-
     @ApiOperation("根据加盟商编码查询加盟商信息")
     @GetMapping("/getFranchiseeInfoByFrId")
     public ResponseResult<FranchiseeInfoDTO> getFranchiseeInfoByFrId(@RequestParam("frId") String frId) {