src/main/java/com/hz/employmentsite/mapper/PcJobuserMapper.java

@@ -1,30 +0,0 @@
-package com.hz.employmentsite.mapper;
-
-import com.hz.employmentsite.model.PcJobuser;
-import com.hz.employmentsite.model.PcJobuserExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface PcJobuserMapper {
-    long countByExample(PcJobuserExample example);
-
-    int deleteByExample(PcJobuserExample example);
-
-    int deleteByPrimaryKey(String jobuserID);
-
-    int insert(PcJobuser row);
-
-    int insertSelective(PcJobuser row);
-
-    List<PcJobuser> selectByExample(PcJobuserExample example);
-
-    PcJobuser selectByPrimaryKey(String jobuserID);
-
-    int updateByExampleSelective(@Param("row") PcJobuser row, @Param("example") PcJobuserExample example);
-
-    int updateByExample(@Param("row") PcJobuser row, @Param("example") PcJobuserExample example);
-
-    int updateByPrimaryKeySelective(PcJobuser row);
-
-    int updateByPrimaryKey(PcJobuser row);
-}

src/main/java/com/hz/employmentsite/model/PcJobuser.java

@@ -1,355 +0,0 @@
-package com.hz.employmentsite.model;
-
-import java.util.Date;
-
-public class PcJobuser {
-    private String jobuserID;
-
-    private String siteID;
-
-    private String identityNumber;
-
-    private String name;
-
-    private String pyName;
-
-    private String engName;
-
-    private Integer sex;
-
-    private String notion;
-
-    private String politicsLook;
-
-    private String birthplace;
-
-    private Date birthDay;
-
-    private String familyNature;
-
-    private String cultureRank;
-
-    private String health;
-
-    private String bloodType;
-
-    private String height;
-
-    private String vision;
-
-    private String weight;
-
-    private String maritalStatus;
-
-    private String province;
-
-    private String city;
-
-    private String region;
-
-    private String userName;
-
-    private String userMobile;
-
-    private String address;
-
-    private String familyAddress;
-
-    private String postalCode;
-
-    private String email;
-
-    private String hobby;
-
-    private Integer jobStatus;
-
-    private Integer keyPersonTypeID;
-
-    private String createUserID;
-
-    private Date createTime;
-
-    private String modifyUserID;
-
-    private Date modifyTime;
-
-    public String getJobuserID() {
-        return jobuserID;
-    }
-
-    public void setJobuserID(String jobuserID) {
-        this.jobuserID = jobuserID == null ? null : jobuserID.trim();
-    }
-
-    public String getSiteID() {
-        return siteID;
-    }
-
-    public void setSiteID(String siteID) {
-        this.siteID = siteID == null ? null : siteID.trim();
-    }
-
-    public String getIdentityNumber() {
-        return identityNumber;
-    }
-
-    public void setIdentityNumber(String identityNumber) {
-        this.identityNumber = identityNumber == null ? null : identityNumber.trim();
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name == null ? null : name.trim();
-    }
-
-    public String getPyName() {
-        return pyName;
-    }
-
-    public void setPyName(String pyName) {
-        this.pyName = pyName == null ? null : pyName.trim();
-    }
-
-    public String getEngName() {
-        return engName;
-    }
-
-    public void setEngName(String engName) {
-        this.engName = engName == null ? null : engName.trim();
-    }
-
-    public Integer getSex() {
-        return sex;
-    }
-
-    public void setSex(Integer sex) {
-        this.sex = sex;
-    }
-
-    public String getNotion() {
-        return notion;
-    }
-
-    public void setNotion(String notion) {
-        this.notion = notion == null ? null : notion.trim();
-    }
-
-    public String getPoliticsLook() {
-        return politicsLook;
-    }
-
-    public void setPoliticsLook(String politicsLook) {
-        this.politicsLook = politicsLook == null ? null : politicsLook.trim();
-    }
-
-    public String getBirthplace() {
-        return birthplace;
-    }
-
-    public void setBirthplace(String birthplace) {
-        this.birthplace = birthplace == null ? null : birthplace.trim();
-    }
-
-    public Date getBirthDay() {
-        return birthDay;
-    }
-
-    public void setBirthDay(Date birthDay) {
-        this.birthDay = birthDay;
-    }
-
-    public String getFamilyNature() {
-        return familyNature;
-    }
-
-    public void setFamilyNature(String familyNature) {
-        this.familyNature = familyNature == null ? null : familyNature.trim();
-    }
-
-    public String getCultureRank() {
-        return cultureRank;
-    }
-
-    public void setCultureRank(String cultureRank) {
-        this.cultureRank = cultureRank == null ? null : cultureRank.trim();
-    }
-
-    public String getHealth() {
-        return health;
-    }
-
-    public void setHealth(String health) {
-        this.health = health == null ? null : health.trim();
-    }
-
-    public String getBloodType() {
-        return bloodType;
-    }
-
-    public void setBloodType(String bloodType) {
-        this.bloodType = bloodType == null ? null : bloodType.trim();
-    }
-
-    public String getHeight() {
-        return height;
-    }
-
-    public void setHeight(String height) {
-        this.height = height == null ? null : height.trim();
-    }
-
-    public String getVision() {
-        return vision;
-    }
-
-    public void setVision(String vision) {
-        this.vision = vision == null ? null : vision.trim();
-    }
-
-    public String getWeight() {
-        return weight;
-    }
-
-    public void setWeight(String weight) {
-        this.weight = weight == null ? null : weight.trim();
-    }
-
-    public String getMaritalStatus() {
-        return maritalStatus;
-    }
-
-    public void setMaritalStatus(String maritalStatus) {
-        this.maritalStatus = maritalStatus == null ? null : maritalStatus.trim();
-    }
-
-    public String getProvince() {
-        return province;
-    }
-
-    public void setProvince(String province) {
-        this.province = province == null ? null : province.trim();
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city == null ? null : city.trim();
-    }
-
-    public String getRegion() {
-        return region;
-    }
-
-    public void setRegion(String region) {
-        this.region = region == null ? null : region.trim();
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName == null ? null : userName.trim();
-    }
-
-    public String getUserMobile() {
-        return userMobile;
-    }
-
-    public void setUserMobile(String userMobile) {
-        this.userMobile = userMobile == null ? null : userMobile.trim();
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address == null ? null : address.trim();
-    }
-
-    public String getFamilyAddress() {
-        return familyAddress;
-    }
-
-    public void setFamilyAddress(String familyAddress) {
-        this.familyAddress = familyAddress == null ? null : familyAddress.trim();
-    }
-
-    public String getPostalCode() {
-        return postalCode;
-    }
-
-    public void setPostalCode(String postalCode) {
-        this.postalCode = postalCode == null ? null : postalCode.trim();
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email == null ? null : email.trim();
-    }
-
-    public String getHobby() {
-        return hobby;
-    }
-
-    public void setHobby(String hobby) {
-        this.hobby = hobby == null ? null : hobby.trim();
-    }
-
-    public Integer getJobStatus() {
-        return jobStatus;
-    }
-
-    public void setJobStatus(Integer jobStatus) {
-        this.jobStatus = jobStatus;
-    }
-
-    public Integer getKeyPersonTypeID() {
-        return keyPersonTypeID;
-    }
-
-    public void setKeyPersonTypeID(Integer keyPersonTypeID) {
-        this.keyPersonTypeID = keyPersonTypeID;
-    }
-
-    public String getCreateUserID() {
-        return createUserID;
-    }
-
-    public void setCreateUserID(String createUserID) {
-        this.createUserID = createUserID == null ? null : createUserID.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getModifyUserID() {
-        return modifyUserID;
-    }
-
-    public void setModifyUserID(String modifyUserID) {
-        this.modifyUserID = modifyUserID == null ? null : modifyUserID.trim();
-    }
-
-    public Date getModifyTime() {
-        return modifyTime;
-    }
-
-    public void setModifyTime(Date modifyTime) {
-        this.modifyTime = modifyTime;
-    }
-}

src/main/java/com/hz/employmentsite/vo/jobUserManager/JobUserVo.java

@@ -1,19 +1,13 @@
 package com.hz.employmentsite.vo.jobUserManager;
 
+import com.hz.employmentsite.model.PcJobuser;
 import lombok.Data;
 
 @Data
-public class JobUserVo {
-    public String jobUserId;
-    public String name;
-    public String IdCard;
-    public String sexName;
-    public String nationTypeName;
-    public String mobile;
+public class JobUserVo extends PcJobuser {
+    public String genderName;
+    public String cultureName;
     public String siteName;
-    public Integer age;
-    public String educationName;
-    public String address;
     public String jobStatusName;
-    public String emphasisTypeName;
+    public String keyTypeName;
 }

src/main/resources/generatorConfig.xml

@@ -101,6 +101,7 @@
         <table schema="" tableName="pc_post"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_company"><property name="useActualColumnNames" value="true"/></table>
         -->
+<!--        <table schema="" tableName="pc_jobuser"><property name="useActualColumnNames" value="true"/></table>-->
 
 
     </context>

src/main/resources/mapping/PcJobuserMapper.xml

@@ -1,685 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hz.employmentsite.mapper.PcJobuserMapper">
-  <resultMap id="BaseResultMap" type="com.hz.employmentsite.model.PcJobuser">
-    <id column="JobuserID" jdbcType="VARCHAR" property="jobuserID" />
-    <result column="SiteID" jdbcType="VARCHAR" property="siteID" />
-    <result column="IdentityNumber" jdbcType="VARCHAR" property="identityNumber" />
-    <result column="Name" jdbcType="VARCHAR" property="name" />
-    <result column="PyName" jdbcType="VARCHAR" property="pyName" />
-    <result column="EngName" jdbcType="VARCHAR" property="engName" />
-    <result column="Sex" jdbcType="INTEGER" property="sex" />
-    <result column="Notion" jdbcType="VARCHAR" property="notion" />
-    <result column="PoliticsLook" jdbcType="VARCHAR" property="politicsLook" />
-    <result column="Birthplace" jdbcType="VARCHAR" property="birthplace" />
-    <result column="BirthDay" jdbcType="TIMESTAMP" property="birthDay" />
-    <result column="FamilyNature" jdbcType="VARCHAR" property="familyNature" />
-    <result column="CultureRank" jdbcType="VARCHAR" property="cultureRank" />
-    <result column="Health" jdbcType="VARCHAR" property="health" />
-    <result column="BloodType" jdbcType="VARCHAR" property="bloodType" />
-    <result column="Height" jdbcType="VARCHAR" property="height" />
-    <result column="Vision" jdbcType="VARCHAR" property="vision" />
-    <result column="Weight" jdbcType="VARCHAR" property="weight" />
-    <result column="MaritalStatus" jdbcType="VARCHAR" property="maritalStatus" />
-    <result column="Province" jdbcType="VARCHAR" property="province" />
-    <result column="City" jdbcType="VARCHAR" property="city" />
-    <result column="Region" jdbcType="VARCHAR" property="region" />
-    <result column="UserName" jdbcType="VARCHAR" property="userName" />
-    <result column="UserMobile" jdbcType="VARCHAR" property="userMobile" />
-    <result column="Address" jdbcType="VARCHAR" property="address" />
-    <result column="FamilyAddress" jdbcType="VARCHAR" property="familyAddress" />
-    <result column="PostalCode" jdbcType="VARCHAR" property="postalCode" />
-    <result column="Email" jdbcType="VARCHAR" property="email" />
-    <result column="Hobby" jdbcType="VARCHAR" property="hobby" />
-    <result column="JobStatus" jdbcType="INTEGER" property="jobStatus" />
-    <result column="KeyPersonTypeID" jdbcType="INTEGER" property="keyPersonTypeID" />
-    <result column="CreateUserID" jdbcType="VARCHAR" property="createUserID" />
-    <result column="CreateTime" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="ModifyUserID" jdbcType="VARCHAR" property="modifyUserID" />
-    <result column="ModifyTime" jdbcType="TIMESTAMP" property="modifyTime" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    JobuserID, SiteID, IdentityNumber, Name, PyName, EngName, Sex, Notion, PoliticsLook, 
-    Birthplace, BirthDay, FamilyNature, CultureRank, Health, BloodType, Height, Vision, 
-    Weight, MaritalStatus, Province, City, Region, UserName, UserMobile, Address, FamilyAddress, 
-    PostalCode, Email, Hobby, JobStatus, KeyPersonTypeID, CreateUserID, CreateTime, ModifyUserID, 
-    ModifyTime
-  </sql>
-  <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcJobuserExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from pc_jobuser
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from pc_jobuser
-    where JobuserID = #{jobuserID,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from pc_jobuser
-    where JobuserID = #{jobuserID,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.hz.employmentsite.model.PcJobuserExample">
-    delete from pc_jobuser
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.hz.employmentsite.model.PcJobuser">
-    insert into pc_jobuser (JobuserID, SiteID, IdentityNumber, 
-      Name, PyName, EngName, 
-      Sex, Notion, PoliticsLook, 
-      Birthplace, BirthDay, FamilyNature, 
-      CultureRank, Health, BloodType, 
-      Height, Vision, Weight, 
-      MaritalStatus, Province, City, 
-      Region, UserName, UserMobile, 
-      Address, FamilyAddress, PostalCode, 
-      Email, Hobby, JobStatus, 
-      KeyPersonTypeID, CreateUserID, CreateTime, 
-      ModifyUserID, ModifyTime)
-    values (#{jobuserID,jdbcType=VARCHAR}, #{siteID,jdbcType=VARCHAR}, #{identityNumber,jdbcType=VARCHAR}, 
-      #{name,jdbcType=VARCHAR}, #{pyName,jdbcType=VARCHAR}, #{engName,jdbcType=VARCHAR}, 
-      #{sex,jdbcType=INTEGER}, #{notion,jdbcType=VARCHAR}, #{politicsLook,jdbcType=VARCHAR}, 
-      #{birthplace,jdbcType=VARCHAR}, #{birthDay,jdbcType=TIMESTAMP}, #{familyNature,jdbcType=VARCHAR}, 
-      #{cultureRank,jdbcType=VARCHAR}, #{health,jdbcType=VARCHAR}, #{bloodType,jdbcType=VARCHAR}, 
-      #{height,jdbcType=VARCHAR}, #{vision,jdbcType=VARCHAR}, #{weight,jdbcType=VARCHAR}, 
-      #{maritalStatus,jdbcType=VARCHAR}, #{province,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, 
-      #{region,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{userMobile,jdbcType=VARCHAR}, 
-      #{address,jdbcType=VARCHAR}, #{familyAddress,jdbcType=VARCHAR}, #{postalCode,jdbcType=VARCHAR}, 
-      #{email,jdbcType=VARCHAR}, #{hobby,jdbcType=VARCHAR}, #{jobStatus,jdbcType=INTEGER}, 
-      #{keyPersonTypeID,jdbcType=INTEGER}, #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcJobuser">
-    insert into pc_jobuser
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="jobuserID != null">
-        JobuserID,
-      </if>
-      <if test="siteID != null">
-        SiteID,
-      </if>
-      <if test="identityNumber != null">
-        IdentityNumber,
-      </if>
-      <if test="name != null">
-        Name,
-      </if>
-      <if test="pyName != null">
-        PyName,
-      </if>
-      <if test="engName != null">
-        EngName,
-      </if>
-      <if test="sex != null">
-        Sex,
-      </if>
-      <if test="notion != null">
-        Notion,
-      </if>
-      <if test="politicsLook != null">
-        PoliticsLook,
-      </if>
-      <if test="birthplace != null">
-        Birthplace,
-      </if>
-      <if test="birthDay != null">
-        BirthDay,
-      </if>
-      <if test="familyNature != null">
-        FamilyNature,
-      </if>
-      <if test="cultureRank != null">
-        CultureRank,
-      </if>
-      <if test="health != null">
-        Health,
-      </if>
-      <if test="bloodType != null">
-        BloodType,
-      </if>
-      <if test="height != null">
-        Height,
-      </if>
-      <if test="vision != null">
-        Vision,
-      </if>
-      <if test="weight != null">
-        Weight,
-      </if>
-      <if test="maritalStatus != null">
-        MaritalStatus,
-      </if>
-      <if test="province != null">
-        Province,
-      </if>
-      <if test="city != null">
-        City,
-      </if>
-      <if test="region != null">
-        Region,
-      </if>
-      <if test="userName != null">
-        UserName,
-      </if>
-      <if test="userMobile != null">
-        UserMobile,
-      </if>
-      <if test="address != null">
-        Address,
-      </if>
-      <if test="familyAddress != null">
-        FamilyAddress,
-      </if>
-      <if test="postalCode != null">
-        PostalCode,
-      </if>
-      <if test="email != null">
-        Email,
-      </if>
-      <if test="hobby != null">
-        Hobby,
-      </if>
-      <if test="jobStatus != null">
-        JobStatus,
-      </if>
-      <if test="keyPersonTypeID != null">
-        KeyPersonTypeID,
-      </if>
-      <if test="createUserID != null">
-        CreateUserID,
-      </if>
-      <if test="createTime != null">
-        CreateTime,
-      </if>
-      <if test="modifyUserID != null">
-        ModifyUserID,
-      </if>
-      <if test="modifyTime != null">
-        ModifyTime,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="jobuserID != null">
-        #{jobuserID,jdbcType=VARCHAR},
-      </if>
-      <if test="siteID != null">
-        #{siteID,jdbcType=VARCHAR},
-      </if>
-      <if test="identityNumber != null">
-        #{identityNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="pyName != null">
-        #{pyName,jdbcType=VARCHAR},
-      </if>
-      <if test="engName != null">
-        #{engName,jdbcType=VARCHAR},
-      </if>
-      <if test="sex != null">
-        #{sex,jdbcType=INTEGER},
-      </if>
-      <if test="notion != null">
-        #{notion,jdbcType=VARCHAR},
-      </if>
-      <if test="politicsLook != null">
-        #{politicsLook,jdbcType=VARCHAR},
-      </if>
-      <if test="birthplace != null">
-        #{birthplace,jdbcType=VARCHAR},
-      </if>
-      <if test="birthDay != null">
-        #{birthDay,jdbcType=TIMESTAMP},
-      </if>
-      <if test="familyNature != null">
-        #{familyNature,jdbcType=VARCHAR},
-      </if>
-      <if test="cultureRank != null">
-        #{cultureRank,jdbcType=VARCHAR},
-      </if>
-      <if test="health != null">
-        #{health,jdbcType=VARCHAR},
-      </if>
-      <if test="bloodType != null">
-        #{bloodType,jdbcType=VARCHAR},
-      </if>
-      <if test="height != null">
-        #{height,jdbcType=VARCHAR},
-      </if>
-      <if test="vision != null">
-        #{vision,jdbcType=VARCHAR},
-      </if>
-      <if test="weight != null">
-        #{weight,jdbcType=VARCHAR},
-      </if>
-      <if test="maritalStatus != null">
-        #{maritalStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="province != null">
-        #{province,jdbcType=VARCHAR},
-      </if>
-      <if test="city != null">
-        #{city,jdbcType=VARCHAR},
-      </if>
-      <if test="region != null">
-        #{region,jdbcType=VARCHAR},
-      </if>
-      <if test="userName != null">
-        #{userName,jdbcType=VARCHAR},
-      </if>
-      <if test="userMobile != null">
-        #{userMobile,jdbcType=VARCHAR},
-      </if>
-      <if test="address != null">
-        #{address,jdbcType=VARCHAR},
-      </if>
-      <if test="familyAddress != null">
-        #{familyAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="postalCode != null">
-        #{postalCode,jdbcType=VARCHAR},
-      </if>
-      <if test="email != null">
-        #{email,jdbcType=VARCHAR},
-      </if>
-      <if test="hobby != null">
-        #{hobby,jdbcType=VARCHAR},
-      </if>
-      <if test="jobStatus != null">
-        #{jobStatus,jdbcType=INTEGER},
-      </if>
-      <if test="keyPersonTypeID != null">
-        #{keyPersonTypeID,jdbcType=INTEGER},
-      </if>
-      <if test="createUserID != null">
-        #{createUserID,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="modifyUserID != null">
-        #{modifyUserID,jdbcType=VARCHAR},
-      </if>
-      <if test="modifyTime != null">
-        #{modifyTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.hz.employmentsite.model.PcJobuserExample" resultType="java.lang.Long">
-    select count(*) from pc_jobuser
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update pc_jobuser
-    <set>
-      <if test="row.jobuserID != null">
-        JobuserID = #{row.jobuserID,jdbcType=VARCHAR},
-      </if>
-      <if test="row.siteID != null">
-        SiteID = #{row.siteID,jdbcType=VARCHAR},
-      </if>
-      <if test="row.identityNumber != null">
-        IdentityNumber = #{row.identityNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="row.name != null">
-        Name = #{row.name,jdbcType=VARCHAR},
-      </if>
-      <if test="row.pyName != null">
-        PyName = #{row.pyName,jdbcType=VARCHAR},
-      </if>
-      <if test="row.engName != null">
-        EngName = #{row.engName,jdbcType=VARCHAR},
-      </if>
-      <if test="row.sex != null">
-        Sex = #{row.sex,jdbcType=INTEGER},
-      </if>
-      <if test="row.notion != null">
-        Notion = #{row.notion,jdbcType=VARCHAR},
-      </if>
-      <if test="row.politicsLook != null">
-        PoliticsLook = #{row.politicsLook,jdbcType=VARCHAR},
-      </if>
-      <if test="row.birthplace != null">
-        Birthplace = #{row.birthplace,jdbcType=VARCHAR},
-      </if>
-      <if test="row.birthDay != null">
-        BirthDay = #{row.birthDay,jdbcType=TIMESTAMP},
-      </if>
-      <if test="row.familyNature != null">
-        FamilyNature = #{row.familyNature,jdbcType=VARCHAR},
-      </if>
-      <if test="row.cultureRank != null">
-        CultureRank = #{row.cultureRank,jdbcType=VARCHAR},
-      </if>
-      <if test="row.health != null">
-        Health = #{row.health,jdbcType=VARCHAR},
-      </if>
-      <if test="row.bloodType != null">
-        BloodType = #{row.bloodType,jdbcType=VARCHAR},
-      </if>
-      <if test="row.height != null">
-        Height = #{row.height,jdbcType=VARCHAR},
-      </if>
-      <if test="row.vision != null">
-        Vision = #{row.vision,jdbcType=VARCHAR},
-      </if>
-      <if test="row.weight != null">
-        Weight = #{row.weight,jdbcType=VARCHAR},
-      </if>
-      <if test="row.maritalStatus != null">
-        MaritalStatus = #{row.maritalStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="row.province != null">
-        Province = #{row.province,jdbcType=VARCHAR},
-      </if>
-      <if test="row.city != null">
-        City = #{row.city,jdbcType=VARCHAR},
-      </if>
-      <if test="row.region != null">
-        Region = #{row.region,jdbcType=VARCHAR},
-      </if>
-      <if test="row.userName != null">
-        UserName = #{row.userName,jdbcType=VARCHAR},
-      </if>
-      <if test="row.userMobile != null">
-        UserMobile = #{row.userMobile,jdbcType=VARCHAR},
-      </if>
-      <if test="row.address != null">
-        Address = #{row.address,jdbcType=VARCHAR},
-      </if>
-      <if test="row.familyAddress != null">
-        FamilyAddress = #{row.familyAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="row.postalCode != null">
-        PostalCode = #{row.postalCode,jdbcType=VARCHAR},
-      </if>
-      <if test="row.email != null">
-        Email = #{row.email,jdbcType=VARCHAR},
-      </if>
-      <if test="row.hobby != null">
-        Hobby = #{row.hobby,jdbcType=VARCHAR},
-      </if>
-      <if test="row.jobStatus != null">
-        JobStatus = #{row.jobStatus,jdbcType=INTEGER},
-      </if>
-      <if test="row.keyPersonTypeID != null">
-        KeyPersonTypeID = #{row.keyPersonTypeID,jdbcType=INTEGER},
-      </if>
-      <if test="row.createUserID != null">
-        CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
-      </if>
-      <if test="row.createTime != null">
-        CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="row.modifyUserID != null">
-        ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
-      </if>
-      <if test="row.modifyTime != null">
-        ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    <if test="example != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update pc_jobuser
-    set JobuserID = #{row.jobuserID,jdbcType=VARCHAR},
-      SiteID = #{row.siteID,jdbcType=VARCHAR},
-      IdentityNumber = #{row.identityNumber,jdbcType=VARCHAR},
-      Name = #{row.name,jdbcType=VARCHAR},
-      PyName = #{row.pyName,jdbcType=VARCHAR},
-      EngName = #{row.engName,jdbcType=VARCHAR},
-      Sex = #{row.sex,jdbcType=INTEGER},
-      Notion = #{row.notion,jdbcType=VARCHAR},
-      PoliticsLook = #{row.politicsLook,jdbcType=VARCHAR},
-      Birthplace = #{row.birthplace,jdbcType=VARCHAR},
-      BirthDay = #{row.birthDay,jdbcType=TIMESTAMP},
-      FamilyNature = #{row.familyNature,jdbcType=VARCHAR},
-      CultureRank = #{row.cultureRank,jdbcType=VARCHAR},
-      Health = #{row.health,jdbcType=VARCHAR},
-      BloodType = #{row.bloodType,jdbcType=VARCHAR},
-      Height = #{row.height,jdbcType=VARCHAR},
-      Vision = #{row.vision,jdbcType=VARCHAR},
-      Weight = #{row.weight,jdbcType=VARCHAR},
-      MaritalStatus = #{row.maritalStatus,jdbcType=VARCHAR},
-      Province = #{row.province,jdbcType=VARCHAR},
-      City = #{row.city,jdbcType=VARCHAR},
-      Region = #{row.region,jdbcType=VARCHAR},
-      UserName = #{row.userName,jdbcType=VARCHAR},
-      UserMobile = #{row.userMobile,jdbcType=VARCHAR},
-      Address = #{row.address,jdbcType=VARCHAR},
-      FamilyAddress = #{row.familyAddress,jdbcType=VARCHAR},
-      PostalCode = #{row.postalCode,jdbcType=VARCHAR},
-      Email = #{row.email,jdbcType=VARCHAR},
-      Hobby = #{row.hobby,jdbcType=VARCHAR},
-      JobStatus = #{row.jobStatus,jdbcType=INTEGER},
-      KeyPersonTypeID = #{row.keyPersonTypeID,jdbcType=INTEGER},
-      CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
-      CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
-      ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP}
-    <if test="example != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hz.employmentsite.model.PcJobuser">
-    update pc_jobuser
-    <set>
-      <if test="siteID != null">
-        SiteID = #{siteID,jdbcType=VARCHAR},
-      </if>
-      <if test="identityNumber != null">
-        IdentityNumber = #{identityNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        Name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="pyName != null">
-        PyName = #{pyName,jdbcType=VARCHAR},
-      </if>
-      <if test="engName != null">
-        EngName = #{engName,jdbcType=VARCHAR},
-      </if>
-      <if test="sex != null">
-        Sex = #{sex,jdbcType=INTEGER},
-      </if>
-      <if test="notion != null">
-        Notion = #{notion,jdbcType=VARCHAR},
-      </if>
-      <if test="politicsLook != null">
-        PoliticsLook = #{politicsLook,jdbcType=VARCHAR},
-      </if>
-      <if test="birthplace != null">
-        Birthplace = #{birthplace,jdbcType=VARCHAR},
-      </if>
-      <if test="birthDay != null">
-        BirthDay = #{birthDay,jdbcType=TIMESTAMP},
-      </if>
-      <if test="familyNature != null">
-        FamilyNature = #{familyNature,jdbcType=VARCHAR},
-      </if>
-      <if test="cultureRank != null">
-        CultureRank = #{cultureRank,jdbcType=VARCHAR},
-      </if>
-      <if test="health != null">
-        Health = #{health,jdbcType=VARCHAR},
-      </if>
-      <if test="bloodType != null">
-        BloodType = #{bloodType,jdbcType=VARCHAR},
-      </if>
-      <if test="height != null">
-        Height = #{height,jdbcType=VARCHAR},
-      </if>
-      <if test="vision != null">
-        Vision = #{vision,jdbcType=VARCHAR},
-      </if>
-      <if test="weight != null">
-        Weight = #{weight,jdbcType=VARCHAR},
-      </if>
-      <if test="maritalStatus != null">
-        MaritalStatus = #{maritalStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="province != null">
-        Province = #{province,jdbcType=VARCHAR},
-      </if>
-      <if test="city != null">
-        City = #{city,jdbcType=VARCHAR},
-      </if>
-      <if test="region != null">
-        Region = #{region,jdbcType=VARCHAR},
-      </if>
-      <if test="userName != null">
-        UserName = #{userName,jdbcType=VARCHAR},
-      </if>
-      <if test="userMobile != null">
-        UserMobile = #{userMobile,jdbcType=VARCHAR},
-      </if>
-      <if test="address != null">
-        Address = #{address,jdbcType=VARCHAR},
-      </if>
-      <if test="familyAddress != null">
-        FamilyAddress = #{familyAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="postalCode != null">
-        PostalCode = #{postalCode,jdbcType=VARCHAR},
-      </if>
-      <if test="email != null">
-        Email = #{email,jdbcType=VARCHAR},
-      </if>
-      <if test="hobby != null">
-        Hobby = #{hobby,jdbcType=VARCHAR},
-      </if>
-      <if test="jobStatus != null">
-        JobStatus = #{jobStatus,jdbcType=INTEGER},
-      </if>
-      <if test="keyPersonTypeID != null">
-        KeyPersonTypeID = #{keyPersonTypeID,jdbcType=INTEGER},
-      </if>
-      <if test="createUserID != null">
-        CreateUserID = #{createUserID,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        CreateTime = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="modifyUserID != null">
-        ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
-      </if>
-      <if test="modifyTime != null">
-        ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where JobuserID = #{jobuserID,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.hz.employmentsite.model.PcJobuser">
-    update pc_jobuser
-    set SiteID = #{siteID,jdbcType=VARCHAR},
-      IdentityNumber = #{identityNumber,jdbcType=VARCHAR},
-      Name = #{name,jdbcType=VARCHAR},
-      PyName = #{pyName,jdbcType=VARCHAR},
-      EngName = #{engName,jdbcType=VARCHAR},
-      Sex = #{sex,jdbcType=INTEGER},
-      Notion = #{notion,jdbcType=VARCHAR},
-      PoliticsLook = #{politicsLook,jdbcType=VARCHAR},
-      Birthplace = #{birthplace,jdbcType=VARCHAR},
-      BirthDay = #{birthDay,jdbcType=TIMESTAMP},
-      FamilyNature = #{familyNature,jdbcType=VARCHAR},
-      CultureRank = #{cultureRank,jdbcType=VARCHAR},
-      Health = #{health,jdbcType=VARCHAR},
-      BloodType = #{bloodType,jdbcType=VARCHAR},
-      Height = #{height,jdbcType=VARCHAR},
-      Vision = #{vision,jdbcType=VARCHAR},
-      Weight = #{weight,jdbcType=VARCHAR},
-      MaritalStatus = #{maritalStatus,jdbcType=VARCHAR},
-      Province = #{province,jdbcType=VARCHAR},
-      City = #{city,jdbcType=VARCHAR},
-      Region = #{region,jdbcType=VARCHAR},
-      UserName = #{userName,jdbcType=VARCHAR},
-      UserMobile = #{userMobile,jdbcType=VARCHAR},
-      Address = #{address,jdbcType=VARCHAR},
-      FamilyAddress = #{familyAddress,jdbcType=VARCHAR},
-      PostalCode = #{postalCode,jdbcType=VARCHAR},
-      Email = #{email,jdbcType=VARCHAR},
-      Hobby = #{hobby,jdbcType=VARCHAR},
-      JobStatus = #{jobStatus,jdbcType=INTEGER},
-      KeyPersonTypeID = #{keyPersonTypeID,jdbcType=INTEGER},
-      CreateUserID = #{createUserID,jdbcType=VARCHAR},
-      CreateTime = #{createTime,jdbcType=TIMESTAMP},
-      ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP}
-    where JobuserID = #{jobuserID,jdbcType=VARCHAR}
-  </update>
-</mapper>

src/main/resources/mapping/cquery/JobhuntCQuery.xml

@@ -6,7 +6,7 @@
         ,jhu.WorkCode as workCode,jhu.WorkName as workName,jhu.AreaWork as workAddress,jhu.InDate as endDate,jhu.WorkYear as workYear,jhu.UchuntType as wantedJobTypeName
         ,jhu.AbilityType as talentsTypeName,jhu.Salary as salary,jhu.CreateUserID,jhu.CreateTime,jhu.ModifyUserID,jhu.ModifyTime
         from pc_jobhunt jhu
-        inner join pc_jobuser ju on jhu.JobuserID = ju.JobuserID
+        left join pc_jobuser ju on jhu.JobuserID = ju.JobuserID
         left join sys_dictionary_item dic_KeyPersonType on ju.KeyPersonTypeID = dic_KeyPersonType.value and
         dic_KeyPersonType.dictionarycode='KeyPersonType'
         <where>

src/main/resources/mapping/cquery/JobuserCQuery.xml

@@ -2,37 +2,37 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.hz.employmentsite.mapper.cquery.JobuserCQuery">
     <select id="selectJobuserList" resultType="com.hz.employmentsite.vo.jobUserManager.JobUserVo">
-        select ju.jobUserId ,
-        ju.name,ju.IdentityNumber as IdCard,ju.Notion as nationTypeName, ju.UserMobile as
-        mobile,site.siteName,ju.CultureRank as educationName, ju.address,
-        dic_JobStatus.name as jobStatusName,
-        dic_KeyPersonType.name as emphasisTypeName,
-        dic_sex.Name as sexName
-        from pc_jobuser ju
-        left join pc_site site on ju.SiteID = site.SiteID
-        left join sys_dictionary_item dic_sex on ju.Sex = dic_sex.value and dic_sex.dictionarycode='Gender'
-        left join sys_dictionary_item dic_JobStatus on ju.JobStatus = dic_JobStatus.value and
-        dic_JobStatus.dictionarycode='JobStatus'
-        left join sys_dictionary_item dic_KeyPersonType on ju.KeyPersonTypeID = dic_KeyPersonType.value and
-        dic_KeyPersonType.dictionarycode='KeyPersonType'
-        where 1=1
+        select gender.name as GenderName,culture.name as CultureName,site.SiteName,jobstatus.name as JobStatusName ,keytype.name as KeyTypeName,jobuser.* from pc_jobuser jobuser
+        left join pc_site site
+        on site.SiteID = jobuser.SiteID
+        left join sys_dictionary_item culture
+        on jobuser.CultureRank = culture.value
+        left join sys_dictionary_item gender
+        on jobuser.Sex = gender.value
+        left join sys_dictionary_item jobstatus
+        on jobuser.JobStatusID = jobstatus.value
+        left join sys_dictionary_item keytype
+        on jobuser.KeyPersonTypeID = keytype.value
+        where gender.DictionaryCode='Gender' and culture.DictionaryCode='CultureLevel'
+        and jobstatus.DictionaryCode='JobStatus' and keytype.DictionaryCode='KeyPersonType'
+
         <if test="name != '' and name != null">
-            and ju.name like Concat('%',#{name},'%')
+            and jobuser.name like Concat('%',#{name},'%')
         </if>
         <if test="siteId != null and siteId != ''">
-            and ju.siteId = #{siteId}
+            and jobuser.siteId = #{siteId}
         </if>
         <if test="jobStatus != null and jobStatus != ''">
-            and ju.jobStatus = #{jobStatus}
+            and jobuser.jobStatus = #{jobStatus}
         </if>
         <if test="sexId != null and sexId != ''">
-            and ju.sex = #{sexId}
+            and jobuser.sex = #{sexId}
         </if>
         <if test="educationTypeId != null and educationTypeId != ''">
-            and ju.CultureRank = #{educationTypeId}
+            and jobuser.CultureRank = #{educationTypeId}
         </if>
         <if test="emphasisTypeId != null and emphasisTypeId != ''">
-            and ju.KeyPersonTypeID = #{emphasisTypeId}
+            and jobuser.KeyPersonTypeID = #{emphasisTypeId}
         </if>
     </select>
 </mapper>

src/main/resources/mapping/cquery/RecommendCQuery.xml

@@ -3,12 +3,12 @@
 <mapper namespace="com.hz.employmentsite.mapper.cquery.RecommendCQuery">
     <select id="selectRecommendList" resultType="com.hz.employmentsite.vo.jobUserManager.RecommendVo">
         select re.RecommendID as recommendId,re.JobuserID as jobuserId,ju.name
-        ,re.IsRead,re.IsSendnotes,ju.CultureRank as educationName,ju.Notion as nationTypeName
+        ,re.IsRead,re.IsSendnotes,ju.CultureRank as educationName,ju.Nation as nationTypeName
         ,re.CreateUserID,re.CreateTime,re.ModifyUserID,re.ModifyTime
         ,dic_KeyPersonType.name as emphasisTypeName,jhu.AreaWork as workAddress,jhu.InDate as endDate,jhu.workName
         from pc_recommend re
-        inner join pc_jobuser ju on re.JobuserID = ju.JobuserID
-        inner join pc_jobhunt jhu on ju.JobuserID = jhu.JobuserID
+        left join pc_jobuser ju on re.JobuserID = ju.JobuserID
+        left join pc_jobhunt jhu on ju.JobuserID = jhu.JobuserID
         left join sys_dictionary_item dic_KeyPersonType on ju.KeyPersonTypeID = dic_KeyPersonType.value and
         dic_KeyPersonType.dictionarycode='KeyPersonType'
         <where>

vue/src/views/jobUserManager/jobuser/index.vue

@@ -9,16 +9,16 @@
       <a-row :gutter="24">
         <a-col :span="6">
           <a-form-item label="姓名" :label-col="{ span: 8 }" name="name">
-            <a-input v-model:value="searchParamsState.name" placeholder="" />
+            <a-input v-model:value="searchParamsState.name" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="所属驿站" :label-col="{ span: 8 }" name="siteId">
+          <a-form-item label="所属驿站" :label-col="{ span: 8 }" name="siteID">
             <a-select
               ref="select"
-              v-model:value="searchParamsState.siteId"
+              v-model:value="searchParamsState.siteID"
               :options="siteList"
-              :field-names="{ label: 'name', value: 'value' }"
+              :field-names="{ label: 'siteName', value: 'siteID' }"
               :allow-clear="true"
               @change="loadData"
             >
@@ -48,7 +48,8 @@
                 loadData();
               }
             "
-            >重置</a-button
+          >重置
+          </a-button
           >
         </a-col>
       </a-row>
@@ -94,7 +95,7 @@
         </a-col>
       </a-row>
       <a-row class="edit-operation">
-        <a-col :span="24" style="text-align: right"> </a-col>
+        <a-col :span="24" style="text-align: right"></a-col>
       </a-row>
     </a-form>
     <div class="search-result-list">
@@ -105,182 +106,189 @@
         :pagination="pagination"
         :loading="formState.loading"
         :row-selection="{ selectedRowKeys: formState.selectedRowKeys, onChange: onSelectChange }"
-        :row-key="(record) => record.jobUserId"
+        :row-key="(record) => record.jobUserID"
         bordered
-        @change="handleTableChange"
-      >
-<!--        <template #bodyCell="{ column, text, record }">
+        @change="handleTableChange">
+        <template #bodyCell="{ column, text, record }">
           <template v-if="column.key === 'operation'">
             <div class="table-operation">
-              <a-button
-                type="link"
-                functioncode=""
-                @click="edit(record.jobUserId)"
-                >修改</a-button
-              >
-              <a-button
-                type="link"
-                functioncode=""
-                @click="delete(record.jobUserId,)"
-                >删除</a-button
-              >
+              <a-button type="link" size="small" @click='onEdit(record)'>编辑</a-button>
+              <a-button type="link" size="small" @click="onDel(record)">删除</a-button>
             </div>
           </template>
-        </template>-->
+        </template>
       </a-table>
     </div>
   </div>
 </template>
 
 <script lang="ts">
-  import { reactive, ref, computed, defineComponent } from 'vue';
-  import type { FormInstance, TableColumnsType, TableProps, SelectProps } from 'ant-design-vue';
-  import { getList } from '@/api/jobUserManager/jobuser';
-  import { getSysDictionaryList } from '@/api/system/dictionary';
-  import { getPaginationTotalTitle } from '@/utils/common';
+import {reactive, ref, computed, defineComponent} from 'vue';
+import type {FormInstance, TableColumnsType, TableProps, SelectProps} from 'ant-design-vue';
+import {getList} from '@/api/jobUserManager/jobuser';
+import {getSysDictionaryList} from '@/api/system/dictionary';
+import {getPaginationTotalTitle} from '@/utils/common';
+import {useTabsViewStore} from "@/store/modules/tabsView";
+import {get} from "@/api/common";
 
-  export default defineComponent({
-    name: 'JobUserList',
-    setup() {
-      const modalRoleUserRef = ref();
-      const modalRoleEditRef = ref();
-      const formRef = ref<FormInstance>();
-      const searchParamsState = reactive({ page: 1, limit: 20, name: '', siteId: '',jobStatus:'' ,sexId:'',educationTypeId:'',emphasisTypeId:''});
-      const formState = reactive({
-        total: 0,
-        selectedRowKeys: [],
-        loading: false,
-      });
-      const columns: TableColumnsType = [
-        {
-          title: '序号',
-          align: 'center',
-          width: 80,
-          key: 'jobUserId',
-          customRender: (item) =>
-            `${searchParamsState.limit * (searchParamsState.page - 1) + item.index + 1}`,
-        },
-        { title: '姓名', dataIndex: 'name', key: 'name', width: 100 },
-        { title: '公民身份号码', dataIndex: 'IdCard', key: 'IdCard', width: 150 },
-        { title: '性别', dataIndex: 'sexName', key: 'sexName', width: 80 },
-        { title: '民族', dataIndex: 'nationTypeName', key: 'nationTypeName', width: 80 },
-        { title: '联系电话', dataIndex: 'mobile', key: 'mobile' },
-        { title: '所属驿站', dataIndex: 'siteName', key: 'siteName' },
-        { title: '年龄', dataIndex: 'age', key: 'age' },
-        { title: '文化程度', dataIndex: 'educationName', key: 'educationName' },
-        { title: '地址', dataIndex: 'address', key: 'address' },
-        { title: '就业状态', dataIndex: 'jobStatusName', key: 'jobStatusName' },
-        { title: '重点人员类别', dataIndex: 'emphasisTypeName', key: 'emphasisTypeName' },
-        { title: '操作', key: 'operation', width: 100, align: 'center' },
-      ];
-      const pagination = computed(() => ({
-        total: formState.total,
-        current: searchParamsState.page,
-        pageSize: searchParamsState.limit,
-        showSizeChanger: true,
-        showTotal: (total) => getPaginationTotalTitle(total),
-      }));
+export default defineComponent({
+  name: 'JobUserList',
+  setup() {
+    const modalRoleUserRef = ref();
+    const modalRoleEditRef = ref();
+    const formRef = ref<FormInstance>();
+    const searchParamsState = reactive({
+      page: 1,
+      limit: 20,
+      name: '',
+      siteId: '',
+      jobStatus: '',
+      sexId: '',
+      educationTypeId: '',
+      emphasisTypeId: ''
+    });
+    const formState = reactive({
+      total: 0,
+      selectedRowKeys: [],
+      loading: false,
+    });
+    const columns: TableColumnsType = [
+      {
+        title: '序号',
+        align: 'center',
+        width: 80,
+        key: 'jobUserId',
+        customRender: (item) =>
+          `${searchParamsState.limit * (searchParamsState.page - 1) + item.index + 1}`,
+      },
+      {title: '姓名', dataIndex: 'name', key: 'name', width: 100},
+      {title: '公民身份号码', dataIndex: 'identityNumber', key: 'identityNumber', width: 150},
+      {title: '性别', dataIndex: 'genderName', key: 'genderName', width: 80},
+      {title: '民族', dataIndex: 'nation', key: 'nation', width: 80},
+      {title: '联系电话', dataIndex: 'userMobile', key: 'userMobile'},
+      {title: '所属驿站', dataIndex: 'siteName', key: 'siteName'},
+      {title: '年龄', dataIndex: 'age', key: 'age'},
+      {title: '文化程度', dataIndex: 'cultureName', key: 'cultureName'},
+      {title: '地址', dataIndex: 'address', key: 'address'},
+      {title: '就业状态', dataIndex: 'jobStatusName', key: 'jobStatusName'},
+      {title: '重点人员类别', dataIndex: 'keyTypeName', key: 'keyTypeName'},
+      {title: '操作', key: 'operation', width: 100, align: 'center'},
+    ];
+    const pagination = computed(() => ({
+      total: formState.total,
+      current: searchParamsState.page,
+      pageSize: searchParamsState.limit,
+      showSizeChanger: true,
+      showTotal: (total) => getPaginationTotalTitle(total),
+    }));
 
-      const dataList = ref([]);
-      const siteList = ref<SelectProps['options']>();
-      const jobStatusList = ref<SelectProps['options']>();
-      const sexTypeList = ref<SelectProps['options']>();
-      const educationTypeList = ref<SelectProps['options']>();
-      const emphasisTypeList = ref<SelectProps['options']>();
+    const dataList = ref([]);
+    const siteList = ref<SelectProps['options']>();
+    const jobStatusList = ref<SelectProps['options']>();
+    const sexTypeList = ref<SelectProps['options']>();
+    const educationTypeList = ref<SelectProps['options']>();
+    const emphasisTypeList = ref<SelectProps['options']>();
 
-      const onSelectChange = (selectedRowKeys: any) => {
-        formState.selectedRowKeys = selectedRowKeys;
-      };
+    const onSelectChange = (selectedRowKeys: any) => {
+      formState.selectedRowKeys = selectedRowKeys;
+    };
 
-      const handleTableChange: TableProps['onChange'] = (pag: {
-        pageSize: number;
-        current: number;
-      }) => {
-        searchParamsState.page = pag.current;
-        searchParamsState.limit = pag.pageSize;
-        loadData();
-      };
+    const handleTableChange: TableProps['onChange'] = (pag: {
+      pageSize: number;
+      current: number;
+    }) => {
+      searchParamsState.page = pag.current;
+      searchParamsState.limit = pag.pageSize;
+      loadData();
+    };
 
-      const onFinish = () => {
-        loadData();
-      };
+    const onFinish = () => {
+      loadData();
+    };
 
-      const loadData = async function () {
-        formState.loading = true;
-        const result: any = await getList(searchParamsState);
+    const loadData = async function () {
+      formState.loading = true;
+      const result: any = await getList(searchParamsState);
 
-        dataList.value = result.list;
-        formState.total = result.total;
-        formState.loading = false;
-      };
+      dataList.value = result.list;
+      formState.total = result.total;
+      formState.loading = false;
+    };
 
-      const getSiteList = () => {
-        /*getSysDictionaryList('UserType').then((data) => {
-          siteList.value = data;
-        });*/
-      };
+    get('/companyService/company/getSiteList', {}).then(data => {
+      siteList.value = data;
+    })
 
-      const getJobStatusList = () => {
-        getSysDictionaryList('jobStatus').then((data) => {
-          jobStatusList.value = data;
-        });
-      };
+    const getJobStatusList = () => {
+      getSysDictionaryList('jobStatus').then((data) => {
+        jobStatusList.value = data;
+      });
+    };
 
-      const getSexList = () => {
-        getSysDictionaryList('Gender').then((data) => {
-          sexTypeList.value = data;
-        });
-      };
+    const getSexList = () => {
+      getSysDictionaryList('Gender').then((data) => {
+        sexTypeList.value = data;
+      });
+    };
 
-      const getEducationList = () => {
-        getSysDictionaryList('educationType').then((data) => {
-          educationTypeList.value = data;
-        });
-      };
+    const getEducationList = () => {
+      getSysDictionaryList('CultureLevel').then((data) => {
+        educationTypeList.value = data;
+      });
+    };
+
+    const getEmphasisTypeList = () => {
+      getSysDictionaryList('KeyPersonType').then((data) => {
+        emphasisTypeList.value = data;
+      });
+    };
 
-      const getEmphasisTypeList = () => {
-        getSysDictionaryList('KeyPersonType').then((data) => {
-          emphasisTypeList.value = data;
-        });
-      };
+    const tabsViewStore = useTabsViewStore();
+    const onAdd = () => {
+      tabsViewStore.addTabByPath('/taskAndLog/dotask/add', null);
+    };
+    const onEdit = (item: any) => {
+      tabsViewStore.addTabByPath('/taskAndLog/dotask/edit', {id: item.dotaskID});
+    };
 
-      return {
-        modalRoleUserRef,
-        modalRoleEditRef,
-        formRef,
-        loadData,
-        getSiteList,
-        searchParamsState,
-        formState,
-        columns,
-        pagination,
-        dataList,
-        siteList,
-        jobStatusList,
-        sexTypeList,
-        educationTypeList,
-        emphasisTypeList,
-        onSelectChange,
-        handleTableChange,
-        onFinish,
-        getJobStatusList,
-        getSexList,
-        getEducationList,
-        getEmphasisTypeList
+    return {
+      modalRoleUserRef,
+      modalRoleEditRef,
+      formRef,
+      loadData,
+      onAdd,
+      onEdit,
+      searchParamsState,
+      formState,
+      columns,
+      pagination,
+      dataList,
+      siteList,
+      jobStatusList,
+      sexTypeList,
+      educationTypeList,
+      emphasisTypeList,
+      onSelectChange,
+      handleTableChange,
+      onFinish,
+      getJobStatusList,
+      getSexList,
+      getEducationList,
+      getEmphasisTypeList
 
-      };
-    },
-    created() {
-      this.loadData();
-      this.getJobStatusList();
-      this.getSexList();
-      this.getEducationList();
-      this.getEmphasisTypeList();
-    },
-    activated() {
-      if (history.state.params?.reload) this.loadData();
-    },
-  });
+    };
+  },
+  created() {
+    this.loadData();
+    this.getJobStatusList();
+    this.getSexList();
+    this.getEducationList();
+    this.getEmphasisTypeList();
+  },
+  activated() {
+    if (history.state.params?.reload) this.loadData();
+  },
+});
 </script>
 
 <style lang="less" scoped></style>