suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

招商经理

Browse Source
This commit is contained in:
苏竹红
2024-06-19 16:36:38 +08:00
parent b756112031
commit 62262a0a97
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml
View File

@@ -59,7 +59,7 @@
<where> <where>
o.deleted = 0 o.deleted = 0
<if test="userId != null and userId != ''"> <if test="userId != null and userId != ''">
and s.supervisor_user_id = #{userId} and s.investment_manager = #{userId}
</if> </if>
<if test="fightRegions != null"> <if test="fightRegions != null">
and l.region_id in and l.region_id in

4
coolstore-partner-model/src/main/java/com/cool/store/dto/ehr/StaffBaseInfoDTO.java
View File

@@ -27,7 +27,7 @@ public class StaffBaseInfoDTO {
private String departmentName; private String departmentName;
@ApiModelProperty("岗位Id") @ApiModelProperty("岗位Id")
private String jobId; private Long jobId;
@ApiModelProperty("岗位名称") @ApiModelProperty("岗位名称")
private String jobName; private String jobName;
@@ -48,7 +48,7 @@ public class StaffBaseInfoDTO {
private String emblemPhoto; private String emblemPhoto;
@ApiModelProperty("最高学历") @ApiModelProperty("最高学历")
private String highestDegree; private Integer highestDegree;
@ApiModelProperty("手机号（OA侧绑定的手机号）") @ApiModelProperty("手机号（OA侧绑定的手机号）")
private String phone; private String phone;

6
coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/XfsgTrainingPersonSyncListener.java
View File

@@ -104,8 +104,8 @@ public class XfsgTrainingPersonSyncListener implements MessageListener {
StaffBaseInfoDTO staffBaseInfoDTO = xfsgEhrService.getUserInfoByCode(request.getJobnumber()); StaffBaseInfoDTO staffBaseInfoDTO = xfsgEhrService.getUserInfoByCode(request.getJobnumber());
log.info("培训人员主数据信息：staffBaseInfoDTO:{}", JSONObject.toJSONString(staffBaseInfoDTO)); log.info("培训人员主数据信息：staffBaseInfoDTO:{}", JSONObject.toJSONString(staffBaseInfoDTO));
if(staffBaseInfoDTO != null){ if(staffBaseInfoDTO != null){
TempUserDetailDO tempUserDetailDO = fillTempUserDetailDO(shopInfoDO, staffBaseInfoDTO); // TempUserDetailDO tempUserDetailDO = fillTempUserDetailDO(shopInfoDO, staffBaseInfoDTO);
tempUserDetailDAO.insertSelective(tempUserDetailDO); // tempUserDetailDAO.insertSelective(tempUserDetailDO);
} }
}else if(checkTempUserDetailDO != null && }else if(checkTempUserDetailDO != null &&
(checkTempUserDetailDO.getShopId() == 0L || checkTempUserDetailDO.getShopId() != shopInfoDO.getId())){ (checkTempUserDetailDO.getShopId() == 0L || checkTempUserDetailDO.getShopId() != shopInfoDO.getId())){
@@ -134,7 +134,7 @@ public class XfsgTrainingPersonSyncListener implements MessageListener {
} }
tempUserDetailDO.setIdCard(staffBaseInfoDTO.getIdCard()); tempUserDetailDO.setIdCard(staffBaseInfoDTO.getIdCard());
tempUserDetailDO.setStatus(1); tempUserDetailDO.setStatus(1);
tempUserDetailDO.setEducational(fillEducational(staffBaseInfoDTO.getHighestDegree())); // tempUserDetailDO.setEducational(fillEducational(staffBaseInfoDTO.getHighestDegree()));
tempUserDetailDO.setRoleId(fillRoleId(staffBaseInfoDTO.getJobName())); tempUserDetailDO.setRoleId(fillRoleId(staffBaseInfoDTO.getJobName()));
tempUserDetailDO.setIdCardNegativeUrl(staffBaseInfoDTO.getEmblemPhoto()); tempUserDetailDO.setIdCardNegativeUrl(staffBaseInfoDTO.getEmblemPhoto());
tempUserDetailDO.setIdCardPositiveUrl(staffBaseInfoDTO.getIdNumPhoto()); tempUserDetailDO.setIdCardPositiveUrl(staffBaseInfoDTO.getIdNumPhoto());

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

@@ -182,8 +182,8 @@ public class TempUserDetailServiceImpl implements TempUserDetailService {
userInfoByCode.setStatus(tempUserDetailDO.getStatus()); userInfoByCode.setStatus(tempUserDetailDO.getStatus());
userInfoByCode.setIdNumPhoto(tempUserDetailDO.getIdCardPositiveUrl()); userInfoByCode.setIdNumPhoto(tempUserDetailDO.getIdCardPositiveUrl());
userInfoByCode.setEmblemPhoto(tempUserDetailDO.getIdCardNegativeUrl()); userInfoByCode.setEmblemPhoto(tempUserDetailDO.getIdCardNegativeUrl());
userInfoByCode.setHighestDegree(String.valueOf(tempUserDetailDO.getEducational())); userInfoByCode.setHighestDegree(tempUserDetailDO.getEducational());
userInfoByCode.setJobId(String.valueOf(tempUserDetailDO.getRoleId())); userInfoByCode.setJobId(tempUserDetailDO.getRoleId());
userInfoByCode.setEntryDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,tempUserDetailDO.getSubmitTime())); userInfoByCode.setEntryDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,tempUserDetailDO.getSubmitTime()));
userInfoByCode.setHealthCertificate(tempUserDetailDO.getHealthCertificateUrl()); userInfoByCode.setHealthCertificate(tempUserDetailDO.getHealthCertificateUrl());
return userInfoByCode; return userInfoByCode;