diff --git a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml index 162cc1bc4..7811bf59a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml @@ -59,7 +59,7 @@ o.deleted = 0 - and s.supervisor_user_id = #{userId} + and s.investment_manager = #{userId} and l.region_id in diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ehr/StaffBaseInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ehr/StaffBaseInfoDTO.java index 9ec34bd84..84b2e1fe8 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ehr/StaffBaseInfoDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ehr/StaffBaseInfoDTO.java @@ -27,7 +27,7 @@ public class StaffBaseInfoDTO { private String departmentName; @ApiModelProperty("岗位Id") - private String jobId; + private Long jobId; @ApiModelProperty("岗位名称") private String jobName; @@ -48,7 +48,7 @@ public class StaffBaseInfoDTO { private String emblemPhoto; @ApiModelProperty("最高学历") - private String highestDegree; + private Integer highestDegree; @ApiModelProperty("手机号(OA侧绑定的手机号)") private String phone; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/XfsgTrainingPersonSyncListener.java b/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/XfsgTrainingPersonSyncListener.java index d7bd611fa..6f8e2025b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/XfsgTrainingPersonSyncListener.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/XfsgTrainingPersonSyncListener.java @@ -104,8 +104,8 @@ public class XfsgTrainingPersonSyncListener implements MessageListener { StaffBaseInfoDTO staffBaseInfoDTO = xfsgEhrService.getUserInfoByCode(request.getJobnumber()); log.info("培训人员主数据信息:staffBaseInfoDTO:{}", JSONObject.toJSONString(staffBaseInfoDTO)); if(staffBaseInfoDTO != null){ - TempUserDetailDO tempUserDetailDO = fillTempUserDetailDO(shopInfoDO, staffBaseInfoDTO); - tempUserDetailDAO.insertSelective(tempUserDetailDO); +// TempUserDetailDO tempUserDetailDO = fillTempUserDetailDO(shopInfoDO, staffBaseInfoDTO); +// tempUserDetailDAO.insertSelective(tempUserDetailDO); } }else if(checkTempUserDetailDO != null && (checkTempUserDetailDO.getShopId() == 0L || checkTempUserDetailDO.getShopId() != shopInfoDO.getId())){ @@ -134,7 +134,7 @@ public class XfsgTrainingPersonSyncListener implements MessageListener { } tempUserDetailDO.setIdCard(staffBaseInfoDTO.getIdCard()); tempUserDetailDO.setStatus(1); - tempUserDetailDO.setEducational(fillEducational(staffBaseInfoDTO.getHighestDegree())); +// tempUserDetailDO.setEducational(fillEducational(staffBaseInfoDTO.getHighestDegree())); tempUserDetailDO.setRoleId(fillRoleId(staffBaseInfoDTO.getJobName())); tempUserDetailDO.setIdCardNegativeUrl(staffBaseInfoDTO.getEmblemPhoto()); tempUserDetailDO.setIdCardPositiveUrl(staffBaseInfoDTO.getIdNumPhoto()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java index f68d62f0e..361b0f57c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java @@ -182,8 +182,8 @@ public class TempUserDetailServiceImpl implements TempUserDetailService { userInfoByCode.setStatus(tempUserDetailDO.getStatus()); userInfoByCode.setIdNumPhoto(tempUserDetailDO.getIdCardPositiveUrl()); userInfoByCode.setEmblemPhoto(tempUserDetailDO.getIdCardNegativeUrl()); - userInfoByCode.setHighestDegree(String.valueOf(tempUserDetailDO.getEducational())); - userInfoByCode.setJobId(String.valueOf(tempUserDetailDO.getRoleId())); + userInfoByCode.setHighestDegree(tempUserDetailDO.getEducational()); + userInfoByCode.setJobId(tempUserDetailDO.getRoleId()); userInfoByCode.setEntryDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,tempUserDetailDO.getSubmitTime())); userInfoByCode.setHealthCertificate(tempUserDetailDO.getHealthCertificateUrl()); return userInfoByCode;