feat: 企业信息增加新字段逻辑

src/main/java/com/hz/employmentsite/controller/companyService/CompanyController.java

@@ -72,20 +72,20 @@ public class CompanyController {
             data = new CompanyVo();
             data.companyID = UUID.randomUUID().toString();
             data.recordStatus = 1;
-            data.validDate = dateUtils.StrToDate("2099-12-31 00:00:00") ;
+            data.validDate = dateUtils.StrToDate("2099-12-31 00:00:00");
             data.isShortage = 1;
             PcSiteUserExample siteUserExp = new PcSiteUserExample();
             PcSiteUserExample.Criteria siteUserCro = siteUserExp.createCriteria();
             siteUserCro.andUserIDEqualTo(loginUserID);
             //siteUserCro.andUserIDEqualTo(accountService.getLoginUserID());
             var curSiteUserInfo = pcSiteUserMapper.selectByExample(siteUserExp).stream().findFirst().orElse(null);
-            if(curSiteUserInfo != null){
+            if (curSiteUserInfo != null) {
                 data.setSiteID(curSiteUserInfo.getSiteID());
                 PcSiteExample siteExp = new PcSiteExample();
                 PcSiteExample.Criteria siteCro = siteExp.createCriteria();
                 siteCro.andSiteIDEqualTo(curSiteUserInfo.getSiteID());
                 var curSiteInfo = pcSiteMapper.selectByExample(siteExp).stream().findFirst().orElse(null);
-                if(curSiteInfo != null){
+                if (curSiteInfo != null) {
                     data.setRegionCode(curSiteInfo.getRegionCode());
                     data.setStreetCode(curSiteInfo.getStreetCode());
                 }

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

@@ -53,6 +53,22 @@ public class PcCompany {
 
     private String openId;
 
+    private Date establishmentTime;
+
+    private String signInPoliticalArea;
+
+    private String website;
+
+    private String bonus;
+
+    private Integer registeredCapital;
+
+    private Integer professionID;
+
+    private Integer estateCategoryID;
+
+    private Integer tagID;
+
     public String getCompanyID() {
         return companyID;
     }
@@ -252,4 +268,68 @@ public class PcCompany {
     public void setOpenId(String openId) {
         this.openId = openId == null ? null : openId.trim();
     }
+
+    public Date getEstablishmentTime() {
+        return establishmentTime;
+    }
+
+    public void setEstablishmentTime(Date establishmentTime) {
+        this.establishmentTime = establishmentTime;
+    }
+
+    public String getSignInPoliticalArea() {
+        return signInPoliticalArea;
+    }
+
+    public void setSignInPoliticalArea(String signInPoliticalArea) {
+        this.signInPoliticalArea = signInPoliticalArea;
+    }
+
+    public String getWebsite() {
+        return website;
+    }
+
+    public void setWebsite(String website) {
+        this.website = website;
+    }
+
+    public String getBonus() {
+        return bonus;
+    }
+
+    public void setBonus(String bonus) {
+        this.bonus = bonus;
+    }
+
+    public Integer getRegisteredCapital() {
+        return registeredCapital;
+    }
+
+    public void setRegisteredCapital(Integer registeredCapital) {
+        this.registeredCapital = registeredCapital;
+    }
+
+    public Integer getProfessionID() {
+        return professionID;
+    }
+
+    public void setProfessionID(Integer professionID) {
+        this.professionID = professionID;
+    }
+
+    public Integer getEstateCategoryID() {
+        return estateCategoryID;
+    }
+
+    public void setEstateCategoryID(Integer estateCategoryID) {
+        this.estateCategoryID = estateCategoryID;
+    }
+
+    public Integer getTagID() {
+        return tagID;
+    }
+
+    public void setTagID(Integer tagID) {
+        this.tagID = tagID;
+    }
 }

src/main/java/com/hz/employmentsite/services/impl/companyService/CompanyServiceImpl.java

@@ -134,6 +134,14 @@ public class CompanyServiceImpl implements CompanyService {
             dbData.setCreateUserID(userId);
             dbData.setModifyTime(new Date());
             dbData.setModifyUserID(userId);
+            dbData.setEstablishmentTime(data.getEstablishmentTime());
+            dbData.setRegisteredCapital(data.getRegisteredCapital());
+            dbData.setSignInPoliticalArea(data.getSignInPoliticalArea());
+            dbData.setWebsite(data.getWebsite());
+            dbData.setBonus(data.getBonus());
+            dbData.setProfessionID(data.getProfessionID());
+            dbData.setEstateCategoryID(data.getEstateCategoryID());
+            dbData.setTagID(data.getTagID());
             result = pcCompanyMapper.insert(dbData);
 
         } else {
@@ -160,6 +168,14 @@ public class CompanyServiceImpl implements CompanyService {
             dbData.setLatitude(data.getLatitude());
             dbData.setModifyTime(new Date());
             dbData.setModifyUserID(userId);
+            dbData.setEstablishmentTime(data.getEstablishmentTime());
+            dbData.setRegisteredCapital(data.getRegisteredCapital());
+            dbData.setSignInPoliticalArea(data.getSignInPoliticalArea());
+            dbData.setWebsite(data.getWebsite());
+            dbData.setBonus(data.getBonus());
+            dbData.setProfessionID(data.getProfessionID());
+            dbData.setEstateCategoryID(data.getEstateCategoryID());
+            dbData.setTagID(data.getTagID());
             result = pcCompanyMapper.updateByPrimaryKeySelective(dbData);
         }
         return result;

src/main/java/com/hz/employmentsite/vo/companyService/CompanyVo.java

@@ -1,10 +1,11 @@
 package com.hz.employmentsite.vo.companyService;
 
+import com.hz.employmentsite.util.datarange.annotations.CompanyID;
 import com.hz.employmentsite.util.datarange.annotations.InstitutionID;
 import com.hz.employmentsite.util.datarange.annotations.RegionID;
 import com.hz.employmentsite.util.datarange.annotations.SiteID;
 import lombok.Data;
-import com.hz.employmentsite.util.datarange.annotations.CompanyID;
+
 import java.util.Date;
 
 @Data
@@ -77,13 +78,26 @@ public class CompanyVo {
     public String longitude;
     public String latitude;
 
+    public Date establishmentTime;
+    public Integer registeredCapital;
+    public String signInPoliticalArea;
+
+    public Integer professionID;
+    public String professionName;
+    public Integer estateCategoryID;
+    public String estateCategoryName;
+    public Integer tagID;
+    public String tagName;
+
+    public String website;
+    public String bonus;
 
     public String errorMessage;
 
     public Integer insuredCount;
 
     public Integer isShortage;
-    public String  isShortageName;
+    public String isShortageName;
     @InstitutionID
     public String institutionID;
 

src/main/resources/mapping/PcCompanyMapper.xml

@@ -2,31 +2,38 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hz.employmentsite.mapper.PcCompanyMapper">
   <resultMap id="BaseResultMap" type="com.hz.employmentsite.model.PcCompany">
-    <id column="CompanyID" jdbcType="VARCHAR" property="companyID" />
-    <result column="SiteID" jdbcType="VARCHAR" property="siteID" />
-    <result column="RegionCode" jdbcType="VARCHAR" property="regionCode" />
-    <result column="InsuredCount" jdbcType="INTEGER" property="insuredCount" />
-    <result column="StreetCode" jdbcType="VARCHAR" property="streetCode" />
-    <result column="CompanyName" jdbcType="VARCHAR" property="companyName" />
-    <result column="CompanyCode" jdbcType="VARCHAR" property="companyCode" />
-    <result column="CompanyModel" jdbcType="INTEGER" property="companyModel" />
-    <result column="WorkSituation" jdbcType="VARCHAR" property="workSituation" />
-    <result column="CompanyType" jdbcType="INTEGER" property="companyType" />
-    <result column="CompanyAddress" jdbcType="VARCHAR" property="companyAddress" />
-    <result column="UserName" jdbcType="VARCHAR" property="userName" />
-    <result column="UserMobile" jdbcType="VARCHAR" property="userMobile" />
-    <result column="CompanyEmail" jdbcType="VARCHAR" property="companyEmail" />
-    <result column="FrName" jdbcType="VARCHAR" property="frName" />
-    <result column="ValidDate" jdbcType="TIMESTAMP" property="validDate" />
-    <result column="IsShortage" jdbcType="INTEGER" property="isShortage" />
-    <result column="RecordStatus" jdbcType="INTEGER" property="recordStatus" />
-    <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" />
-    <result column="Longitude" jdbcType="VARCHAR" property="longitude" />
-    <result column="Latitude" jdbcType="VARCHAR" property="latitude" />
-    <result column="openId" jdbcType="VARCHAR" property="openId" />
+    <id column="CompanyID" jdbcType="VARCHAR" property="companyID"/>
+    <result column="SiteID" jdbcType="VARCHAR" property="siteID"/>
+    <result column="RegionCode" jdbcType="VARCHAR" property="regionCode"/>
+    <result column="InsuredCount" jdbcType="INTEGER" property="insuredCount"/>
+    <result column="StreetCode" jdbcType="VARCHAR" property="streetCode"/>
+    <result column="CompanyName" jdbcType="VARCHAR" property="companyName"/>
+    <result column="CompanyCode" jdbcType="VARCHAR" property="companyCode"/>
+    <result column="CompanyModel" jdbcType="INTEGER" property="companyModel"/>
+    <result column="WorkSituation" jdbcType="VARCHAR" property="workSituation"/>
+    <result column="CompanyType" jdbcType="INTEGER" property="companyType"/>
+    <result column="CompanyAddress" jdbcType="VARCHAR" property="companyAddress"/>
+    <result column="UserName" jdbcType="VARCHAR" property="userName"/>
+    <result column="UserMobile" jdbcType="VARCHAR" property="userMobile"/>
+    <result column="CompanyEmail" jdbcType="VARCHAR" property="companyEmail"/>
+    <result column="FrName" jdbcType="VARCHAR" property="frName"/>
+    <result column="ValidDate" jdbcType="TIMESTAMP" property="validDate"/>
+    <result column="IsShortage" jdbcType="INTEGER" property="isShortage"/>
+    <result column="RecordStatus" jdbcType="INTEGER" property="recordStatus"/>
+    <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"/>
+    <result column="Longitude" jdbcType="VARCHAR" property="longitude"/>
+    <result column="Latitude" jdbcType="VARCHAR" property="latitude"/>
+    <result column="EstablishmentTime" jdbcType="TIMESTAMP" property="establishmentTime"/>
+    <result column="SignInPoliticalArea" jdbcType="VARCHAR" property="signInPoliticalArea"/>
+    <result column="Website" jdbcType="VARCHAR" property="website"/>
+    <result column="Bonus" jdbcType="VARCHAR" property="bonus"/>
+    <result column="RegisteredCapital" jdbcType="INTEGER" property="registeredCapital"/>
+    <result column="ProfessionID" jdbcType="INTEGER" property="professionID"/>
+    <result column="EstateCategoryID" jdbcType="INTEGER" property="estateCategoryID"/>
+    <result column="TagID" jdbcType="INTEGER" property="tagID"/>
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hz.employmentsite.model.PcCompanyWithBLOBs">
     <result column="BusinScope" jdbcType="LONGVARCHAR" property="businScope" />
@@ -91,10 +98,11 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    CompanyID, SiteID, RegionCode, InsuredCount, StreetCode, CompanyName, CompanyCode, 
-    CompanyModel, WorkSituation, CompanyType, CompanyAddress, UserName, UserMobile, CompanyEmail, 
-    FrName, ValidDate, IsShortage, RecordStatus, CreateUserID, CreateTime, ModifyUserID, 
-    ModifyTime, Longitude, Latitude, openId
+    CompanyID
+    , SiteID, RegionCode, InsuredCount, StreetCode, CompanyName, CompanyCode,
+    CompanyModel, WorkSituation, CompanyType, CompanyAddress, UserName, UserMobile, CompanyEmail,
+    FrName, ValidDate, IsShortage, RecordStatus, CreateUserID, CreateTime, ModifyUserID,
+    ModifyTime, Longitude, Latitude, EstablishmentTime,SignInPoliticalArea,Website,Bonus,RegisteredCapital,ProfessionID,EstateCategoryID,TagID
   </sql>
   <sql id="Blob_Column_List">
     BusinScope, CompanyDesc
@@ -130,7 +138,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
-    select 
+    select
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
@@ -148,26 +156,31 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.hz.employmentsite.model.PcCompanyWithBLOBs">
-    insert into pc_company (CompanyID, SiteID, RegionCode, 
-      InsuredCount, StreetCode, CompanyName, 
-      CompanyCode, CompanyModel, WorkSituation, 
-      CompanyType, CompanyAddress, UserName, 
-      UserMobile, CompanyEmail, FrName, 
-      ValidDate, IsShortage, RecordStatus, 
-      CreateUserID, CreateTime, ModifyUserID, 
-      ModifyTime, Longitude, Latitude, 
-      openId, BusinScope, CompanyDesc
-      )
-    values (#{companyID,jdbcType=VARCHAR}, #{siteID,jdbcType=VARCHAR}, #{regionCode,jdbcType=VARCHAR}, 
-      #{insuredCount,jdbcType=INTEGER}, #{streetCode,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
-      #{companyCode,jdbcType=VARCHAR}, #{companyModel,jdbcType=INTEGER}, #{workSituation,jdbcType=VARCHAR}, 
-      #{companyType,jdbcType=INTEGER}, #{companyAddress,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 
-      #{userMobile,jdbcType=VARCHAR}, #{companyEmail,jdbcType=VARCHAR}, #{frName,jdbcType=VARCHAR}, 
-      #{validDate,jdbcType=TIMESTAMP}, #{isShortage,jdbcType=INTEGER}, #{recordStatus,jdbcType=INTEGER}, 
-      #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, 
-      #{modifyTime,jdbcType=TIMESTAMP}, #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, 
-      #{openId,jdbcType=VARCHAR}, #{businScope,jdbcType=LONGVARCHAR}, #{companyDesc,jdbcType=LONGVARCHAR}
-      )
+    insert into pc_company (CompanyID, SiteID, RegionCode,
+                            InsuredCount, StreetCode, CompanyName,
+                            CompanyCode, CompanyModel, WorkSituation,
+                            CompanyType, CompanyAddress, UserName,
+                            UserMobile, CompanyEmail, FrName,
+                            ValidDate, IsShortage, RecordStatus,
+                            CreateUserID, CreateTime, ModifyUserID,
+                            ModifyTime, Longitude, Latitude,
+                            openId, BusinScope, CompanyDesc,
+                            EstablishmentTime, RegisteredCapital, SignInPoliticalArea,
+                            ProfessionID, EstateCategoryID, TagID,
+                            Website, Bonus)
+    values (#{companyID,jdbcType=VARCHAR}, #{siteID,jdbcType=VARCHAR}, #{regionCode,jdbcType=VARCHAR},
+            #{insuredCount,jdbcType=INTEGER}, #{streetCode,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},
+            #{companyCode,jdbcType=VARCHAR}, #{companyModel,jdbcType=INTEGER}, #{workSituation,jdbcType=VARCHAR},
+            #{companyType,jdbcType=INTEGER}, #{companyAddress,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR},
+            #{userMobile,jdbcType=VARCHAR}, #{companyEmail,jdbcType=VARCHAR}, #{frName,jdbcType=VARCHAR},
+            #{validDate,jdbcType=TIMESTAMP}, #{isShortage,jdbcType=INTEGER}, #{recordStatus,jdbcType=INTEGER},
+            #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR},
+            #{modifyTime,jdbcType=TIMESTAMP}, #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR},
+            #{openId,jdbcType=VARCHAR}, #{businScope,jdbcType=LONGVARCHAR}, #{companyDesc,jdbcType=LONGVARCHAR},
+            #{establishmentTime,jdbcType=TIMESTAMP}, #{registeredCapital,jdbcType=INTEGER},
+            #{signInPoliticalArea,jdbcType=VARCHAR}, #{professionID,jdbcType=INTEGER},
+            #{estateCategoryID,jdbcType=INTEGER},
+            #{tagID,jdbcType=INTEGER}, #{website,jdbcType=VARCHAR}, #{bonus,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcCompanyWithBLOBs">
     insert into pc_company
@@ -253,6 +266,30 @@
       <if test="companyDesc != null">
         CompanyDesc,
       </if>
+      <if test="establishmentTime != null">
+        establishmentTime,
+      </if>
+      <if test="signInPoliticalArea != null">
+        signInPoliticalArea,
+      </if>
+      <if test="website != null">
+        website,
+      </if>
+      <if test="bonus != null">
+        bonus,
+      </if>
+      <if test="registeredCapital != null">
+        registeredCapital,
+      </if>
+      <if test="professionID != null">
+        professionID,
+      </if>
+      <if test="estateCategoryID != null">
+        estateCategoryID,
+      </if>
+      <if test="tagID != null">
+        tagID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="companyID != null">
@@ -336,6 +373,30 @@
       <if test="companyDesc != null">
         #{companyDesc,jdbcType=LONGVARCHAR},
       </if>
+      <if test="establishmentTime != null">
+        #{establishmentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="signInPoliticalArea != null">
+        #{signInPoliticalArea,jdbcType=VARCHAR},
+      </if>
+      <if test="website != null">
+        #{website,jdbcType=VARCHAR},
+      </if>
+      <if test="bonus != null">
+        #{bonus,jdbcType=VARCHAR},
+      </if>
+      <if test="registeredCapital != null">
+        #{registeredCapital,jdbcType=INTEGER},
+      </if>
+      <if test="professionID != null">
+        #{professionID,jdbcType=INTEGER},
+      </if>
+      <if test="estateCategoryID != null">
+        #{estateCategoryID,jdbcType=INTEGER},
+      </if>
+      <if test="tagID != null">
+        #{tagID,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hz.employmentsite.model.PcCompanyExample" resultType="java.lang.Long">
@@ -428,6 +489,30 @@
       <if test="row.companyDesc != null">
         CompanyDesc = #{row.companyDesc,jdbcType=LONGVARCHAR},
       </if>
+      <if test="row.establishmentTime != null">
+        EstablishmentTime = #{row.establishmentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="row.signInPoliticalArea != null">
+        SignInPoliticalArea = #{row.signInPoliticalArea,jdbcType=VARCHAR},
+      </if>
+      <if test="row.website != null">
+        Website = #{row.website,jdbcType=VARCHAR},
+      </if>
+      <if test="row.bonus != null">
+        Bonus = #{row.bonus,jdbcType=VARCHAR},
+      </if>
+      <if test="row.registeredCapital != null">
+        RegisteredCapital = #{row.registeredCapital,jdbcType=INTEGER},
+      </if>
+      <if test="row.professionID != null">
+        ProfessionID = #{row.professionID,jdbcType=INTEGER},
+      </if>
+      <if test="row.estateCategoryID != null">
+        EstateCategoryID = #{row.estateCategoryID,jdbcType=INTEGER},
+      </if>
+      <if test="row.tagID != null">
+        TagID = #{row.tagID,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -436,32 +521,40 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update pc_company
     set CompanyID = #{row.companyID,jdbcType=VARCHAR},
-      SiteID = #{row.siteID,jdbcType=VARCHAR},
-      RegionCode = #{row.regionCode,jdbcType=VARCHAR},
-      InsuredCount = #{row.insuredCount,jdbcType=INTEGER},
-      StreetCode = #{row.streetCode,jdbcType=VARCHAR},
-      CompanyName = #{row.companyName,jdbcType=VARCHAR},
-      CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
-      CompanyModel = #{row.companyModel,jdbcType=INTEGER},
-      WorkSituation = #{row.workSituation,jdbcType=VARCHAR},
-      CompanyType = #{row.companyType,jdbcType=INTEGER},
-      CompanyAddress = #{row.companyAddress,jdbcType=VARCHAR},
-      UserName = #{row.userName,jdbcType=VARCHAR},
-      UserMobile = #{row.userMobile,jdbcType=VARCHAR},
-      CompanyEmail = #{row.companyEmail,jdbcType=VARCHAR},
-      FrName = #{row.frName,jdbcType=VARCHAR},
-      ValidDate = #{row.validDate,jdbcType=TIMESTAMP},
-      IsShortage = #{row.isShortage,jdbcType=INTEGER},
-      RecordStatus = #{row.recordStatus,jdbcType=INTEGER},
-      CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
-      CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
-      ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
-      Longitude = #{row.longitude,jdbcType=VARCHAR},
-      Latitude = #{row.latitude,jdbcType=VARCHAR},
-      openId = #{row.openId,jdbcType=VARCHAR},
-      BusinScope = #{row.businScope,jdbcType=LONGVARCHAR},
-      CompanyDesc = #{row.companyDesc,jdbcType=LONGVARCHAR}
+    SiteID = #{row.siteID,jdbcType=VARCHAR},
+    RegionCode = #{row.regionCode,jdbcType=VARCHAR},
+    InsuredCount = #{row.insuredCount,jdbcType=INTEGER},
+    StreetCode = #{row.streetCode,jdbcType=VARCHAR},
+    CompanyName = #{row.companyName,jdbcType=VARCHAR},
+    CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
+    CompanyModel = #{row.companyModel,jdbcType=INTEGER},
+    WorkSituation = #{row.workSituation,jdbcType=VARCHAR},
+    CompanyType = #{row.companyType,jdbcType=INTEGER},
+    CompanyAddress = #{row.companyAddress,jdbcType=VARCHAR},
+    UserName = #{row.userName,jdbcType=VARCHAR},
+    UserMobile = #{row.userMobile,jdbcType=VARCHAR},
+    CompanyEmail = #{row.companyEmail,jdbcType=VARCHAR},
+    FrName = #{row.frName,jdbcType=VARCHAR},
+    ValidDate = #{row.validDate,jdbcType=TIMESTAMP},
+    IsShortage = #{row.isShortage,jdbcType=INTEGER},
+    RecordStatus = #{row.recordStatus,jdbcType=INTEGER},
+    CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
+    CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
+    ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
+    ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
+    Longitude = #{row.longitude,jdbcType=VARCHAR},
+    Latitude = #{row.latitude,jdbcType=VARCHAR},
+    openId = #{row.openId,jdbcType=VARCHAR},
+    BusinScope = #{row.businScope,jdbcType=LONGVARCHAR},
+    CompanyDesc = #{row.companyDesc,jdbcType=LONGVARCHAR},
+    EstablishmentTime = #{row.establishmentTime,jdbcType=TIMESTAMP},
+    SignInPoliticalArea = #{row.signInPoliticalArea,jdbcType=VARCHAR},
+    Website = #{row.website,jdbcType=VARCHAR},
+    Bonus = #{row.bonus,jdbcType=VARCHAR},
+    RegisteredCapital = #{row.registeredCapital,jdbcType=INTEGER},
+    ProfessionID = #{row.professionID,jdbcType=INTEGER},
+    EstateCategoryID = #{row.estateCategoryID,jdbcType=INTEGER},
+    TagID = #{row.tagID,jdbcType=INTEGER}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -469,30 +562,38 @@
   <update id="updateByExample" parameterType="map">
     update pc_company
     set CompanyID = #{row.companyID,jdbcType=VARCHAR},
-      SiteID = #{row.siteID,jdbcType=VARCHAR},
-      RegionCode = #{row.regionCode,jdbcType=VARCHAR},
-      InsuredCount = #{row.insuredCount,jdbcType=INTEGER},
-      StreetCode = #{row.streetCode,jdbcType=VARCHAR},
-      CompanyName = #{row.companyName,jdbcType=VARCHAR},
-      CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
-      CompanyModel = #{row.companyModel,jdbcType=INTEGER},
-      WorkSituation = #{row.workSituation,jdbcType=VARCHAR},
-      CompanyType = #{row.companyType,jdbcType=INTEGER},
-      CompanyAddress = #{row.companyAddress,jdbcType=VARCHAR},
-      UserName = #{row.userName,jdbcType=VARCHAR},
-      UserMobile = #{row.userMobile,jdbcType=VARCHAR},
-      CompanyEmail = #{row.companyEmail,jdbcType=VARCHAR},
-      FrName = #{row.frName,jdbcType=VARCHAR},
-      ValidDate = #{row.validDate,jdbcType=TIMESTAMP},
-      IsShortage = #{row.isShortage,jdbcType=INTEGER},
-      RecordStatus = #{row.recordStatus,jdbcType=INTEGER},
-      CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
-      CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
-      ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
-      Longitude = #{row.longitude,jdbcType=VARCHAR},
-      Latitude = #{row.latitude,jdbcType=VARCHAR},
-      openId = #{row.openId,jdbcType=VARCHAR}
+    SiteID = #{row.siteID,jdbcType=VARCHAR},
+    RegionCode = #{row.regionCode,jdbcType=VARCHAR},
+    InsuredCount = #{row.insuredCount,jdbcType=INTEGER},
+    StreetCode = #{row.streetCode,jdbcType=VARCHAR},
+    CompanyName = #{row.companyName,jdbcType=VARCHAR},
+    CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
+    CompanyModel = #{row.companyModel,jdbcType=INTEGER},
+    WorkSituation = #{row.workSituation,jdbcType=VARCHAR},
+    CompanyType = #{row.companyType,jdbcType=INTEGER},
+    CompanyAddress = #{row.companyAddress,jdbcType=VARCHAR},
+    UserName = #{row.userName,jdbcType=VARCHAR},
+    UserMobile = #{row.userMobile,jdbcType=VARCHAR},
+    CompanyEmail = #{row.companyEmail,jdbcType=VARCHAR},
+    FrName = #{row.frName,jdbcType=VARCHAR},
+    ValidDate = #{row.validDate,jdbcType=TIMESTAMP},
+    IsShortage = #{row.isShortage,jdbcType=INTEGER},
+    RecordStatus = #{row.recordStatus,jdbcType=INTEGER},
+    CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
+    CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
+    ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
+    ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
+    Longitude = #{row.longitude,jdbcType=VARCHAR},
+    Latitude = #{row.latitude,jdbcType=VARCHAR},
+    openId = #{row.openId,jdbcType=VARCHAR},
+    EstablishmentTime = #{row.establishmentTime,jdbcType=TIMESTAMP},
+    SignInPoliticalArea = #{row.signInPoliticalArea,jdbcType=VARCHAR},
+    Website = #{row.website,jdbcType=VARCHAR},
+    Bonus = #{row.bonus,jdbcType=VARCHAR},
+    RegisteredCapital = #{row.registeredCapital,jdbcType=INTEGER},
+    ProfessionID = #{row.professionID,jdbcType=INTEGER},
+    EstateCategoryID = #{row.estateCategoryID,jdbcType=INTEGER},
+    TagID = #{row.tagID,jdbcType=INTEGER}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -578,65 +679,106 @@
       <if test="companyDesc != null">
         CompanyDesc = #{companyDesc,jdbcType=LONGVARCHAR},
       </if>
+      <if test="establishmentTime != null">
+        EstablishmentTime = #{establishmentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="signInPoliticalArea != null">
+        SignInPoliticalArea = #{signInPoliticalArea,jdbcType=VARCHAR},
+      </if>
+      <if test="website != null">
+        Website = #{website,jdbcType=VARCHAR},
+      </if>
+      <if test="bonus != null">
+        Bonus = #{bonus,jdbcType=VARCHAR},
+      </if>
+      <if test="registeredCapital != null">
+        RegisteredCapital = #{registeredCapital,jdbcType=INTEGER},
+      </if>
+      <if test="professionID != null">
+        ProfessionID = #{professionID,jdbcType=INTEGER},
+      </if>
+      <if test="estateCategoryID != null">
+        EstateCategoryID = #{estateCategoryID,jdbcType=INTEGER},
+      </if>
+      <if test="tagID != null">
+        TagID = #{tagID,jdbcType=INTEGER},
+      </if>
     </set>
     where CompanyID = #{companyID,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hz.employmentsite.model.PcCompanyWithBLOBs">
     update pc_company
-    set SiteID = #{siteID,jdbcType=VARCHAR},
-      RegionCode = #{regionCode,jdbcType=VARCHAR},
-      InsuredCount = #{insuredCount,jdbcType=INTEGER},
-      StreetCode = #{streetCode,jdbcType=VARCHAR},
-      CompanyName = #{companyName,jdbcType=VARCHAR},
-      CompanyCode = #{companyCode,jdbcType=VARCHAR},
-      CompanyModel = #{companyModel,jdbcType=INTEGER},
-      WorkSituation = #{workSituation,jdbcType=VARCHAR},
-      CompanyType = #{companyType,jdbcType=INTEGER},
-      CompanyAddress = #{companyAddress,jdbcType=VARCHAR},
-      UserName = #{userName,jdbcType=VARCHAR},
-      UserMobile = #{userMobile,jdbcType=VARCHAR},
-      CompanyEmail = #{companyEmail,jdbcType=VARCHAR},
-      FrName = #{frName,jdbcType=VARCHAR},
-      ValidDate = #{validDate,jdbcType=TIMESTAMP},
-      IsShortage = #{isShortage,jdbcType=INTEGER},
-      RecordStatus = #{recordStatus,jdbcType=INTEGER},
-      CreateUserID = #{createUserID,jdbcType=VARCHAR},
-      CreateTime = #{createTime,jdbcType=TIMESTAMP},
-      ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
-      Longitude = #{longitude,jdbcType=VARCHAR},
-      Latitude = #{latitude,jdbcType=VARCHAR},
-      openId = #{openId,jdbcType=VARCHAR},
-      BusinScope = #{businScope,jdbcType=LONGVARCHAR},
-      CompanyDesc = #{companyDesc,jdbcType=LONGVARCHAR}
+    set SiteID              = #{siteID,jdbcType=VARCHAR},
+        RegionCode          = #{regionCode,jdbcType=VARCHAR},
+        InsuredCount        = #{insuredCount,jdbcType=INTEGER},
+        StreetCode          = #{streetCode,jdbcType=VARCHAR},
+        CompanyName         = #{companyName,jdbcType=VARCHAR},
+        CompanyCode         = #{companyCode,jdbcType=VARCHAR},
+        CompanyModel        = #{companyModel,jdbcType=INTEGER},
+        WorkSituation       = #{workSituation,jdbcType=VARCHAR},
+        CompanyType         = #{companyType,jdbcType=INTEGER},
+        CompanyAddress      = #{companyAddress,jdbcType=VARCHAR},
+        UserName            = #{userName,jdbcType=VARCHAR},
+        UserMobile          = #{userMobile,jdbcType=VARCHAR},
+        CompanyEmail        = #{companyEmail,jdbcType=VARCHAR},
+        FrName              = #{frName,jdbcType=VARCHAR},
+        ValidDate           = #{validDate,jdbcType=TIMESTAMP},
+        IsShortage          = #{isShortage,jdbcType=INTEGER},
+        RecordStatus        = #{recordStatus,jdbcType=INTEGER},
+        CreateUserID        = #{createUserID,jdbcType=VARCHAR},
+        CreateTime          = #{createTime,jdbcType=TIMESTAMP},
+        ModifyUserID        = #{modifyUserID,jdbcType=VARCHAR},
+        ModifyTime          = #{modifyTime,jdbcType=TIMESTAMP},
+        Longitude           = #{longitude,jdbcType=VARCHAR},
+        Latitude            = #{latitude,jdbcType=VARCHAR},
+        openId              = #{openId,jdbcType=VARCHAR},
+        BusinScope          = #{businScope,jdbcType=LONGVARCHAR},
+        CompanyDesc         = #{companyDesc,jdbcType=LONGVARCHAR},
+        EstablishmentTime   = #{establishmentTime,jdbcType=TIMESTAMP},
+        SignInPoliticalArea = #{signInPoliticalArea,jdbcType=VARCHAR},
+        Website             = #{website,jdbcType=VARCHAR},
+        Bonus               = #{bonus,jdbcType=VARCHAR},
+        RegisteredCapital   = #{registeredCapital,jdbcType=INTEGER},
+        ProfessionID        = #{professionID,jdbcType=INTEGER},
+        EstateCategoryID    = #{estateCategoryID,jdbcType=INTEGER},
+        TagID               = #{tagID,jdbcType=INTEGER}
     where CompanyID = #{companyID,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.hz.employmentsite.model.PcCompany">
     update pc_company
-    set SiteID = #{siteID,jdbcType=VARCHAR},
-      RegionCode = #{regionCode,jdbcType=VARCHAR},
-      InsuredCount = #{insuredCount,jdbcType=INTEGER},
-      StreetCode = #{streetCode,jdbcType=VARCHAR},
-      CompanyName = #{companyName,jdbcType=VARCHAR},
-      CompanyCode = #{companyCode,jdbcType=VARCHAR},
-      CompanyModel = #{companyModel,jdbcType=INTEGER},
-      WorkSituation = #{workSituation,jdbcType=VARCHAR},
-      CompanyType = #{companyType,jdbcType=INTEGER},
-      CompanyAddress = #{companyAddress,jdbcType=VARCHAR},
-      UserName = #{userName,jdbcType=VARCHAR},
-      UserMobile = #{userMobile,jdbcType=VARCHAR},
-      CompanyEmail = #{companyEmail,jdbcType=VARCHAR},
-      FrName = #{frName,jdbcType=VARCHAR},
-      ValidDate = #{validDate,jdbcType=TIMESTAMP},
-      IsShortage = #{isShortage,jdbcType=INTEGER},
-      RecordStatus = #{recordStatus,jdbcType=INTEGER},
-      CreateUserID = #{createUserID,jdbcType=VARCHAR},
-      CreateTime = #{createTime,jdbcType=TIMESTAMP},
-      ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
-      Longitude = #{longitude,jdbcType=VARCHAR},
-      Latitude = #{latitude,jdbcType=VARCHAR},
-      openId = #{openId,jdbcType=VARCHAR}
+    set SiteID              = #{siteID,jdbcType=VARCHAR},
+        RegionCode          = #{regionCode,jdbcType=VARCHAR},
+        InsuredCount        = #{insuredCount,jdbcType=INTEGER},
+        StreetCode          = #{streetCode,jdbcType=VARCHAR},
+        CompanyName         = #{companyName,jdbcType=VARCHAR},
+        CompanyCode         = #{companyCode,jdbcType=VARCHAR},
+        CompanyModel        = #{companyModel,jdbcType=INTEGER},
+        WorkSituation       = #{workSituation,jdbcType=VARCHAR},
+        CompanyType         = #{companyType,jdbcType=INTEGER},
+        CompanyAddress      = #{companyAddress,jdbcType=VARCHAR},
+        UserName            = #{userName,jdbcType=VARCHAR},
+        UserMobile          = #{userMobile,jdbcType=VARCHAR},
+        CompanyEmail        = #{companyEmail,jdbcType=VARCHAR},
+        FrName              = #{frName,jdbcType=VARCHAR},
+        ValidDate           = #{validDate,jdbcType=TIMESTAMP},
+        IsShortage          = #{isShortage,jdbcType=INTEGER},
+        RecordStatus        = #{recordStatus,jdbcType=INTEGER},
+        CreateUserID        = #{createUserID,jdbcType=VARCHAR},
+        CreateTime          = #{createTime,jdbcType=TIMESTAMP},
+        ModifyUserID        = #{modifyUserID,jdbcType=VARCHAR},
+        ModifyTime          = #{modifyTime,jdbcType=TIMESTAMP},
+        Longitude           = #{longitude,jdbcType=VARCHAR},
+        Latitude            = #{latitude,jdbcType=VARCHAR},
+        openId              = #{openId,jdbcType=VARCHAR},
+        EstablishmentTime   = #{establishmentTime,jdbcType=TIMESTAMP},
+        SignInPoliticalArea = #{signInPoliticalArea,jdbcType=VARCHAR},
+        Website             = #{website,jdbcType=VARCHAR},
+        Bonus               = #{bonus,jdbcType=VARCHAR},
+        RegisteredCapital   = #{registeredCapital,jdbcType=INTEGER},
+        ProfessionID        = #{professionID,jdbcType=INTEGER},
+        EstateCategoryID    = #{estateCategoryID,jdbcType=INTEGER},
+        TagID               = #{tagID,jdbcType=INTEGER}
+
     where CompanyID = #{companyID,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -4,10 +4,18 @@
     <select id="getList" resultType="com.hz.employmentsite.vo.companyService.CompanyVo">
         select company.*,city.name as regionName,area.name as streetName,sys_cmodel.Name as companyModelType,
         (select count(*) from pc_post where CompanyID=company.CompanyID) as postCount,u.`Name` as createUserName
-        ,inSites.InstitutionID as institutionID,site.SiteName
+        ,inSites.InstitutionID as institutionID,site.SiteName,com_status.Name as recordStatusName,
+        com_profession.Name as professionName, com_estate.Name as estateCategoryName
         from pc_company company
         left join sys_user u on u.UserID = company.CreateUserID
-        left join (select * from sys_dictionary_item where DictionaryCode ='CompanyModel') sys_cmodel on company.CompanyModel = sys_cmodel.Value
+        left join (select * from sys_dictionary_item where DictionaryCode ='CompanyModel') sys_cmodel on
+        company.CompanyModel = sys_cmodel.Value
+        left join (select * from sys_dictionary_item where DictionaryCode ='CompanyStatus') com_status on
+        company.RecordStatus = com_status.Value
+        left join (select * from sys_dictionary_item where DictionaryCode ='CompanyProfession') com_profession on
+        company.ProfessionID = com_profession.Value
+        left join (select * from sys_dictionary_item where DictionaryCode ='CompanyEstateCategory') com_estate on
+        company.EstateCategoryID = com_estate.Value
         left join area_code city on company.RegionCode = city.code
         left join area_code area on company.StreetCode = area.code
         left join pc_site site on company.siteID = site.siteID

vue/src/api/companyService/company.ts

@@ -14,11 +14,11 @@ export function getList(params: any) {
   );
 }
 
-export function getCompanyById(id: string,loginUserID:string) {
+export function getCompanyById(id: string, loginUserID: any) {
   return request({
     url: 'companyService/company/getCompanyByID',
     method: 'get',
-    params: {id,loginUserID}
+    params: {id, loginUserID}
   }, {
     isNew: true
   })

vue/src/views/companyService/company/detail.vue

@@ -12,6 +12,16 @@
       <a-descriptions-item label="是否缺工">{{ companyInfo.isShortage == 0 ? '否' : '是' }}</a-descriptions-item>
       <a-descriptions-item label="企业所在经度">{{ companyInfo.longitude }}</a-descriptions-item>
       <a-descriptions-item label="企业所在纬度">{{ companyInfo.latitude }}</a-descriptions-item>
+      <a-descriptions-item label="企业成立日期">
+        {{ companyInfo.establishmentTime ? dayjs(companyInfo.establishmentTime).format('YYYY-MM-DD') : '' }}
+      </a-descriptions-item>
+      <a-descriptions-item label="注册资本">{{ companyInfo.registeredCapital }}万元</a-descriptions-item>
+      <a-descriptions-item label="注册地行政区划">{{ companyInfo.signInPoliticalArea }}</a-descriptions-item>
+      <a-descriptions-item label="所属行业">{{ companyInfo.professionName }}</a-descriptions-item>
+      <a-descriptions-item label="所属产业分类">{{ companyInfo.estateCategoryName }}</a-descriptions-item>
+      <a-descriptions-item label="企业标签">{{ companyInfo.tagName }}</a-descriptions-item>
+      <a-descriptions-item :span="3" label="官网网址">{{ companyInfo.website }}</a-descriptions-item>
+      <a-descriptions-item :span="3" label="企业福利">{{ companyInfo.bonus }}</a-descriptions-item>
     </a-descriptions>
     <a-divider orientation="left">附件照片</a-divider>
     <b-upload-file :fileRefId="companyInfo.companyID" :readonly="true" :multiple="true" style="width: 100%;"
@@ -66,13 +76,21 @@ const companyInfo = reactive({
   insuredCount: "",
   businScope: "",
   companyDesc: "",
+  establishmentTime: "",
+  registeredCapital: "",
+  signInPoliticalArea: "",
+  professionName: "",
+  estateCategoryName: "",
+  tagName: "",
+  website: "",
+  bonus: "",
 })
 // 文件数据
 const fileList = ref();
 
 // 数据加载
 function loadData(id: any) {
-  getCompanyById(id).then(result => {
+  getCompanyById(id, "").then(result => {
     Object.keys(companyInfo).forEach(key => {
       companyInfo[key] = result[key]
     })

vue/src/views/companyService/company/edit.vue

@@ -119,10 +119,97 @@
           >
             <a-input v-model:value="dataModel.latitude" placeholder=""/>
           </a-form-item>
-
         </a-col>
         <a-col :span="8">
-
+          <a-form-item
+            label="企业成立日期"
+            :label-col="{ span: 8 }"
+            name="establishmentTime"
+          >
+            <a-date-picker v-model:value="dataModel.establishmentTime" value-format="YYYY-MM-DD"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="注册资本"
+            :label-col="{ span: 8 }"
+            name="registeredCapital"
+          >
+            <a-input-number style="width: 100%" v-model:value="dataModel.registeredCapital" addon-after="万元"
+                            :controls="false"></a-input-number>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="注册地址行政区划"
+            :label-col="{ span: 8 }"
+            name="signInPoliticalArea"
+          >
+            <a-input v-model:value="dataModel.signInPoliticalArea"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="所属行业"
+            :label-col="{ span: 8 }"
+            name="professionID"
+          >
+            <a-select
+              ref="select"
+              v-model:value="dataModel.professionID"
+              :options="professionList"
+              :field-names="{ label: 'name', value: 'value' }"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="所属产业分类"
+            :label-col="{ span: 8 }"
+            name="estateCategoryID"
+          >
+            <a-select
+              ref="select"
+              v-model:value="dataModel.estateCategoryID"
+              :options="estateCategoryList"
+              :field-names="{ label: 'name', value: 'value' }"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="企业标签"
+            :label-col="{ span: 8 }"
+            name="tagID"
+          >
+            <a-select
+              ref="select"
+              v-model:value="dataModel.tagID"
+              :options="tagList"
+              :field-names="{ label: 'name', value: 'value' }"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="官网网址"
+            :label-col="{ span: 8 }"
+            name="website"
+          >
+            <a-input v-model:value="dataModel.website"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="企业福利"
+            :label-col="{ span: 8 }"
+            name="bonus"
+          >
+            <a-textarea v-model:value="dataModel.bonus" placeholder="" :rows="4"/>
+          </a-form-item>
         </a-col>
       </a-row>
       <a-divider orientation="left">附件图片上传</a-divider>
@@ -293,6 +380,7 @@ import {getSysDictionaryList} from '@/api/system/dictionary';
 import {getInfo} from '@/api/account';
 import dayjs from "dayjs";
 import {message} from "ant-design-vue";
+import {useUserStore} from "@/store/modules/user";
 
 interface FormState {
   dataModel: any;
@@ -302,6 +390,8 @@ export default defineComponent(
   {
     components: {BUploadFile},
     setup() {
+      const userStore = useUserStore();
+      const userInfo = ref(userStore.getUserInfo)
       const router = useRouter();
       const isAllowCommit = ref(true);
       const formState = reactive<FormState>({dataModel: {}});
@@ -317,10 +407,8 @@ export default defineComponent(
       //   let toDay = new Date();
       //   showDateTime.value = dayjs(new Date().toLocaleDateString().replaceAll("/", "-"));
       // }
-      const companyStatusList = ref<SelectProps['options']>([
-        {value: 1, name: '在营'},
-        {value: 0, name: '停业'},
-      ]);
+      const companyStatusList = ref<SelectProps['options']>();
+      const estateCategoryList = ref<SelectProps['options']>();
       const shortageStatusList = ref<SelectProps['options']>([
         {value: 1, name: '是'},
         {value: 0, name: '否'},
@@ -367,6 +455,16 @@ export default defineComponent(
         // console.log("companyCategoryList", companyCategoryList.value);
       }
 
+      const getCompanyStatusList = async function () {
+        const data: any = await getSysDictionaryList("CompanyStatus");
+        companyStatusList.value = data;
+      }
+
+      const getEstateCategoryList = async function () {
+        const data: any = await getSysDictionaryList("CompanyEstateCategory");
+        estateCategoryList.value = data;
+      }
+
       const siteChange = async function () {
         const curSiteData: any = await getSiteByID(formState.dataModel.siteID);
         formState.dataModel.regionCode = curSiteData.regionCode;
@@ -414,7 +512,8 @@ export default defineComponent(
 
       const inputDataValidate = () =>{
         const mobileReg = /^1[3|4|5|6|7|8|9]\d{9}$/;
-        if(!mobileReg.test(formState.dataModel.userMobile)){
+        const landlineReg = /[0-9-()（）]{7,18}/;
+        if (!mobileReg.test(formState.dataModel.userMobile) && !landlineReg.test(formState.dataModel.userMobile)) {
           message.error("输入的联系电话有误!");
           isAllowCommit.value = false;
         }
@@ -455,6 +554,8 @@ export default defineComponent(
         getRegionList();
         getCompanyModelList();
         getCompanyTypeList();
+        getCompanyStatusList();
+        getEstateCategoryList();
         getInfo().then((loginUserInfo:any)=>{
           console.log("userInfo",loginUserInfo.userID);
           getCompanyById(id,loginUserInfo.userID).then(result => {
@@ -486,10 +587,12 @@ export default defineComponent(
         showDateTime,
         regionChange,
         setFileList,
-        shortageStatusList
+        shortageStatusList,
+        userInfo,
+        estateCategoryList
       }
     },
-    created() {
+    mounted() {
       const id = history.state.params?.id;
       this.loadData(id);
     }