diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/TempUserDetailDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/TempUserDetailDAO.java index d06041c37..c72270b26 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/TempUserDetailDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/TempUserDetailDAO.java @@ -1,9 +1,11 @@ package com.cool.store.dao; +import com.cool.store.entity.TempUserDetailDO; import com.cool.store.mapper.TempUserDetailMapper; import org.springframework.stereotype.Repository; import javax.annotation.Resource; +import java.util.List; /** * @author byd @@ -14,4 +16,20 @@ public class TempUserDetailDAO { @Resource private TempUserDetailMapper tempUserDetailMapper; + + public List userList(Long shopId) { + return tempUserDetailMapper.select(TempUserDetailDO.builder().deleted(false).shopId(shopId).build()); + } + + public TempUserDetailDO selectByIdCard(String idCard) { + return tempUserDetailMapper.selectOne(TempUserDetailDO.builder().deleted(false).idCard(idCard).build()); + } + + public int insertSelective(TempUserDetailDO detailDO) { + return tempUserDetailMapper.insertSelective(detailDO); + } + + public TempUserDetailDO selectById(Long id) { + return tempUserDetailMapper.selectOne(TempUserDetailDO.builder().id(id).build()); + } } diff --git a/coolstore-partner-dao/src/main/resources/mapper/TempUserDetailMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/TempUserDetailMapper.xml index 13c4a157c..55cff28c6 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/TempUserDetailMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/TempUserDetailMapper.xml @@ -14,6 +14,7 @@ + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/EmployeeTrainingDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/EmployeeTrainingDO.java index 72a3150db..d89c04402 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/EmployeeTrainingDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/EmployeeTrainingDO.java @@ -1,8 +1,16 @@ package com.cool.store.entity; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + import java.util.Date; import javax.persistence.*; - +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor @Table(name = "xfsg_employee_training") public class EmployeeTrainingDO { @Id @@ -133,396 +141,4 @@ public class EmployeeTrainingDO { * 是否删除：0.否 1.是 */ private Boolean deleted; - - /** - * @return id - */ - public Long getId() { - return id; - } - - /** - * @param id - */ - public void setId(Long id) { - this.id = id; - } - - /** - * 获取shop_info.id - * - * @return shop_id - shop_info.id - */ - public Long getShopId() { - return shopId; - } - - /** - * 设置shop_info.id - * - * @param shopId shop_info.id - */ - public void setShopId(Long shopId) { - this.shopId = shopId; - } - - /** - * 获取区域ID - * - * @return region_id - 区域ID - */ - public Long getRegionId() { - return regionId; - } - - /** - * 设置区域ID - * - * @param regionId 区域ID - */ - public void setRegionId(Long regionId) { - this.regionId = regionId; - } - - /** - * 获取xfsg_temp_user_detail.id - * - * @return xfsg_user_detail_id - xfsg_temp_user_detail.id - */ - public Long getXfsgUserDetailId() { - return xfsgUserDetailId; - } - - /** - * 设置xfsg_temp_user_detail.id - * - * @param xfsgUserDetailId xfsg_temp_user_detail.id - */ - public void setXfsgUserDetailId(Long xfsgUserDetailId) { - this.xfsgUserDetailId = xfsgUserDetailId; - } - - /** - * 获取是否分配 0-待分配 1-已分配 - * - * @return assign_flag - 是否分配 0-待分配 1-已分配 - */ - public Byte getAssignFlag() { - return assignFlag; - } - - /** - * 设置是否分配 0-待分配 1-已分配 - * - * @param assignFlag 是否分配 0-待分配 1-已分配 - */ - public void setAssignFlag(Byte assignFlag) { - this.assignFlag = assignFlag; - } - - /** - * 获取实训开始时间 - * - * @return training_start_time - 实训开始时间 - */ - public Date getTrainingStartTime() { - return trainingStartTime; - } - - /** - * 设置实训开始时间 - * - * @param trainingStartTime 实训开始时间 - */ - public void setTrainingStartTime(Date trainingStartTime) { - this.trainingStartTime = trainingStartTime; - } - - /** - * 获取实训结束时间 - * - * @return training_end_time - 实训结束时间 - */ - public Date getTrainingEndTime() { - return trainingEndTime; - } - - /** - * 设置实训结束时间 - * - * @param trainingEndTime 实训结束时间 - */ - public void setTrainingEndTime(Date trainingEndTime) { - this.trainingEndTime = trainingEndTime; - } - - /** - * 获取实训门店ID - * - * @return training_store_id - 实训门店ID - */ - public String getTrainingStoreId() { - return trainingStoreId; - } - - /** - * 设置实训门店ID - * - * @param trainingStoreId 实训门店ID - */ - public void setTrainingStoreId(String trainingStoreId) { - this.trainingStoreId = trainingStoreId; - } - - /** - * 获取带教老师ID - * - * @return training_teacher_user_id - 带教老师ID - */ - public String getTrainingTeacherUserId() { - return trainingTeacherUserId; - } - - /** - * 设置带教老师ID - * - * @param trainingTeacherUserId 带教老师ID - */ - public void setTrainingTeacherUserId(String trainingTeacherUserId) { - this.trainingTeacherUserId = trainingTeacherUserId; - } - - /** - * 获取实操考核人员ID - * - * @return practical_assessment_user_id - 实操考核人员ID - */ - public String getPracticalAssessmentUserId() { - return practicalAssessmentUserId; - } - - /** - * 设置实操考核人员ID - * - * @param practicalAssessmentUserId 实操考核人员ID - */ - public void setPracticalAssessmentUserId(String practicalAssessmentUserId) { - this.practicalAssessmentUserId = practicalAssessmentUserId; - } - - /** - * 获取预计考核时间 - * - * @return estimated_assessment_time - 预计考核时间 - */ - public Date getEstimatedAssessmentTime() { - return estimatedAssessmentTime; - } - - /** - * 设置预计考核时间 - * - * @param estimatedAssessmentTime 预计考核时间 - */ - public void setEstimatedAssessmentTime(Date estimatedAssessmentTime) { - this.estimatedAssessmentTime = estimatedAssessmentTime; - } - - /** - * 获取实际考核时间 - * - * @return actual_assessment_time - 实际考核时间 - */ - public Date getActualAssessmentTime() { - return actualAssessmentTime; - } - - /** - * 设置实际考核时间 - * - * @param actualAssessmentTime 实际考核时间 - */ - public void setActualAssessmentTime(Date actualAssessmentTime) { - this.actualAssessmentTime = actualAssessmentTime; - } - - /** - * 获取考核项数 - * - * @return assessment_num - 考核项数 - */ - public Integer getAssessmentNum() { - return assessmentNum; - } - - /** - * 设置考核项数 - * - * @param assessmentNum 考核项数 - */ - public void setAssessmentNum(Integer assessmentNum) { - this.assessmentNum = assessmentNum; - } - - /** - * 获取考核总项数 - * - * @return assessment_total_num - 考核总项数 - */ - public Integer getAssessmentTotalNum() { - return assessmentTotalNum; - } - - /** - * 设置考核总项数 - * - * @param assessmentTotalNum 考核总项数 - */ - public void setAssessmentTotalNum(Integer assessmentTotalNum) { - this.assessmentTotalNum = assessmentTotalNum; - } - - /** - * 获取理论考试状态 0-未开始 1-合格 2-不合格 - * - * @return theoretical_exam_status - 理论考试状态 0-未开始 1-合格 2-不合格 - */ - public Byte getTheoreticalExamStatus() { - return theoreticalExamStatus; - } - - /** - * 设置理论考试状态 0-未开始 1-合格 2-不合格 - * - * @param theoreticalExamStatus 理论考试状态 0-未开始 1-合格 2-不合格 - */ - public void setTheoreticalExamStatus(Byte theoreticalExamStatus) { - this.theoreticalExamStatus = theoreticalExamStatus; - } - - /** - * 获取理论考试分值 - * - * @return theoretical_exam_score - 理论考试分值 - */ - public Integer getTheoreticalExamScore() { - return theoreticalExamScore; - } - - /** - * 设置理论考试分值 - * - * @param theoreticalExamScore 理论考试分值 - */ - public void setTheoreticalExamScore(Integer theoreticalExamScore) { - this.theoreticalExamScore = theoreticalExamScore; - } - - /** - * 获取实操考试状态 0-未开始 1-合格 2-不合格 - * - * @return practical_exam_status - 实操考试状态 0-未开始 1-合格 2-不合格 - */ - public Byte getPracticalExamStatus() { - return practicalExamStatus; - } - - /** - * 设置实操考试状态 0-未开始 1-合格 2-不合格 - * - * @param practicalExamStatus 实操考试状态 0-未开始 1-合格 2-不合格 - */ - public void setPracticalExamStatus(Byte practicalExamStatus) { - this.practicalExamStatus = practicalExamStatus; - } - - /** - * 获取实操考试分值 - * - * @return practical_exam_score - 实操考试分值 - */ - public Integer getPracticalExamScore() { - return practicalExamScore; - } - - /** - * 设置实操考试分值 - * - * @param practicalExamScore 实操考试分值 - */ - public void setPracticalExamScore(Integer practicalExamScore) { - this.practicalExamScore = practicalExamScore; - } - - /** - * 获取考核状态 0-培训中 1-带考核 2-考核通过 3-考核不通过 - * - * @return assessment_status - 考核状态 0-培训中 1-带考核 2-考核通过 3-考核不通过 - */ - public Byte getAssessmentStatus() { - return assessmentStatus; - } - - /** - * 设置考核状态 0-培训中 1-带考核 2-考核通过 3-考核不通过 - * - * @param assessmentStatus 考核状态 0-培训中 1-带考核 2-考核通过 3-考核不通过 - */ - public void setAssessmentStatus(Byte assessmentStatus) { - this.assessmentStatus = assessmentStatus; - } - - /** - * 获取创建时间 - * - * @return create_time - 创建时间 - */ - public Date getCreateTime() { - return createTime; - } - - /** - * 设置创建时间 - * - * @param createTime 创建时间 - */ - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - /** - * 获取更新时间 - * - * @return update_time - 更新时间 - */ - public Date getUpdateTime() { - return updateTime; - } - - /** - * 设置更新时间 - * - * @param updateTime 更新时间 - */ - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - /** - * 获取是否删除：0.否 1.是 - * - * @return deleted - 是否删除：0.否 1.是 - */ - public Boolean getDeleted() { - return deleted; - } - - /** - * 设置是否删除：0.否 1.是 - * - * @param deleted 是否删除：0.否 1.是 - */ - public void setDeleted(Boolean deleted) { - this.deleted = deleted; - } } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/TempUserDetailDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/TempUserDetailDO.java index 6458f1a66..82ed44ddc 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/TempUserDetailDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/TempUserDetailDO.java @@ -1,8 +1,17 @@ package com.cool.store.entity; +import io.swagger.models.auth.In; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + import java.util.Date; import javax.persistence.*; - +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor @Table(name = "xfsg_temp_user_detail") public class TempUserDetailDO { @Id @@ -47,6 +56,8 @@ public class TempUserDetailDO { */ private Integer age; + private Integer status; + /** * 身份证号码 */ @@ -56,7 +67,7 @@ public class TempUserDetailDO { /** * 学历 0-小学 1-初中 2-高中 3-中专 4-大专 5-本科 6-硕士 7-硕士以上 */ - private Byte educational; + private Integer educational; /** * 角色id 170000000-店长 180000000-店员 @@ -115,360 +126,4 @@ public class TempUserDetailDO { * 是否删除：0.否 1.是 */ private Boolean deleted; - - /** - * @return id - */ - public Long getId() { - return id; - } - - /** - * @param id - */ - public void setId(Long id) { - this.id = id; - } - - /** - * 获取line_info.id - * - * @return line_id - line_info.id - */ - public Long getLineId() { - return lineId; - } - - /** - * 设置line_info.id - * - * @param lineId line_info.id - */ - public void setLineId(Long lineId) { - this.lineId = lineId; - } - - /** - * 获取shop_info.id - * - * @return shop_id - shop_info.id - */ - public Long getShopId() { - return shopId; - } - - /** - * 设置shop_info.id - * - * @param shopId shop_info.id - */ - public void setShopId(Long shopId) { - this.shopId = shopId; - } - - /** - * 获取区域ID - * - * @return region_id - 区域ID - */ - public Long getRegionId() { - return regionId; - } - - /** - * 设置区域ID - * - * @param regionId 区域ID - */ - public void setRegionId(Long regionId) { - this.regionId = regionId; - } - - /** - * 获取手机号 - * - * @return mobile - 手机号 - */ - public String getMobile() { - return mobile; - } - - /** - * 设置手机号 - * - * @param mobile 手机号 - */ - public void setMobile(String mobile) { - this.mobile = mobile; - } - - /** - * 获取申请人姓名 - * - * @return username - 申请人姓名 - */ - public String getUsername() { - return username; - } - - /** - * 设置申请人姓名 - * - * @param username 申请人姓名 - */ - public void setUsername(String username) { - this.username = username; - } - - /** - * 获取性别0未选,1男,2女 - * - * @return sex - 性别0未选,1男,2女 - */ - public String getSex() { - return sex; - } - - /** - * 设置性别0未选,1男,2女 - * - * @param sex 性别0未选,1男,2女 - */ - public void setSex(String sex) { - this.sex = sex; - } - - /** - * 获取年龄 - * - * @return age - 年龄 - */ - public Integer getAge() { - return age; - } - - /** - * 设置年龄 - * - * @param age 年龄 - */ - public void setAge(Integer age) { - this.age = age; - } - - /** - * 获取身份证号码 - * - * @return id_card - 身份证号码 - */ - public String getIdCard() { - return idCard; - } - - /** - * 设置身份证号码 - * - * @param idCard 身份证号码 - */ - public void setIdCard(String idCard) { - this.idCard = idCard; - } - - /** - * 获取学历 0-小学 1-初中 2-高中 3-中专 4-大专 5-本科 6-硕士 7-硕士以上 - * - * @return educational - 学历 0-小学 1-初中 2-高中 3-中专 4-大专 5-本科 6-硕士 7-硕士以上 - */ - public Byte getEducational() { - return educational; - } - - /** - * 设置学历 0-小学 1-初中 2-高中 3-中专 4-大专 5-本科 6-硕士 7-硕士以上 - * - * @param educational 学历 0-小学 1-初中 2-高中 3-中专 4-大专 5-本科 6-硕士 7-硕士以上 - */ - public void setEducational(Byte educational) { - this.educational = educational; - } - - /** - * 获取角色id 170000000-店长 180000000-店员 - * - * @return role_id - 角色id 170000000-店长 180000000-店员 - */ - public Long getRoleId() { - return roleId; - } - - /** - * 设置角色id 170000000-店长 180000000-店员 - * - * @param roleId 角色id 170000000-店长 180000000-店员 - */ - public void setRoleId(Long roleId) { - this.roleId = roleId; - } - - /** - * 获取身份证正面url - * - * @return id_card_positive_url - 身份证正面url - */ - public String getIdCardPositiveUrl() { - return idCardPositiveUrl; - } - - /** - * 设置身份证正面url - * - * @param idCardPositiveUrl 身份证正面url - */ - public void setIdCardPositiveUrl(String idCardPositiveUrl) { - this.idCardPositiveUrl = idCardPositiveUrl; - } - - /** - * 获取身份证反面url - * - * @return id_card_negative_url - 身份证反面url - */ - public String getIdCardNegativeUrl() { - return idCardNegativeUrl; - } - - /** - * 设置身份证反面url - * - * @param idCardNegativeUrl 身份证反面url - */ - public void setIdCardNegativeUrl(String idCardNegativeUrl) { - this.idCardNegativeUrl = idCardNegativeUrl; - } - - /** - * 获取健康证url - * - * @return health_certificate_url - 健康证url - */ - public String getHealthCertificateUrl() { - return healthCertificateUrl; - } - - /** - * 设置健康证url - * - * @param healthCertificateUrl 健康证url - */ - public void setHealthCertificateUrl(String healthCertificateUrl) { - this.healthCertificateUrl = healthCertificateUrl; - } - - /** - * 获取登记时间 - * - * @return register_time - 登记时间 - */ - public Date getRegisterTime() { - return registerTime; - } - - /** - * 设置登记时间 - * - * @param registerTime 登记时间 - */ - public void setRegisterTime(Date registerTime) { - this.registerTime = registerTime; - } - - /** - * 获取来源：create-创建 sync-钉钉同步 - * - * @return source - 来源：create-创建 sync-钉钉同步 - */ - public String getSource() { - return source; - } - - /** - * 设置来源：create-创建 sync-钉钉同步 - * - * @param source 来源：create-创建 sync-钉钉同步 - */ - public void setSource(String source) { - this.source = source; - } - - /** - * 获取提交时间 - * - * @return submit_time - 提交时间 - */ - public Date getSubmitTime() { - return submitTime; - } - - /** - * 设置提交时间 - * - * @param submitTime 提交时间 - */ - public void setSubmitTime(Date submitTime) { - this.submitTime = submitTime; - } - - /** - * 获取创建时间 - * - * @return create_time - 创建时间 - */ - public Date getCreateTime() { - return createTime; - } - - /** - * 设置创建时间 - * - * @param createTime 创建时间 - */ - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - /** - * 获取更新时间 - * - * @return update_time - 更新时间 - */ - public Date getUpdateTime() { - return updateTime; - } - - /** - * 设置更新时间 - * - * @param updateTime 更新时间 - */ - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - /** - * 获取是否删除：0.否 1.是 - * - * @return deleted - 是否删除：0.否 1.是 - */ - public Boolean getDeleted() { - return deleted; - } - - /** - * 设置是否删除：0.否 1.是 - * - * @param deleted 是否删除：0.否 1.是 - */ - public void setDeleted(Boolean deleted) { - this.deleted = deleted; - } } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/TempUserDetailRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/TempUserDetailRequest.java new file mode 100644 index 000000000..603a9d3d8 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/TempUserDetailRequest.java @@ -0,0 +1,57 @@ +package com.cool.store.request; + +import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.In; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * 员工详细信息数据接口 + * + * @author byd + */ +@NoArgsConstructor +@Data +public class TempUserDetailRequest { + + @ApiModelProperty("店铺id") + private Long shopId; + + @ApiModelProperty("姓名") + private String name; + + @ApiModelProperty("身份证") + private String idCard; + + @ApiModelProperty("性别 0未选,1男,2女") + private String sex; + + @ApiModelProperty("年龄") + private Integer age; + + @ApiModelProperty("学历 0-小学 1-初中 2-高中 3-中专 4-大专 5-本科 6-硕士 7-硕士以上") + private Integer highestDegree; + + @ApiModelProperty("手机号（OA侧绑定的手机号）") + private String phone; + + + @ApiModelProperty("岗位Id") + private Long jobId; + + + @ApiModelProperty("身份证-人像面") + private String idNumPhoto; + + @ApiModelProperty("身份证-国徽面") + private String emblemPhoto; + + + @ApiModelProperty("健康证") + private String healthCertificate; + + @ApiModelProperty("登记时间") + private Date registerTime; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/TempUserDetailInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/TempUserDetailInfoVO.java new file mode 100644 index 000000000..b9329d7f5 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/TempUserDetailInfoVO.java @@ -0,0 +1,117 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import java.util.Date; + +/** + * @author byd + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class TempUserDetailInfoVO { + + @ApiModelProperty("id") + private Long id; + + /** + * line_info.id + */ + @ApiModelProperty("线索id") + private Long lineId; + + /** + * shop_info.id + */ + @ApiModelProperty("店铺id") + private Long shopId; + + /** + * 区域ID + */ + @ApiModelProperty("区域ID") + private Long regionId; + + /** + * 手机号 + */ + @ApiModelProperty("手机号") + private String mobile; + + /** + * 申请人姓名 + */ + @ApiModelProperty("姓名") + private String username; + + /** + * 性别0未选,1男,2女 + */ + @ApiModelProperty("性别0未选,1男,2女") + private String sex; + + /** + * 年龄 + */ + @ApiModelProperty("年龄") + private Integer age; + + @ApiModelProperty("0-待审核 1-已登记 2-审核未通过") + private Integer status; + + /** + * 身份证号码 + */ + @ApiModelProperty("身份证号码") + private String idCard; + + /** + * 学历 0-小学 1-初中 2-高中 3-中专 4-大专 5-本科 6-硕士 7-硕士以上 + */ + @ApiModelProperty("学历 0-小学 1-初中 2-高中 3-中专 4-大专 5-本科 6-硕士 7-硕士以上") + private Integer educational; + + /** + * 角色id 170000000-店长 180000000-店员 + */ + @ApiModelProperty("角色id 170000000-店长 180000000-店员") + private Long roleId; + + /** + * 身份证正面url + */ + @ApiModelProperty("身份证正面url") + private String idCardPositiveUrl; + + /** + * 身份证反面url + */ + @ApiModelProperty("身份证反面url") + private String idCardNegativeUrl; + + /** + * 健康证url + */ + @ApiModelProperty("健康证url") + private String healthCertificateUrl; + + /** + * 登记时间 + */ + @ApiModelProperty("登记时间") + private Date registerTime; + + /** + * 来源：create-创建 sync-钉钉同步 + */ + @ApiModelProperty("来源：create-创建 sync-钉钉同步") + private String source; + +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/TempUserDetailListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/TempUserDetailListVO.java new file mode 100644 index 000000000..d495959b9 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/TempUserDetailListVO.java @@ -0,0 +1,23 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author byd + * @date 2024-04-29 17:33 + */ +@Data +public class TempUserDetailListVO { + + @ApiModelProperty("员工列表") + private List userList; + + @ApiModelProperty("店铺id") + private Long shopId; + + @ApiModelProperty("店铺code") + private String storeNum; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/TempUserDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/TempUserDetailVO.java new file mode 100644 index 000000000..939181a1b --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/TempUserDetailVO.java @@ -0,0 +1,77 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import java.util.Date; + +/** + * @author byd + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class TempUserDetailVO { + + @ApiModelProperty("id") + private Long id; + + /** + * line_info.id + */ + @ApiModelProperty("line_info.id") + private Long lineId; + + /** + * shop_info.id + */ + @ApiModelProperty("店铺id") + private Long shopId; + + /** + * 区域ID + */ + @ApiModelProperty("区域ID") + private Long regionId; + + /** + * 手机号 + */ + @ApiModelProperty("手机号") + private String mobile; + + /** + * 申请人姓名 + */ + @ApiModelProperty("姓名") + private String username; + + /** + * 身份证号码 + */ + @ApiModelProperty("身份证号码") + private String idCard; + + /** + * 角色id 170000000-店长 180000000-店员 + */ + @ApiModelProperty("角色id 170000000-店长 180000000-店员") + private Long roleId; + + /** + * 登记时间 + */ + @ApiModelProperty("登记时间") + private Date registerTime; + + /** + * 来源：create-创建 sync-钉钉同步 + */ + @ApiModelProperty("来源：create-创建 sync-钉钉同步") + private String source; +} \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/TempUserDetailService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/TempUserDetailService.java new file mode 100644 index 000000000..7aa072a88 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/TempUserDetailService.java @@ -0,0 +1,22 @@ +package com.cool.store.service; + +import com.cool.store.request.TempUserDetailRequest; +import com.cool.store.vo.TempUserDetailInfoVO; +import com.cool.store.vo.TempUserDetailListVO; +import com.cool.store.vo.TempUserDetailVO; + +import java.util.List; + +/** + * @author byd + * @date 2024-04-29 16:13 + */ +public interface TempUserDetailService { + + TempUserDetailListVO userList(Long shopId); + + void addTempUserDetail(TempUserDetailRequest tempUserDetailRequest); + + + TempUserDetailInfoVO getUserInfoByIdUserDetailId(Long id); +} 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 new file mode 100644 index 000000000..dd107e5ed --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java @@ -0,0 +1,131 @@ +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.entity.EnterpriseUserDO; +import com.cool.store.entity.ShopInfoDO; +import com.cool.store.entity.TempUserDetailDO; +import com.cool.store.exception.ServiceException; +import com.cool.store.request.TempUserDetailRequest; +import com.cool.store.service.TempUserDetailService; +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.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author byd + * @date 2024-04-29 16:14 + */ +@Service +public class TempUserDetailServiceImpl implements TempUserDetailService { + + @Resource + private TempUserDetailDAO tempUserDetailDAO; + + @Resource + private ShopInfoDAO shopInfoDAO; + + @Resource + private EnterpriseUserDAO enterpriseUserDAO; + + @Override + public TempUserDetailListVO userList(Long shopId) { + List tempUserDetailDOList = tempUserDetailDAO.userList(shopId); + List resultList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(tempUserDetailDOList)) { + tempUserDetailDOList.forEach(tempUserDetailDO -> { + TempUserDetailVO tempUserDetailVO = new TempUserDetailVO(); + tempUserDetailVO.setId(tempUserDetailDO.getId()); + tempUserDetailVO.setMobile(tempUserDetailDO.getMobile()); + tempUserDetailVO.setIdCard(tempUserDetailDO.getIdCard()); + tempUserDetailVO.setSource(tempUserDetailDO.getSource()); + tempUserDetailVO.setRegisterTime(tempUserDetailDO.getRegisterTime()); + tempUserDetailVO.setShopId(tempUserDetailDO.getShopId()); + tempUserDetailVO.setLineId(tempUserDetailDO.getLineId()); + tempUserDetailVO.setUsername(tempUserDetailDO.getUsername()); + tempUserDetailVO.setRegionId(tempUserDetailDO.getRegionId()); + tempUserDetailVO.setRoleId(tempUserDetailDO.getRoleId()); + resultList.add(tempUserDetailVO); + }); + } + ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(shopId); + if(shopInfoDO == null){ + throw new ServiceException("该店铺不存在"); + } + TempUserDetailListVO tempUserDetailListVO = new TempUserDetailListVO(); + tempUserDetailListVO.setUserList(resultList); + tempUserDetailListVO.setShopId(shopId); + tempUserDetailListVO.setStoreNum(shopInfoDO.getStoreNum()); + return tempUserDetailListVO; + } + + @Override + public void addTempUserDetail(TempUserDetailRequest tempUserDetailRequest) { + TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectByIdCard(tempUserDetailRequest.getIdCard()); + if(tempUserDetailDO != null){ + throw new ServiceException("该员工已登记"); + } + EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoByThirdOaUniqueFlag(tempUserDetailRequest.getIdCard()); + if(enterpriseUserDO == null){ + throw new ServiceException("用户不存在"); + } + ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(tempUserDetailRequest.getShopId()); + if(shopInfoDO == null){ + throw new ServiceException("该店铺不存在"); + } + if(StringUtil.isNotBlank(shopInfoDO.getStoreNum())){ + throw new ServiceException("系统建店已完成，无法手动登记"); + } + tempUserDetailDO = new TempUserDetailDO(); + tempUserDetailDO.setLineId(shopInfoDO.getLineId()); + tempUserDetailDO.setShopId(tempUserDetailRequest.getShopId()); + tempUserDetailDO.setRegionId(shopInfoDO.getRegionId()); + tempUserDetailDO.setMobile(tempUserDetailRequest.getPhone()); + tempUserDetailDO.setUsername(tempUserDetailRequest.getName()); + tempUserDetailDO.setSex(tempUserDetailRequest.getSex()); + tempUserDetailDO.setAge(tempUserDetailRequest.getAge()); + tempUserDetailDO.setIdCard(tempUserDetailRequest.getIdCard()); + tempUserDetailDO.setStatus(1); + tempUserDetailDO.setEducational(tempUserDetailRequest.getHighestDegree()); + tempUserDetailDO.setRoleId(tempUserDetailRequest.getJobId()); + tempUserDetailDO.setIdCardNegativeUrl(tempUserDetailRequest.getEmblemPhoto()); + tempUserDetailDO.setIdCardPositiveUrl(tempUserDetailRequest.getIdNumPhoto()); + tempUserDetailDO.setHealthCertificateUrl(tempUserDetailRequest.getHealthCertificate()); + tempUserDetailDO.setRegisterTime(new Date()); + tempUserDetailDO.setSubmitTime(new Date()); + tempUserDetailDO.setSource("create"); + tempUserDetailDAO.insertSelective(tempUserDetailDO); + } + + @Override + public TempUserDetailInfoVO getUserInfoByIdUserDetailId(Long userDetailId) { + TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(userDetailId); + TempUserDetailInfoVO tempUserDetailInfoVO = new TempUserDetailInfoVO(); + tempUserDetailInfoVO.setLineId(tempUserDetailDO.getLineId()); + tempUserDetailInfoVO.setShopId(tempUserDetailDO.getShopId()); + tempUserDetailInfoVO.setRegionId(tempUserDetailDO.getRegionId()); + tempUserDetailInfoVO.setMobile(tempUserDetailDO.getMobile()); + tempUserDetailInfoVO.setUsername(tempUserDetailDO.getUsername()); + tempUserDetailInfoVO.setSex(tempUserDetailDO.getSex()); + tempUserDetailInfoVO.setAge(tempUserDetailDO.getAge()); + tempUserDetailInfoVO.setIdCard(tempUserDetailDO.getIdCard()); + tempUserDetailInfoVO.setStatus(tempUserDetailDO.getStatus()); + tempUserDetailInfoVO.setEducational(tempUserDetailDO.getEducational()); + tempUserDetailInfoVO.setRoleId(tempUserDetailDO.getRoleId()); + tempUserDetailInfoVO.setIdCardNegativeUrl(tempUserDetailDO.getIdCardNegativeUrl()); + tempUserDetailInfoVO.setIdCardPositiveUrl(tempUserDetailDO.getIdCardPositiveUrl()); + tempUserDetailInfoVO.setHealthCertificateUrl(tempUserDetailDO.getHealthCertificateUrl()); + tempUserDetailInfoVO.setRegisterTime(new Date()); + return tempUserDetailInfoVO; + } + +} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TempUserDetailController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TempUserDetailController.java new file mode 100644 index 000000000..28e4821a7 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TempUserDetailController.java @@ -0,0 +1,68 @@ +package com.cool.store.controller.webc; + +import com.cool.store.dto.ehr.StaffBaseInfoDTO; +import com.cool.store.request.TempUserDetailRequest; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.TempUserDetailService; +import com.cool.store.service.XfsgEhrService; +import com.cool.store.vo.TempUserDetailInfoVO; +import com.cool.store.vo.TempUserDetailListVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author byd + * @date 2024-04-29 16:15 + */ +@RestController +@RequestMapping({"/mini/tempUserDetail"}) +@Slf4j +@Api(tags = "培训登记") +public class TempUserDetailController { + + @Autowired + private TempUserDetailService tempUserDetailService; + + @Autowired + private XfsgEhrService xfsgEhrService; + + @GetMapping(path = "/getUserList") + @ApiOperation("登记员工列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "shopId", value = "店铺Id") + }) + public ResponseResult getUserList(@RequestParam(value = "shopId") Long shopId) { + return ResponseResult.success(tempUserDetailService.userList(shopId)); + } + + @GetMapping(path = "/getUserInfoByIdCard") + @ApiImplicitParams({ + @ApiImplicitParam(name = "idCard", value = "身份证号") + }) + @ApiOperation("培训登记-身份证号查询信息") + public ResponseResult getUserInfoByIdCard(@RequestParam(value = "idCard") String idCard) { + return ResponseResult.success(xfsgEhrService.getUserInfoByIdCard((idCard))); + } + + @PostMapping(path = "/addTempUserDetail") + @ApiOperation("培训登记-确认登记") + public ResponseResult addTempUserDetail(@RequestBody TempUserDetailRequest tempUserDetailRequest) { + tempUserDetailService.addTempUserDetail((tempUserDetailRequest)); + return ResponseResult.success(Boolean.TRUE); + } + + @GetMapping(path = "/getUserInfoByIdUserDetailId") + @ApiImplicitParams({ + @ApiImplicitParam(name = "userDetailId", value = "用户详情表id") + }) + @ApiOperation("培训登记-查询信息根据用户详情id") + public ResponseResult getUserInfoByIdUserDetailId(@RequestParam(value = "userDetailId") Long userDetailId) { + return ResponseResult.success(tempUserDetailService.getUserInfoByIdUserDetailId((userDetailId))); + } + +}