forked from Gitlink/microservices
专家实名认证逻辑修改
This commit is contained in:
parent
8117cd862e
commit
f573afac22
|
|
@ -59,6 +59,7 @@ public class ExpertResourceLibrary extends BaseEntity {
|
|||
|
||||
private Integer isDelete;
|
||||
|
||||
private Long expertAuth;
|
||||
|
||||
private Integer sortNo;
|
||||
|
||||
|
|
@ -66,6 +67,14 @@ public class ExpertResourceLibrary extends BaseEntity {
|
|||
|
||||
private Long competitionAuditCount;
|
||||
|
||||
public Long getExpertAuth() {
|
||||
return expertAuth;
|
||||
}
|
||||
|
||||
public void setExpertAuth(Long expertAuth) {
|
||||
this.expertAuth = expertAuth;
|
||||
}
|
||||
|
||||
public Long getTaskAuditCount() {
|
||||
return taskAuditCount;
|
||||
}
|
||||
|
|
@ -82,6 +91,16 @@ public class ExpertResourceLibrary extends BaseEntity {
|
|||
this.competitionAuditCount = competitionAuditCount;
|
||||
}
|
||||
|
||||
public String gender;
|
||||
|
||||
public String getGender() {
|
||||
return gender;
|
||||
}
|
||||
|
||||
public void setGender(String gender) {
|
||||
this.gender = gender;
|
||||
}
|
||||
|
||||
public Integer getSortNo() {
|
||||
return sortNo;
|
||||
}
|
||||
|
|
@ -274,35 +293,5 @@ public class ExpertResourceLibrary extends BaseEntity {
|
|||
return isDelete;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("userId", getUserId())
|
||||
.append("expertName", getExpertName())
|
||||
.append("highestDegree", getHighestDegree())
|
||||
.append("graduatedFrom", getGraduatedFrom())
|
||||
.append("idNumber", getIdNumber())
|
||||
.append("major", getMajor())
|
||||
.append("workplace", getWorkplace())
|
||||
.append("phone", getPhone())
|
||||
.append("workplaceType", getWorkplaceType())
|
||||
.append("expertEmail", getExpertEmail())
|
||||
.append("expertSummary", getExpertSummary())
|
||||
.append("expertDetail", getExpertDetail())
|
||||
.append("professionalTitle", getProfessionalTitle())
|
||||
.append("expertType", getExpertType())
|
||||
.append("expertDomain", getExpertDomain())
|
||||
.append("titleRank", getTitleRank())
|
||||
.append("status", getStatus())
|
||||
.append("reviewAreaOne", getReviewAreaOne())
|
||||
.append("reviewAreaTwo", getReviewAreaTwo())
|
||||
.append("reviewAreaThree", getReviewAreaThree())
|
||||
.append("isDelete", getIsDelete())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.toString();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,25 +33,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="sortNo" column="sort_no" />
|
||||
<result property="gender" column="gender" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectExpertResourceLibraryVo">
|
||||
select id, user_id,expert_id,sort_no, expert_name, highest_degree, graduated_from, id_number, major, workplace, phone, workplace_type, expert_email, expert_summary, expert_detail, professional_title, expert_type, expert_domain, title_rank, status, review_area_one, review_area_two, review_area_three, is_delete, create_by, create_time, update_by, update_time from expert_resource_library
|
||||
select id, user_id,expert_id,gender,sort_no, expert_name, highest_degree, graduated_from, id_number, major, workplace, phone, workplace_type, expert_email, expert_summary, expert_detail, professional_title, expert_type, expert_domain, title_rank, status, review_area_one, review_area_two, review_area_three, is_delete, create_by, create_time, update_by, update_time from expert_resource_library
|
||||
</sql>
|
||||
|
||||
<select id="selectExpertResourceLibraryList" parameterType="ExpertResourceLibrary" resultType="com.microservices.dms.resourceLibrary.domain.ExpertResourceLibrary">
|
||||
select * from ( select erl.id, e.id as expert_id,e.user_id, e.expert_name, e.highest_degree, e.graduated_from, e.id_number,
|
||||
select * from ( select erl.id, e.id as expert_id,e.user_id, e.expert_name, e.highest_degree, e.graduated_from,
|
||||
e.id_number,gender,
|
||||
e.major, e.workplace, e.phone,
|
||||
e.workplace_type, e.expert_email, erl.expert_summary, erl.expert_detail, e.professional_title, e.expert_type,
|
||||
expert_domain,
|
||||
expert_domain,u.authentication as expertAuth,
|
||||
e.title_rank, e.status, e.review_area_one, e.review_area_two, e.review_area_three, e.is_delete, erl.create_by,
|
||||
erl.create_time,
|
||||
(select COUNT(*) from task_expert where expert_id = e.id and container_type = 1) as taskAuditCount,
|
||||
(select COUNT(*) from task_expert where expert_id = e.id and container_type = 2) as competitionAuditCount,
|
||||
erl.update_by, erl.update_time,erl.sort_no from experts e left join expert_resource_library erl on e.id =
|
||||
erl.user_id
|
||||
erl.update_by, erl.update_time,erl.sort_no
|
||||
from experts e
|
||||
inner join users u on e.user_id = u.id
|
||||
left join expert_resource_library erl on e.id = erl.user_id
|
||||
<where>
|
||||
e.is_delete='0' and e.status=1
|
||||
<if test="userId != null ">and user_id = #{userId}</if>
|
||||
<if test="gender != null ">and gender = #{gender}</if>
|
||||
<if test="expertName != null and expertName != ''">and e.expert_name like concat('%', #{expertName}, '%')
|
||||
</if>
|
||||
<if test="highestDegree != null and highestDegree != ''">and highest_degree = #{highestDegree}</if>
|
||||
|
|
@ -76,7 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="reviewAreaThree != null and reviewAreaThree != ''">and review_area_three = #{reviewAreaThree}
|
||||
</if>
|
||||
<if test="isDelete != null ">and is_delete = #{isDelete}</if>
|
||||
</where>) tmp where tmp.taskAuditCount > 0 OR tmp.competitionAuditCount > 0
|
||||
</where>
|
||||
) tmp where tmp.taskAuditCount > 0 OR tmp.competitionAuditCount > 0
|
||||
</select>
|
||||
|
||||
<select id="selectExpertResourceLibraryList2" parameterType="ExpertResourceLibrary" resultMap="ExpertResourceLibraryResult">
|
||||
|
|
@ -190,6 +197,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="sortNo != null">sort_no,</if>
|
||||
<if test="gender != null">gender,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="userId != null">#{userId},</if>
|
||||
|
|
@ -219,6 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="sortNo != null">#{sortNo},</if>
|
||||
<if test="gender != null">#{gender},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
@ -252,6 +261,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="sortNo != null">sort_no = #{sortNo},</if>
|
||||
<if test="gender != null">gender = #{gender},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
|
|
|||
Loading…
Reference in New Issue