This commit is contained in:
cwchen 2024-04-02 18:58:39 +08:00
parent b4c4f7b6cd
commit d08db9d59b
2 changed files with 25 additions and 4 deletions

View File

@ -70,6 +70,9 @@ public class HumanManageVo {
@ApiModelProperty(value = "项目部名称")
private String projectDepName;
@ApiModelProperty(value = "人员类型")
private String personType;
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@ApiModelProperty(value = "删除的文件ID")
private String delFiles;

View File

@ -14,7 +14,10 @@
<if test="userType != null and userType!=''">user_type,</if>
<if test="createTime != null and createTime!=''">cratet_time,</if>
del_falge,
<if test="status != null and status!=''">status,</if>
<if test="personType != null and personType!=''">person_type,</if>
<if test="projectDepName != null and projectDepName!=''">project_dep_name,</if>
<if test="deptName != null and deptName!=''">dept_name,</if>
<if test="sex != null and sex!=''">sex,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null and userId != ''">#{userId},</if>
@ -25,7 +28,10 @@
<if test="userType != null and userType!=''">#{userType},</if>
<if test="createTime != null and createTime!=''">#{createTime},</if>
'0',
<if test="status != null and status!=''">#{status},</if>
<if test="personType != null and personType!=''">#{personType},</if>
<if test="projectDepName != null and projectDepName!=''">#{projectDepName},</if>
<if test="deptName != null and deptName!=''">#{deptName},</if>
<if test="sex != null and sex!=''">#{sex},</if>
</trim>
</if>
<if test="type == 2">
@ -37,6 +43,10 @@
<if test="phone != null and phone != ''">phone = #{phone},</if>
<if test="userType != null and userType != ''">user_type = #{userType},</if>
<if test="status != null and status!=''">#{status},</if>
<if test="personType != null and personType!=''">person_type = #{personType},</if>
<if test="projectDepName != null and projectDepName!=''">project_dep_name = #{projectDepName},</if>
<if test="deptName != null and deptName!=''">dept_name = #{deptName},</if>
<if test="sex != null and sex!=''">sex = #{sex},</if>
</set>
WHERE user_id= #{userId}
</if>
@ -93,7 +103,11 @@
sd.dict_name AS userType,
twt.team_leader AS teamLeader,
twt.team_name AS teamName,
tp.pro_name AS proName
tp.pro_name AS proName,
ttp.sex,
ttp.person_type AS personType,
ttp.project_dep_name AS projectDepName,
ttp.dept_name AS deptName
FROM t_team_people ttp
LEFT JOIN tb_work_team twt on ttp.team_id = twt.team_id
LEFT JOIN sys_dict sd ON ttp.user_type = sd.dict_code
@ -124,7 +138,11 @@
ttp.user_type AS userType,
ttp.id_number AS idNumber,
ttp.phone,
ttp.team_id AS teamId
ttp.team_id AS teamId,
ttp.sex,
ttp.person_type AS personType,
ttp.project_dep_name AS projectDepName,
ttp.dept_name AS deptName
FROM t_team_people ttp
WHERE ttp.user_id = #{id}
</select>