jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

dev_xd
lijun 2024-10-08 01:07:33 +08:00
parent f618dee734
commit d27312f85b
7 changed files with 228 additions and 525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/RemoteUserService.java
View File

@ -2,11 +2,7 @@ package com.yanzhu.system.api;
import com.yanzhu.system.api.model.LoginUser; import com.yanzhu.system.api.model.LoginUser;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import com.yanzhu.common.core.constant.SecurityConstants; import com.yanzhu.common.core.constant.SecurityConstants;
import com.yanzhu.common.core.constant.ServiceNameConstants; import com.yanzhu.common.core.constant.ServiceNameConstants;
import com.yanzhu.common.core.domain.R; import com.yanzhu.common.core.domain.R;
@ -65,4 +61,6 @@ public interface RemoteUserService
@PostMapping("/user/register") @PostMapping("/user/register")
public R<Long> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); public R<Long> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@PutMapping("/user/register")
public R<Long> updateUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
} }

5
yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/factory/RemoteUserFallbackFactory.java
View File

@ -51,6 +51,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
{ {
return R.fail("注册用户失败:" + throwable.getMessage()); return R.fail("注册用户失败:" + throwable.getMessage());
} }
@Override
public R<Long> updateUserInfo(SysUser sysUser, String source) {
return R.fail("修改用户失败:" + throwable.getMessage());
}
}; };
} }
} }

340
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java
View File

@ -3,6 +3,7 @@ package com.yanzhu.manage.domain;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yanzhu.common.core.annotation.Excel; import com.yanzhu.common.core.annotation.Excel;
import com.yanzhu.common.core.web.domain.BaseEntity; import com.yanzhu.common.core.web.domain.BaseEntity;
import com.yanzhu.system.api.domain.SysUser;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
@ -29,10 +30,6 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
@Excel(name = "项目主键") @Excel(name = "项目主键")
private Long projectId; private Long projectId;
/** 项目名称 */
@Excel(name = "项目名称")
private String projectName;
/** 分包单位 */ /** 分包单位 */
@Excel(name = "分包单位") @Excel(name = "分包单位")
private Long subDeptId; private Long subDeptId;
@ -49,60 +46,14 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
@Excel(name = "用户主键") @Excel(name = "用户主键")
private Long userId; private Long userId;
/** 工人类型 */
@Excel(name = "工人类型")
private String userType;
/** 工人姓名 */
@Excel(name = "工人姓名")
private String userName;
/** 联系电话 */
@Excel(name = "联系电话")
private String userPhone;
/** 证件类型(字典) */
@Excel(name = "证件类型(字典)")
private String certificateType;
/** 证件号码 */
@Excel(name = "证件号码")
private String certificateCode;
/** 班组编号(外键） */ /** 班组编号(外键） */
@Excel(name = "班组编号") @Excel(name = "班组编号(外键）")
private Long subDeptGroup; private Long subDeptGroup;
@Excel(name = "班组") /** 班组名称 */
@Excel(name = "班组名称")
private String subDeptGroupName; private String subDeptGroupName;
public int getHasRegister() {
return hasRegister;
}
public void setHasRegister(int hasRegister) {
this.hasRegister = hasRegister;
}
private int hasRegister;
public String getAdmitGuid() {
return admitGuid;
}
public void setAdmitGuid(String admitGuid) {
this.admitGuid = admitGuid;
}
private String admitGuid;
public String getSubDeptGroupName() {
return subDeptGroupName;
}
public void setSubDeptGroupName(String subDeptGroupName) {
this.subDeptGroupName = subDeptGroupName;
}
/** 工种类型 */ /** 工种类型 */
@Excel(name = "工种类型") @Excel(name = "工种类型")
private String craftType; private String craftType;
@ -111,67 +62,6 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
@Excel(name = "工种岗位") @Excel(name = "工种岗位")
private String craftPost; private String craftPost;
/** 民族 */
@Excel(name = "民族")
private String nation;
/** 年龄 */
@Excel(name = "年龄")
private Long age;
/** 性别 */
@Excel(name = "性别")
private String sex;
/** 文化程度(字典) */
@Excel(name = "文化程度(字典)")
private String educationalType;
/** 出生日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date birthDay;
/** 籍贯 */
@Excel(name = "籍贯")
private String nativePlace;
/** 家庭地址 */
@Excel(name = "家庭地址")
private String address;
/** 紧急联系人 */
@Excel(name = "紧急联系人")
private String emergencyContact;
/** 紧急联系人电话 */
@Excel(name = "紧急联系人电话")
private String contactPhone;
/** 工资卡银行 */
@Excel(name = "工资卡银行")
private String bankName;
/** 工资卡号 */
@Excel(name = "工资卡号")
private String bankCardNo;
/** 开户网点 */
@Excel(name = "开户网点")
private String bankOffice;
/** 身份证头像面 */
@Excel(name = "身份证头像面")
private String certificatePhoto1;
/** 身份证国徽面 */
@Excel(name = "身份证国徽面")
private String certificatePhoto2;
/** 人脸识别头像 */
@Excel(name = "人脸识别头像")
private String faceImage;
/** 学习状态 */ /** 学习状态 */
@Excel(name = "学习状态") @Excel(name = "学习状态")
private String eduStatus; private String eduStatus;
@ -209,6 +99,16 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
@Excel(name = "严重疾病状态") @Excel(name = "严重疾病状态")
private Long supIllnessStatus; private Long supIllnessStatus;
public SysUser getUser() {
return user;
}
public void setUser(SysUser user) {
this.user = user;
}
private SysUser user;
/** 删除标识 */ /** 删除标识 */
@Excel(name = "删除标识") @Excel(name = "删除标识")
private Long isDel; private Long isDel;
@ -276,51 +176,6 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
{ {
return userId; return userId;
} }
public void setUserType(String userType)
{
this.userType = userType;
}
public String getUserType()
{
return userType;
}
public void setUserName(String userName)
{
this.userName = userName;
}
public String getUserName()
{
return userName;
}
public void setUserPhone(String userPhone)
{
this.userPhone = userPhone;
}
public String getUserPhone()
{
return userPhone;
}
public void setCertificateType(String certificateType)
{
this.certificateType = certificateType;
}
public String getCertificateType()
{
return certificateType;
}
public void setCertificateCode(String certificateCode)
{
this.certificateCode = certificateCode;
}
public String getCertificateCode()
{
return certificateCode;
}
public void setSubDeptGroup(Long subDeptGroup) public void setSubDeptGroup(Long subDeptGroup)
{ {
this.subDeptGroup = subDeptGroup; this.subDeptGroup = subDeptGroup;
@ -330,6 +185,15 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
{ {
return subDeptGroup; return subDeptGroup;
} }
public void setSubDeptGroupName(String subDeptGroupName)
{
this.subDeptGroupName = subDeptGroupName;
}
public String getSubDeptGroupName()
{
return subDeptGroupName;
}
public void setCraftType(String craftType) public void setCraftType(String craftType)
{ {
this.craftType = craftType; this.craftType = craftType;
@ -348,141 +212,6 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
{ {
return craftPost; return craftPost;
} }
public void setNation(String nation)
{
this.nation = nation;
}
public String getNation()
{
return nation;
}
public void setAge(Long age)
{
this.age = age;
}
public Long getAge()
{
return age;
}
public void setSex(String sex)
{
this.sex = sex;
}
public String getSex()
{
return sex;
}
public void setEducationalType(String educationalType)
{
this.educationalType = educationalType;
}
public String getEducationalType()
{
return educationalType;
}
public void setBirthDay(Date birthDay)
{
this.birthDay = birthDay;
}
public Date getBirthDay()
{
return birthDay;
}
public void setNativePlace(String nativePlace)
{
this.nativePlace = nativePlace;
}
public String getNativePlace()
{
return nativePlace;
}
public void setAddress(String address)
{
this.address = address;
}
public String getAddress()
{
return address;
}
public void setEmergencyContact(String emergencyContact)
{
this.emergencyContact = emergencyContact;
}
public String getEmergencyContact()
{
return emergencyContact;
}
public void setContactPhone(String contactPhone)
{
this.contactPhone = contactPhone;
}
public String getContactPhone()
{
return contactPhone;
}
public void setBankName(String bankName)
{
this.bankName = bankName;
}
public String getBankName()
{
return bankName;
}
public void setBankCardNo(String bankCardNo)
{
this.bankCardNo = bankCardNo;
}
public String getBankCardNo()
{
return bankCardNo;
}
public void setBankOffice(String bankOffice)
{
this.bankOffice = bankOffice;
}
public String getBankOffice()
{
return bankOffice;
}
public void setCertificatePhoto1(String certificatePhoto1)
{
this.certificatePhoto1 = certificatePhoto1;
}
public String getCertificatePhoto1()
{
return certificatePhoto1;
}
public void setCertificatePhoto2(String certificatePhoto2)
{
this.certificatePhoto2 = certificatePhoto2;
}
public String getCertificatePhoto2()
{
return certificatePhoto2;
}
public void setFaceImage(String faceImage)
{
this.faceImage = faceImage;
}
public String getFaceImage()
{
return faceImage;
}
public void setEduStatus(String eduStatus) public void setEduStatus(String eduStatus)
{ {
this.eduStatus = eduStatus; this.eduStatus = eduStatus;
@ -574,6 +303,8 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
return isDel; return isDel;
} }
private String projectName;
public String getProjectName() { public String getProjectName() {
return projectName; return projectName;
} }
@ -592,29 +323,10 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
.append("subDeptType", getSubDeptType()) .append("subDeptType", getSubDeptType())
.append("subDeptName", getSubDeptName()) .append("subDeptName", getSubDeptName())
.append("userId", getUserId()) .append("userId", getUserId())
.append("userType", getUserType())
.append("userName", getUserName())
.append("userPhone", getUserPhone())
.append("certificateType", getCertificateType())
.append("certificateCode", getCertificateCode())
.append("subDeptGroup", getSubDeptGroup()) .append("subDeptGroup", getSubDeptGroup())
.append("subDeptGroupName", getSubDeptGroupName())
.append("craftType", getCraftType()) .append("craftType", getCraftType())
.append("craftPost", getCraftPost()) .append("craftPost", getCraftPost())
.append("nation", getNation())
.append("age", getAge())
.append("sex", getSex())
.append("educationalType", getEducationalType())
.append("birthDay", getBirthDay())
.append("nativePlace", getNativePlace())
.append("address", getAddress())
.append("emergencyContact", getEmergencyContact())
.append("contactPhone", getContactPhone())
.append("bankName", getBankName())
.append("bankCardNo", getBankCardNo())
.append("bankOffice", getBankOffice())
.append("certificatePhoto1", getCertificatePhoto1())
.append("certificatePhoto2", getCertificatePhoto2())
.append("faceImage", getFaceImage())
.append("eduStatus", getEduStatus()) .append("eduStatus", getEduStatus())
.append("eduFilePath", getEduFilePath()) .append("eduFilePath", getEduFilePath())
.append("eduSignPath", getEduSignPath()) .append("eduSignPath", getEduSignPath())

145
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml
View File

@ -8,36 +8,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" /> <result property="id" column="id" />
<result property="comId" column="com_id" /> <result property="comId" column="com_id" />
<result property="projectId" column="project_id" /> <result property="projectId" column="project_id" />
<result property="projectName" column="project_name" />
<result property="subDeptId" column="sub_dept_id" /> <result property="subDeptId" column="sub_dept_id" />
<result property="subDeptType" column="sub_dept_type" /> <result property="subDeptType" column="sub_dept_type" />
<result property="subDeptName" column="sub_dept_name" /> <result property="subDeptName" column="sub_dept_name" />
<result property="userId" column="user_id" /> <result property="userId" column="user_id" />
<result property="userType" column="user_type" />
<result property="userName" column="user_name" />
<result property="userPhone" column="user_phone" />
<result property="certificateType" column="certificate_type" />
<result property="certificateCode" column="certificate_code" />
<result property="subDeptGroup" column="sub_dept_group" /> <result property="subDeptGroup" column="sub_dept_group" />
<result property="subDeptGroupName" column="sub_dept_group_name" /> <result property="subDeptGroupName" column="sub_dept_group_name" />
<result property="craftType" column="craft_type" /> <result property="craftType" column="craft_type" />
<result property="craftPost" column="craft_post" /> <result property="craftPost" column="craft_post" />
<result property="nation" column="nation" />
<result property="age" column="age" />
<result property="sex" column="sex" />
<result property="educationalType" column="educational_type" />
<result property="birthDay" column="birth_day" />
<result property="nativePlace" column="native_place" />
<result property="address" column="address" />
<result property="emergencyContact" column="emergency_contact" />
<result property="contactPhone" column="contact_phone" />
<result property="bankName" column="bank_name" />
<result property="bankCardNo" column="bank_card_no" />
<result property="bankOffice" column="bank_office" />
<result property="certificatePhoto1" column="certificate_photo1" />
<result property="certificatePhoto2" column="certificate_photo2" />
<result property="admitGuid" column="admit_guid"/>
<result property="faceImage" column="face_image" />
<result property="eduStatus" column="edu_status" /> <result property="eduStatus" column="edu_status" />
<result property="eduFilePath" column="edu_file_path" /> <result property="eduFilePath" column="edu_file_path" />
<result property="eduSignPath" column="edu_sign_path" /> <result property="eduSignPath" column="edu_sign_path" />
@ -46,25 +24,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="useStatus" column="use_status" /> <result property="useStatus" column="use_status" />
<result property="subStep" column="sub_step" /> <result property="subStep" column="sub_step" />
<result property="illnessStatus" column="illness_status" /> <result property="illnessStatus" column="illness_status" />
<result property="supIllnessStatus" column="sup_illness_status" /> <result property="supIllnessStatus" column="sup_illness_status" />
<result property="hasRegister" column="has_register"/>
<result property="isDel" column="is_del" /> <result property="isDel" column="is_del" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<association property="user" javaType="com.yanzhu.system.api.domain.SysUser" resultMap="com.yanzhu.system.mapper.SysUserMapper.SysUserResult"></association>
</resultMap> </resultMap>
<sql id="selectProProjectInfoSubdeptsUsersVo"> <sql id="selectProProjectInfoSubdeptsUsersVo">
select psu.id, psu.com_id, psu.project_id, pi.project_name, psu.sub_dept_id, psu.sub_dept_type, select pi.project_name,
psu.sub_dept_name, psu.user_id, psu.user_type, psu.user_name, psu.craft_type, psu.craft_post, psu.edu_status, psu.id, psu.com_id, psu.project_id, psu.sub_dept_id, psu.sub_dept_type, psu.sub_dept_name, psu.user_id,
psu.sub_dept_group, psu.sub_dept_group_name, psu.craft_type, psu.craft_post, psu.edu_status,
psu.edu_file_path, psu.edu_sign_path, psu.edu_date, psu.approve_status, psu.use_status, psu.sub_step, psu.illness_status, psu.edu_file_path, psu.edu_sign_path, psu.edu_date, psu.approve_status, psu.use_status, psu.sub_step, psu.illness_status,
psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time, psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time, psu.remark
psu.user_phone,psu.certificate_type,psu.certificate_code,psu.sub_dept_group,psu.sub_dept_group_name,psu.nation,psu.age,psu.sex,
psu.educational_type,psu.birth_day,psu.native_place,psu.address,psu.emergency_contact,psu.contact_phone,
psu.bank_name,psu.bank_card_no,psu.bank_office,psu.certificate_photo1,psu.certificate_photo2,psu.face_image,psu.admit_guid,psu.has_register,
psu.remark
from pro_project_info_subdepts_users psu from pro_project_info_subdepts_users psu
left join pro_project_info pi on pi.id = psu.project_id left join pro_project_info pi on pi.id = psu.project_id
left join sys_dept sd on sd.dept_id = pi.com_id left join sys_dept sd on sd.dept_id = pi.com_id
@ -73,32 +49,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectProProjectInfoSubdeptsUsersList" parameterType="ProProjectInfoSubdeptsUsers" resultMap="ProProjectInfoSubdeptsUsersResult"> <select id="selectProProjectInfoSubdeptsUsersList" parameterType="ProProjectInfoSubdeptsUsers" resultMap="ProProjectInfoSubdeptsUsersResult">
<include refid="selectProProjectInfoSubdeptsUsersVo"/> <include refid="selectProProjectInfoSubdeptsUsersVo"/>
<where> <where>
<if test="comId != null "> and psu.com_id = #{comId}</if> <if test="comId != null "> and com_id = #{comId}</if>
<if test="projectId != null "> and psu.project_id = #{projectId}</if> <if test="projectId != null "> and project_id = #{projectId}</if>
<if test="projectName != null and projectName != ''"> and pi.project_name like concat('%', #{projectName}, '%')</if> <if test="subDeptId != null "> and sub_dept_id = #{subDeptId}</if>
<if test="subDeptId != null "> and psu.sub_dept_id = #{subDeptId}</if> <if test="subDeptType != null and subDeptType != ''"> and sub_dept_type = #{subDeptType}</if>
<if test="subDeptName != null and subDeptName != ''"> and psu.sub_dept_name like concat('%', #{subDeptName}, '%')</if> <if test="subDeptName != null and subDeptName != ''"> and sub_dept_name like concat('%', #{subDeptName}, '%')</if>
<if test="userId != null "> and psu.user_id = #{userId}</if> <if test="userId != null "> and user_id = #{userId}</if>
<if test="userName != null and userName != ''"> and psu.user_name like concat('%', #{userName}, '%')</if> <if test="subDeptGroup != null "> and sub_dept_group = #{subDeptGroup}</if>
<if test="userPhone != null and userPhone != ''"> and psu.user_phone like concat('%', #{userPhone}, '%')</if> <if test="subDeptGroupName != null and subDeptGroupName != ''"> and sub_dept_group_name like concat('%', #{subDeptGroupName}, '%')</if>
<if test="craftType != null and craftType != ''"> and psu.craft_type = #{craftType}</if> <if test="craftType != null and craftType != ''"> and craft_type = #{craftType}</if>
<if test="hasRegister != null and hasRegister != ''"> and psu.has_register = #{hasRegister}</if> <if test="craftPost != null and craftPost != ''"> and craft_post = #{craftPost}</if>
<if test="subDeptGroup != null and subDeptGroup != ''"> and psu.sub_dept_group = #{subDeptGroup}</if> <if test="eduStatus != null and eduStatus != ''"> and edu_status = #{eduStatus}</if>
<if test="craftPost != null and craftPost != ''"> and psu.craft_post = #{craftPost}</if> <if test="eduFilePath != null and eduFilePath != ''"> and edu_file_path = #{eduFilePath}</if>
<if test="eduStatus != null and eduStatus != ''"> and psu.edu_status = #{eduStatus}</if> <if test="eduSignPath != null and eduSignPath != ''"> and edu_sign_path = #{eduSignPath}</if>
<if test="approveStatus != null "> and psu.approve_status = #{approveStatus}</if> <if test="eduDate != null "> and edu_date = #{eduDate}</if>
<if test="useStatus != null and useStatus != ''"> and psu.use_status = #{useStatus}</if> <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
<if test="subStep != null "> and psu.sub_step = #{subStep}</if> <if test="useStatus != null and useStatus != ''"> and use_status = #{useStatus}</if>
<if test="illnessStatus != null "> and psu.illness_status = #{illnessStatus}</if> <if test="subStep != null "> and sub_step = #{subStep}</if>
<if test="supIllnessStatus != null "> and psu.sup_illness_status = #{supIllnessStatus}</if> <if test="illnessStatus != null "> and illness_status = #{illnessStatus}</if>
<if test="isDel != null "> and psu.is_del = #{isDel}</if> <if test="supIllnessStatus != null "> and sup_illness_status = #{supIllnessStatus}</if>
<if test="isDel != null "> and is_del = #{isDel}</if>
</where> </where>
order by psu.id desc
</select> </select>
<select id="selectProProjectInfoSubdeptsUsersById" parameterType="Long" resultMap="ProProjectInfoSubdeptsUsersResult"> <select id="selectProProjectInfoSubdeptsUsersById" parameterType="Long" resultMap="ProProjectInfoSubdeptsUsersResult">
<include refid="selectProProjectInfoSubdeptsUsersVo"/> <include refid="selectProProjectInfoSubdeptsUsersVo"/>
where psu.id = #{id} where id = #{id}
</select> </select>
<insert id="insertProProjectInfoSubdeptsUsers" parameterType="ProProjectInfoSubdeptsUsers" useGeneratedKeys="true" keyProperty="id"> <insert id="insertProProjectInfoSubdeptsUsers" parameterType="ProProjectInfoSubdeptsUsers" useGeneratedKeys="true" keyProperty="id">
@ -110,31 +87,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="subDeptType != null">sub_dept_type,</if> <if test="subDeptType != null">sub_dept_type,</if>
<if test="subDeptName != null">sub_dept_name,</if> <if test="subDeptName != null">sub_dept_name,</if>
<if test="userId != null">user_id,</if> <if test="userId != null">user_id,</if>
<if test="userType != null">user_type,</if>
<if test="userName != null">user_name,</if>
<if test="userPhone != null">user_phone,</if>
<if test="certificateType != null">certificate_type,</if>
<if test="certificateCode != null">certificate_code,</if>
<if test="subDeptGroup != null">sub_dept_group,</if> <if test="subDeptGroup != null">sub_dept_group,</if>
<if test="subDeptGroupName != null">sub_dept_group_name,</if> <if test="subDeptGroupName != null">sub_dept_group_name,</if>
<if test="craftType != null">craft_type,</if> <if test="craftType != null">craft_type,</if>
<if test="craftPost != null">craft_post,</if> <if test="craftPost != null">craft_post,</if>
<if test="nation != null">nation,</if>
<if test="age != null">age,</if>
<if test="sex != null">sex,</if>
<if test="educationalType != null">educational_type,</if>
<if test="birthDay != null">birth_day,</if>
<if test="nativePlace != null">native_place,</if>
<if test="address != null">address,</if>
<if test="emergencyContact != null">emergency_contact,</if>
<if test="contactPhone != null">contact_phone,</if>
<if test="bankName != null">bank_name,</if>
<if test="bankCardNo != null">bank_card_no,</if>
<if test="bankOffice != null">bank_office,</if>
<if test="certificatePhoto1 != null">certificate_photo1,</if>
<if test="certificatePhoto2 != null">certificate_photo2,</if>
<if test="admitGuid != null">admit_guid,</if>
<if test="faceImage != null">face_image,</if>
<if test="eduStatus != null">edu_status,</if> <if test="eduStatus != null">edu_status,</if>
<if test="eduFilePath != null">edu_file_path,</if> <if test="eduFilePath != null">edu_file_path,</if>
<if test="eduSignPath != null">edu_sign_path,</if> <if test="eduSignPath != null">edu_sign_path,</if>
@ -144,7 +100,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="subStep != null">sub_step,</if> <if test="subStep != null">sub_step,</if>
<if test="illnessStatus != null">illness_status,</if> <if test="illnessStatus != null">illness_status,</if>
<if test="supIllnessStatus != null">sup_illness_status,</if> <if test="supIllnessStatus != null">sup_illness_status,</if>
<if test="hasRegister != null">has_register,</if>
<if test="isDel != null">is_del,</if> <if test="isDel != null">is_del,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
@ -159,31 +114,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="subDeptType != null">#{subDeptType},</if> <if test="subDeptType != null">#{subDeptType},</if>
<if test="subDeptName != null">#{subDeptName},</if> <if test="subDeptName != null">#{subDeptName},</if>
<if test="userId != null">#{userId},</if> <if test="userId != null">#{userId},</if>
<if test="userType != null">#{userType},</if>
<if test="userName != null">#{userName},</if>
<if test="userPhone != null">#{userPhone},</if>
<if test="certificateType != null">#{certificateType},</if>
<if test="certificateCode != null">#{certificateCode},</if>
<if test="subDeptGroup != null">#{subDeptGroup},</if> <if test="subDeptGroup != null">#{subDeptGroup},</if>
<if test="subDeptGroupName != null">#{subDeptGroupName},</if> <if test="subDeptGroupName != null">#{subDeptGroupName},</if>
<if test="admitGuid != null">#{admitGuid},</if>
<if test="craftType != null">#{craftType},</if> <if test="craftType != null">#{craftType},</if>
<if test="craftPost != null">#{craftPost},</if> <if test="craftPost != null">#{craftPost},</if>
<if test="nation != null">#{nation},</if>
<if test="age != null">#{age},</if>
<if test="sex != null">#{sex},</if>
<if test="educationalType != null">#{educationalType},</if>
<if test="birthDay != null">#{birthDay},</if>
<if test="nativePlace != null">#{nativePlace},</if>
<if test="address != null">#{address},</if>
<if test="emergencyContact != null">#{emergencyContact},</if>
<if test="contactPhone != null">#{contactPhone},</if>
<if test="bankName != null">#{bankName},</if>
<if test="bankCardNo != null">#{bankCardNo},</if>
<if test="bankOffice != null">#{bankOffice},</if>
<if test="certificatePhoto1 != null">#{certificatePhoto1},</if>
<if test="certificatePhoto2 != null">#{certificatePhoto2},</if>
<if test="faceImage != null">#{faceImage},</if>
<if test="eduStatus != null">#{eduStatus},</if> <if test="eduStatus != null">#{eduStatus},</if>
<if test="eduFilePath != null">#{eduFilePath},</if> <if test="eduFilePath != null">#{eduFilePath},</if>
<if test="eduSignPath != null">#{eduSignPath},</if> <if test="eduSignPath != null">#{eduSignPath},</if>
@ -193,7 +127,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="subStep != null">#{subStep},</if> <if test="subStep != null">#{subStep},</if>
<if test="illnessStatus != null">#{illnessStatus},</if> <if test="illnessStatus != null">#{illnessStatus},</if>
<if test="supIllnessStatus != null">#{supIllnessStatus},</if> <if test="supIllnessStatus != null">#{supIllnessStatus},</if>
<if test="hasRegister != null">#{hasRegister},</if>
<if test="isDel != null">#{isDel},</if> <if test="isDel != null">#{isDel},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
@ -212,31 +145,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="subDeptType != null">sub_dept_type = #{subDeptType},</if> <if test="subDeptType != null">sub_dept_type = #{subDeptType},</if>
<if test="subDeptName != null">sub_dept_name = #{subDeptName},</if> <if test="subDeptName != null">sub_dept_name = #{subDeptName},</if>
<if test="userId != null">user_id = #{userId},</if> <if test="userId != null">user_id = #{userId},</if>
<if test="userType != null">user_type = #{userType},</if>
<if test="userName != null">user_name = #{userName},</if>
<if test="userPhone != null">user_phone = #{userPhone},</if>
<if test="certificateType != null">certificate_type = #{certificateType},</if>
<if test="certificateCode != null">certificate_code = #{certificateCode},</if>
<if test="subDeptGroup != null">sub_dept_group = #{subDeptGroup},</if> <if test="subDeptGroup != null">sub_dept_group = #{subDeptGroup},</if>
<if test="subDeptGroupName != null">sub_dept_group_name = #{subDeptGroupName},</if> <if test="subDeptGroupName != null">sub_dept_group_name = #{subDeptGroupName},</if>
<if test="craftType != null">craft_type = #{craftType},</if> <if test="craftType != null">craft_type = #{craftType},</if>
<if test="craftPost != null">craft_post = #{craftPost},</if> <if test="craftPost != null">craft_post = #{craftPost},</if>
<if test="nation != null">nation = #{nation},</if>
<if test="age != null">age = #{age},</if>
<if test="sex != null">sex = #{sex},</if>
<if test="educationalType != null">educational_type = #{educationalType},</if>
<if test="birthDay != null">birth_day = #{birthDay},</if>
<if test="nativePlace != null">native_place = #{nativePlace},</if>
<if test="address != null">address = #{address},</if>
<if test="emergencyContact != null">emergency_contact = #{emergencyContact},</if>
<if test="contactPhone != null">contact_phone = #{contactPhone},</if>
<if test="bankName != null">bank_name = #{bankName},</if>
<if test="bankCardNo != null">bank_card_no = #{bankCardNo},</if>
<if test="bankOffice != null">bank_office = #{bankOffice},</if>
<if test="certificatePhoto1 != null">certificate_photo1 = #{certificatePhoto1},</if>
<if test="certificatePhoto2 != null">certificate_photo2 = #{certificatePhoto2},</if>
<if test="admitGuid != null">admit_guid = #{admitGuid},</if>
<if test="faceImage != null">face_image = #{faceImage},</if>
<if test="eduStatus != null">edu_status = #{eduStatus},</if> <if test="eduStatus != null">edu_status = #{eduStatus},</if>
<if test="eduFilePath != null">edu_file_path = #{eduFilePath},</if> <if test="eduFilePath != null">edu_file_path = #{eduFilePath},</if>
<if test="eduSignPath != null">edu_sign_path = #{eduSignPath},</if> <if test="eduSignPath != null">edu_sign_path = #{eduSignPath},</if>
@ -246,7 +158,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="subStep != null">sub_step = #{subStep},</if> <if test="subStep != null">sub_step = #{subStep},</if>
<if test="illnessStatus != null">illness_status = #{illnessStatus},</if> <if test="illnessStatus != null">illness_status = #{illnessStatus},</if>
<if test="supIllnessStatus != null">sup_illness_status = #{supIllnessStatus},</if> <if test="supIllnessStatus != null">sup_illness_status = #{supIllnessStatus},</if>
<if test="hasRegister != null">has_register = #{hasRegister},</if>
<if test="isDel != null">is_del = #{isDel},</if> <if test="isDel != null">is_del = #{isDel},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>

6
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java
View File

@ -9,11 +9,13 @@ import com.yanzhu.common.log.enums.BusinessType;
import com.yanzhu.common.security.annotation.RequiresPermissions; import com.yanzhu.common.security.annotation.RequiresPermissions;
import com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers; import com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers;
import com.yanzhu.manage.service.IProProjectInfoSubdeptsUsersService; import com.yanzhu.manage.service.IProProjectInfoSubdeptsUsersService;
import com.yanzhu.system.api.domain.SysUser;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 分包单位工人Controller * 分包单位工人Controller
@ -69,9 +71,9 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController
@RequiresPermissions("manage:proProjectInfoSubdeptsUsers:add") @RequiresPermissions("manage:proProjectInfoSubdeptsUsers:add")
@Log(title = "分包单位工人", businessType = BusinessType.INSERT) @Log(title = "分包单位工人", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers) public AjaxResult add(@RequestBody ProProjectInfoSubdeptsUsers ppUser)
{ {
return toAjax(proProjectInfoSubdeptsUsersService.insertProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers)); return toAjax(proProjectInfoSubdeptsUsersService.insertProProjectInfoSubdeptsUsers(ppUser));
} }
/** /**

14
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
View File

@ -1,10 +1,13 @@
package com.yanzhu.manage.service.impl; package com.yanzhu.manage.service.impl;
import com.yanzhu.common.core.constant.SecurityConstants;
import com.yanzhu.common.core.context.SecurityContextHolder; import com.yanzhu.common.core.context.SecurityContextHolder;
import com.yanzhu.common.core.utils.DateUtils; import com.yanzhu.common.core.utils.DateUtils;
import com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers; import com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers;
import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsUsersMapper; import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsUsersMapper;
import com.yanzhu.manage.service.IProProjectInfoSubdeptsUsersService; import com.yanzhu.manage.service.IProProjectInfoSubdeptsUsersService;
import com.yanzhu.system.api.RemoteUserService;
import com.yanzhu.system.api.domain.SysUser;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -22,6 +25,9 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
@Autowired @Autowired
private ProProjectInfoSubdeptsUsersMapper proProjectInfoSubdeptsUsersMapper; private ProProjectInfoSubdeptsUsersMapper proProjectInfoSubdeptsUsersMapper;
@Autowired
private RemoteUserService remoteUserService;
/** /**
* 查询分包单位工人 * 查询分包单位工人
* *
@ -57,6 +63,14 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
{ {
proProjectInfoSubdeptsUsers.setCreateTime(DateUtils.getNowDate()); proProjectInfoSubdeptsUsers.setCreateTime(DateUtils.getNowDate());
proProjectInfoSubdeptsUsers.setCreateBy(SecurityContextHolder.getUserName()); proProjectInfoSubdeptsUsers.setCreateBy(SecurityContextHolder.getUserName());
SysUser user=proProjectInfoSubdeptsUsers.getUser();
if(user.getUserId()==null||user.getUserId().intValue()==0){
Long userId= remoteUserService.registerUserInfo(user, SecurityConstants.INNER).getData();
user.setUserId(userId);
proProjectInfoSubdeptsUsers.setUserId(userId);
}else{
remoteUserService.updateUserInfo(user,SecurityConstants.INNER).getData();
}
return proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); return proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers);
} }

89
yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
View File

@ -91,9 +91,18 @@
v-model:limit="queryParams.pageSize" @pagination="getList" /> v-model:limit="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改分包单位工人对话框 --> <!-- 添加或修改分包单位工人对话框 -->
<el-drawer :title="title" v-model="open" size="960px" class="edit-drawer"> <el-drawer v-model="open" size="960px" class="edit-drawer">
<el-form ref="proProjectInfoSubdeptsUsersRef" :model="form" :rules="rules" label-width="120px"> <template #header>
<el-row> <div style="position: relative;">{{ title }}</div>
</template>
<el-form ref="proProjectInfoSubdeptsUsersRef" :model="form" :rules="rules" label-width="120px" style="position: relative;">
<div style="width: 50%;">
<el-form-item label="联系电话" prop="userPhone">
<el-input v-model="form.userPhone" placeholder="请输入联系电话" minlength="11" maxlength="11" style="width: 200px;" />
<el-button type="primary" style="margin-left:10px;" @click="queryPhone">查询</el-button>
</el-form-item>
</div>
<el-row v-if="data.phoneState">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属项目"> <el-form-item label="所属项目">
<el-tag effect="plain">{{ form.projectName }}</el-tag> <el-tag effect="plain">{{ form.projectName }}</el-tag>
@ -111,11 +120,7 @@
<el-input v-model="form.userName" placeholder="请输入姓名" /> <el-input v-model="form.userName" placeholder="请输入姓名" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="userPhone">
<el-input v-model="form.userPhone" placeholder="请输入联系电话" />
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="证件号码" prop="certificateCode" class="fi-certificate"> <el-form-item label="证件号码" prop="certificateCode" class="fi-certificate">
<el-select v-model="form.certificateType"> <el-select v-model="form.certificateType">
@ -156,9 +161,6 @@
<el-option v-for="(it, idx) in data.nationOpts" :key="idx" :label="it" :value="it" /> <el-option v-for="(it, idx) in data.nationOpts" :key="idx" :label="it" :value="it" />
</el-select> </el-select>
</el-form-item></el-col> </el-form-item></el-col>
<el-col :span="12"><el-form-item label="年龄">
<el-input-number v-model="form.age" :min="16" :max="100" />
</el-form-item></el-col>
<el-col :span="12"><el-form-item label="性别"> <el-col :span="12"><el-form-item label="性别">
<el-radio-group v-model="form.sex"> <el-radio-group v-model="form.sex">
<el-radio v-for="(it, idx) in data.sexOpts" :key="idx" :label="it" :value="it">{{ it }}</el-radio> <el-radio v-for="(it, idx) in data.sexOpts" :key="idx" :label="it" :value="it">{{ it }}</el-radio>
@ -213,7 +215,6 @@
</el-col> </el-col>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<template #footer> <template #footer>
@ -230,6 +231,7 @@
import { listProProjectInfoSubdeptsUsers, getProProjectInfoSubdeptsUsers, delProProjectInfoSubdeptsUsers, addProProjectInfoSubdeptsUsers, updateProProjectInfoSubdeptsUsers } from "@/api/manage/proProjectInfoSubdeptsUsers"; import { listProProjectInfoSubdeptsUsers, getProProjectInfoSubdeptsUsers, delProProjectInfoSubdeptsUsers, addProProjectInfoSubdeptsUsers, updateProProjectInfoSubdeptsUsers } from "@/api/manage/proProjectInfoSubdeptsUsers";
import { listProProjectInfoSubdepts } from "@/api/manage/proProjectInfoSubdepts"; import { listProProjectInfoSubdepts } from "@/api/manage/proProjectInfoSubdepts";
import { listProProjectInfoSubdeptsGroup } from "@/api/manage/proProjectInfoSubdeptsGroup"; import { listProProjectInfoSubdeptsGroup } from "@/api/manage/proProjectInfoSubdeptsGroup";
import { listUser } from "@/api/system/user";
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
const userStore = useUserStore() const userStore = useUserStore()
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
@ -245,6 +247,13 @@ const multiple = ref(true);
const total = ref(0); const total = ref(0);
const title = ref(""); const title = ref("");
const validatePhone=(rule, value, callback)=>{
if(!/^1\d{10}$/.test(value)){
callback(new Error('请输入有效手机号码!'))
}else{
callback()
}
}
const data = reactive({ const data = reactive({
form: {}, form: {},
queryParams: { queryParams: {
@ -274,7 +283,10 @@ const data = reactive({
rules: { rules: {
subDeptId: [{ required: true, trigger: ['blur', 'change'], message: "请选择所属单位" }], subDeptId: [{ required: true, trigger: ['blur', 'change'], message: "请选择所属单位" }],
userName: [{ required: true, trigger: ['blur', 'change'], message: "请输入姓名" }], userName: [{ required: true, trigger: ['blur', 'change'], message: "请输入姓名" }],
userPhone: [{ required: true, trigger: ['blur', 'change'], message: "请输入联系电话" }], userPhone: [
{ required: true, trigger: ['blur', 'change'], message: "请输入手机号码" },
{ min: 11, max: 11, message: '请输入有效手机号码', trigger: 'blur' },
{ validator: validatePhone, trigger: 'blur' }],
certificateCode: [{ required: true, trigger: ['blur', 'change'], message: "请输入证件号码" }], certificateCode: [{ required: true, trigger: ['blur', 'change'], message: "请输入证件号码" }],
craftPost: [{ required: true, trigger: ['blur', 'change'], message: "请输选择工种" }], craftPost: [{ required: true, trigger: ['blur', 'change'], message: "请输选择工种" }],
identificationCard: [{ required: true, trigger: ['blur', 'change'], message: "请上传身份证信息" }], identificationCard: [{ required: true, trigger: ['blur', 'change'], message: "请上传身份证信息" }],
@ -287,6 +299,8 @@ const data = reactive({
nationOpts: '汉族,壮族,满族,回族,苗族,维吾尔族,土家族,彝族,蒙古族,藏族,布依族,侗族,瑶族,朝鲜族,白族,哈尼族,哈萨克族,黎族,傣族,畲族,傈僳族,仡佬族,东乡族,高山族,拉祜族,水族,佤族,纳西族,羌族,土族,仫佬族,锡伯族,柯尔克孜族,达斡尔族,景颇族,毛南族,撒拉族,布朗族,塔吉克族,阿昌族,普米族,鄂温克族,怒族,京族,基诺族,德昂族,保安族,俄罗斯族,裕固族,乌孜别克族,门巴族,鄂伦春族,独龙族,塔塔尔族,赫哲族,珞巴族'.split(","), nationOpts: '汉族,壮族,满族,回族,苗族,维吾尔族,土家族,彝族,蒙古族,藏族,布依族,侗族,瑶族,朝鲜族,白族,哈尼族,哈萨克族,黎族,傣族,畲族,傈僳族,仡佬族,东乡族,高山族,拉祜族,水族,佤族,纳西族,羌族,土族,仫佬族,锡伯族,柯尔克孜族,达斡尔族,景颇族,毛南族,撒拉族,布朗族,塔吉克族,阿昌族,普米族,鄂温克族,怒族,京族,基诺族,德昂族,保安族,俄罗斯族,裕固族,乌孜别克族,门巴族,鄂伦春族,独龙族,塔塔尔族,赫哲族,珞巴族'.split(","),
sexOpts: "男,女".split(","), sexOpts: "男,女".split(","),
isManager: false, isManager: false,
phoneState:'',
userInfo:null,
}); });
const { queryParams, form, rules } = toRefs(data); const { queryParams, form, rules } = toRefs(data);
@ -298,6 +312,23 @@ function doImageUpload() {
}, 800); }, 800);
} }
//查询手机号码
function queryPhone(){
listUser({phonenumber:form.value.userPhone}).then(d=>{
if(d.rows.length>0){
let user=d.rows[0];
data.userInfo=user;
data.phoneState="edit";
form.value.userName=user.nickName||''
form.value.certificateType=user.cardType||'';
form.value.certificateCode=user.cardCode||''
}else{
data.userInfo=null;
data.phoneState="add";
}
});
}
/** 查询分包单位工人列表 */ /** 查询分包单位工人列表 */
function getList() { function getList() {
loading.value = true; loading.value = true;
@ -324,7 +355,7 @@ function reset() {
userName: null,//姓名 userName: null,//姓名
userPhone: "",//联系电话 userPhone: "",//联系电话
certificateType: '',//证件号码 certificateType: '',//证件号码
certificateCode: '',//请输入证件号码 certificateCode: '',//证件号码
subDeptGroup: '',//班组ID subDeptGroup: '',//班组ID
groupName: '',//班组名称 groupName: '',//班组名称
craftTypeName: '',//岗位 craftTypeName: '',//岗位
@ -345,6 +376,8 @@ function reset() {
bankOffice: '',//开户网点 bankOffice: '',//开户网点
}; };
proxy.resetForm("proProjectInfoSubdeptsUsersRef"); proxy.resetForm("proProjectInfoSubdeptsUsersRef");
data.phoneState="";
data.userInfo=null;
} }
//选择所属单位 //选择所属单位
function doSubDeptChange(type) { function doSubDeptChange(type) {
@ -490,6 +523,34 @@ function submitForm() {
form.value.comId = depts.length > 0 ? depts[0].comId : ''; form.value.comId = depts.length > 0 ? depts[0].comId : '';
let groups = data.deptGroups.filter(d => d.id == form.value.subDeptGroup); let groups = data.deptGroups.filter(d => d.id == form.value.subDeptGroup);
form.value.subDeptGroupName = groups.length > 0 ? groups[0].groupName : ''; form.value.subDeptGroupName = groups.length > 0 ? groups[0].groupName : '';
form.value.userId=data.userInfo?data.userInfo.userId:'';
form.value.user={
userId:data.userInfo?data.userInfo.userId:'',
comId:form.value.comId,
deptId:form.value.projectId,
nickName:form.value.userName,
userName:form.value.userName,
userType:99,
cardType:form.value.certificateType,
cardCode:form.value.certificateCode,
userPicture:form.value.faceImage,
cardImgPos:form.value.certificatePhoto1,
cardImgInv:form.value.certificatePhoto2,
userInfos:JSON.stringify({nation:form.value.nation,
educationalType:form.value.educationalType,
birthDay:form.value.birthDay,
nativePlace:form.value.nativePlace,
address:form.value.address,
emergencyContact:form.value.emergencyContact,
contactPhone:form.value.contactPhone,
bankName:form.value.bankName,
bankCardNo:form.value.bankCardNo,
bankOffice:form.value.bankOffice
}),
phonenumber:form.value.userPhone,
sex:form.value.sex,
avatar:form.value.faceImage
};
if (form.value.id != null) { if (form.value.id != null) {
updateProProjectInfoSubdeptsUsers(form.value).then(response => { updateProProjectInfoSubdeptsUsers(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功"); proxy.$modal.msgSuccess("修改成功");