web-企业信息修改调整（所属行业选择,经营范围、企业简介保存)

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

@@ -1,5 +1,6 @@
 package com.hz.employmentsite.model;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 public class PcCompany {
@@ -55,13 +56,9 @@ public class PcCompany {
 
     private Date establishmentTime;
 
-    private String signInPoliticalArea;
-
-    private String website;
+    private BigDecimal registeredCapital;
 
-    private String bonus;
-
-    private Double registeredCapital;
+    private String signInPoliticalArea;
 
     private String industryID;
 
@@ -69,6 +66,10 @@ public class PcCompany {
 
     private Integer tagID;
 
+    private String website;
+
+    private String bonus;
+
     public String getCompanyID() {
         return companyID;
     }
@@ -277,36 +278,20 @@ public class PcCompany {
         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 BigDecimal getRegisteredCapital() {
+        return registeredCapital;
     }
 
-    public void setBonus(String bonus) {
-        this.bonus = bonus;
+    public void setRegisteredCapital(BigDecimal registeredCapital) {
+        this.registeredCapital = registeredCapital;
     }
 
-    public Double getRegisteredCapital() {
-        return registeredCapital;
+    public String getSignInPoliticalArea() {
+        return signInPoliticalArea;
     }
 
-    public void setRegisteredCapital(Double registeredCapital) {
-        this.registeredCapital = registeredCapital;
+    public void setSignInPoliticalArea(String signInPoliticalArea) {
+        this.signInPoliticalArea = signInPoliticalArea == null ? null : signInPoliticalArea.trim();
     }
 
     public String getIndustryID() {
@@ -314,7 +299,7 @@ public class PcCompany {
     }
 
     public void setIndustryID(String industryID) {
-        this.industryID = industryID;
+        this.industryID = industryID == null ? null : industryID.trim();
     }
 
     public Integer getEstateCategoryID() {
@@ -332,4 +317,20 @@ public class PcCompany {
     public void setTagID(Integer tagID) {
         this.tagID = tagID;
     }
+
+    public String getWebsite() {
+        return website;
+    }
+
+    public void setWebsite(String website) {
+        this.website = website == null ? null : website.trim();
+    }
+
+    public String getBonus() {
+        return bonus;
+    }
+
+    public void setBonus(String bonus) {
+        this.bonus = bonus == null ? null : bonus.trim();
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.hz.employmentsite.model;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -1774,6 +1775,526 @@ public class PcCompanyExample {
             addCriterion("openId not between", value1, value2, "openId");
             return (Criteria) this;
         }
+
+        public Criteria andEstablishmentTimeIsNull() {
+            addCriterion("EstablishmentTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstablishmentTimeIsNotNull() {
+            addCriterion("EstablishmentTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstablishmentTimeEqualTo(Date value) {
+            addCriterion("EstablishmentTime =", value, "establishmentTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstablishmentTimeNotEqualTo(Date value) {
+            addCriterion("EstablishmentTime <>", value, "establishmentTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstablishmentTimeGreaterThan(Date value) {
+            addCriterion("EstablishmentTime >", value, "establishmentTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstablishmentTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("EstablishmentTime >=", value, "establishmentTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstablishmentTimeLessThan(Date value) {
+            addCriterion("EstablishmentTime <", value, "establishmentTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstablishmentTimeLessThanOrEqualTo(Date value) {
+            addCriterion("EstablishmentTime <=", value, "establishmentTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstablishmentTimeIn(List<Date> values) {
+            addCriterion("EstablishmentTime in", values, "establishmentTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstablishmentTimeNotIn(List<Date> values) {
+            addCriterion("EstablishmentTime not in", values, "establishmentTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstablishmentTimeBetween(Date value1, Date value2) {
+            addCriterion("EstablishmentTime between", value1, value2, "establishmentTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstablishmentTimeNotBetween(Date value1, Date value2) {
+            addCriterion("EstablishmentTime not between", value1, value2, "establishmentTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalIsNull() {
+            addCriterion("RegisteredCapital is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalIsNotNull() {
+            addCriterion("RegisteredCapital is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalEqualTo(BigDecimal value) {
+            addCriterion("RegisteredCapital =", value, "registeredCapital");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalNotEqualTo(BigDecimal value) {
+            addCriterion("RegisteredCapital <>", value, "registeredCapital");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalGreaterThan(BigDecimal value) {
+            addCriterion("RegisteredCapital >", value, "registeredCapital");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("RegisteredCapital >=", value, "registeredCapital");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalLessThan(BigDecimal value) {
+            addCriterion("RegisteredCapital <", value, "registeredCapital");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("RegisteredCapital <=", value, "registeredCapital");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalIn(List<BigDecimal> values) {
+            addCriterion("RegisteredCapital in", values, "registeredCapital");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalNotIn(List<BigDecimal> values) {
+            addCriterion("RegisteredCapital not in", values, "registeredCapital");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("RegisteredCapital between", value1, value2, "registeredCapital");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegisteredCapitalNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("RegisteredCapital not between", value1, value2, "registeredCapital");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignInPoliticalAreaIsNull() {
+            addCriterion("SignInPoliticalArea is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignInPoliticalAreaIsNotNull() {
+            addCriterion("SignInPoliticalArea is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignInPoliticalAreaEqualTo(String value) {
+            addCriterion("SignInPoliticalArea =", value, "signInPoliticalArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignInPoliticalAreaNotEqualTo(String value) {
+            addCriterion("SignInPoliticalArea <>", value, "signInPoliticalArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignInPoliticalAreaGreaterThan(String value) {
+            addCriterion("SignInPoliticalArea >", value, "signInPoliticalArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignInPoliticalAreaGreaterThanOrEqualTo(String value) {
+            addCriterion("SignInPoliticalArea >=", value, "signInPoliticalArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignInPoliticalAreaLessThan(String value) {
+            addCriterion("SignInPoliticalArea <", value, "signInPoliticalArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignInPoliticalAreaLessThanOrEqualTo(String value) {
+            addCriterion("SignInPoliticalArea <=", value, "signInPoliticalArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignInPoliticalAreaLike(String value) {
+            addCriterion("SignInPoliticalArea like", value, "signInPoliticalArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignInPoliticalAreaNotLike(String value) {
+            addCriterion("SignInPoliticalArea not like", value, "signInPoliticalArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignInPoliticalAreaIn(List<String> values) {
+            addCriterion("SignInPoliticalArea in", values, "signInPoliticalArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignInPoliticalAreaNotIn(List<String> values) {
+            addCriterion("SignInPoliticalArea not in", values, "signInPoliticalArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignInPoliticalAreaBetween(String value1, String value2) {
+            addCriterion("SignInPoliticalArea between", value1, value2, "signInPoliticalArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignInPoliticalAreaNotBetween(String value1, String value2) {
+            addCriterion("SignInPoliticalArea not between", value1, value2, "signInPoliticalArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryIDIsNull() {
+            addCriterion("IndustryID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryIDIsNotNull() {
+            addCriterion("IndustryID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryIDEqualTo(String value) {
+            addCriterion("IndustryID =", value, "industryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryIDNotEqualTo(String value) {
+            addCriterion("IndustryID <>", value, "industryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryIDGreaterThan(String value) {
+            addCriterion("IndustryID >", value, "industryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryIDGreaterThanOrEqualTo(String value) {
+            addCriterion("IndustryID >=", value, "industryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryIDLessThan(String value) {
+            addCriterion("IndustryID <", value, "industryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryIDLessThanOrEqualTo(String value) {
+            addCriterion("IndustryID <=", value, "industryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryIDLike(String value) {
+            addCriterion("IndustryID like", value, "industryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryIDNotLike(String value) {
+            addCriterion("IndustryID not like", value, "industryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryIDIn(List<String> values) {
+            addCriterion("IndustryID in", values, "industryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryIDNotIn(List<String> values) {
+            addCriterion("IndustryID not in", values, "industryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryIDBetween(String value1, String value2) {
+            addCriterion("IndustryID between", value1, value2, "industryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryIDNotBetween(String value1, String value2) {
+            addCriterion("IndustryID not between", value1, value2, "industryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstateCategoryIDIsNull() {
+            addCriterion("EstateCategoryID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstateCategoryIDIsNotNull() {
+            addCriterion("EstateCategoryID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstateCategoryIDEqualTo(Integer value) {
+            addCriterion("EstateCategoryID =", value, "estateCategoryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstateCategoryIDNotEqualTo(Integer value) {
+            addCriterion("EstateCategoryID <>", value, "estateCategoryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstateCategoryIDGreaterThan(Integer value) {
+            addCriterion("EstateCategoryID >", value, "estateCategoryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstateCategoryIDGreaterThanOrEqualTo(Integer value) {
+            addCriterion("EstateCategoryID >=", value, "estateCategoryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstateCategoryIDLessThan(Integer value) {
+            addCriterion("EstateCategoryID <", value, "estateCategoryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstateCategoryIDLessThanOrEqualTo(Integer value) {
+            addCriterion("EstateCategoryID <=", value, "estateCategoryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstateCategoryIDIn(List<Integer> values) {
+            addCriterion("EstateCategoryID in", values, "estateCategoryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstateCategoryIDNotIn(List<Integer> values) {
+            addCriterion("EstateCategoryID not in", values, "estateCategoryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstateCategoryIDBetween(Integer value1, Integer value2) {
+            addCriterion("EstateCategoryID between", value1, value2, "estateCategoryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstateCategoryIDNotBetween(Integer value1, Integer value2) {
+            addCriterion("EstateCategoryID not between", value1, value2, "estateCategoryID");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIDIsNull() {
+            addCriterion("TagID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIDIsNotNull() {
+            addCriterion("TagID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIDEqualTo(Integer value) {
+            addCriterion("TagID =", value, "tagID");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIDNotEqualTo(Integer value) {
+            addCriterion("TagID <>", value, "tagID");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIDGreaterThan(Integer value) {
+            addCriterion("TagID >", value, "tagID");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIDGreaterThanOrEqualTo(Integer value) {
+            addCriterion("TagID >=", value, "tagID");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIDLessThan(Integer value) {
+            addCriterion("TagID <", value, "tagID");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIDLessThanOrEqualTo(Integer value) {
+            addCriterion("TagID <=", value, "tagID");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIDIn(List<Integer> values) {
+            addCriterion("TagID in", values, "tagID");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIDNotIn(List<Integer> values) {
+            addCriterion("TagID not in", values, "tagID");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIDBetween(Integer value1, Integer value2) {
+            addCriterion("TagID between", value1, value2, "tagID");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagIDNotBetween(Integer value1, Integer value2) {
+            addCriterion("TagID not between", value1, value2, "tagID");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebsiteIsNull() {
+            addCriterion("Website is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebsiteIsNotNull() {
+            addCriterion("Website is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebsiteEqualTo(String value) {
+            addCriterion("Website =", value, "website");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebsiteNotEqualTo(String value) {
+            addCriterion("Website <>", value, "website");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebsiteGreaterThan(String value) {
+            addCriterion("Website >", value, "website");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebsiteGreaterThanOrEqualTo(String value) {
+            addCriterion("Website >=", value, "website");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebsiteLessThan(String value) {
+            addCriterion("Website <", value, "website");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebsiteLessThanOrEqualTo(String value) {
+            addCriterion("Website <=", value, "website");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebsiteLike(String value) {
+            addCriterion("Website like", value, "website");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebsiteNotLike(String value) {
+            addCriterion("Website not like", value, "website");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebsiteIn(List<String> values) {
+            addCriterion("Website in", values, "website");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebsiteNotIn(List<String> values) {
+            addCriterion("Website not in", values, "website");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebsiteBetween(String value1, String value2) {
+            addCriterion("Website between", value1, value2, "website");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebsiteNotBetween(String value1, String value2) {
+            addCriterion("Website not between", value1, value2, "website");
+            return (Criteria) this;
+        }
+
+        public Criteria andBonusIsNull() {
+            addCriterion("Bonus is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBonusIsNotNull() {
+            addCriterion("Bonus is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBonusEqualTo(String value) {
+            addCriterion("Bonus =", value, "bonus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBonusNotEqualTo(String value) {
+            addCriterion("Bonus <>", value, "bonus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBonusGreaterThan(String value) {
+            addCriterion("Bonus >", value, "bonus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBonusGreaterThanOrEqualTo(String value) {
+            addCriterion("Bonus >=", value, "bonus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBonusLessThan(String value) {
+            addCriterion("Bonus <", value, "bonus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBonusLessThanOrEqualTo(String value) {
+            addCriterion("Bonus <=", value, "bonus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBonusLike(String value) {
+            addCriterion("Bonus like", value, "bonus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBonusNotLike(String value) {
+            addCriterion("Bonus not like", value, "bonus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBonusIn(List<String> values) {
+            addCriterion("Bonus in", values, "bonus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBonusNotIn(List<String> values) {
+            addCriterion("Bonus not in", values, "bonus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBonusBetween(String value1, String value2) {
+            addCriterion("Bonus between", value1, value2, "bonus");
+            return (Criteria) this;
+        }
+
+        public Criteria andBonusNotBetween(String value1, String value2) {
+            addCriterion("Bonus not between", value1, value2, "bonus");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -21,6 +21,8 @@ import com.hz.employmentsite.vo.companyService.PostVo;
 import com.hz.employmentsite.vo.dataMap.CompanyPostMapVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -145,7 +147,13 @@ public class CompanyServiceImpl implements CompanyService {
                     var curSiteInfo= pcSiteMapper.selectByExample(siteExp).stream().findFirst().orElse(null);
                     if( curSiteInfo != null){
                         if(isEdit){
-                            throw new  BaseException("1004","该企业已被"+curSiteInfo.getSiteName()+"，工号"+createSiteUserInfo.getUserNo()+"录入！");
+                            if(createSiteUserInfo.getUserNo().equals("0299999")||createSiteUserInfo.getUserNo().equals("202420648")){
+                                repeatData.setSiteID(data.getSiteID());
+                                pcCompanyMapper.updateByPrimaryKey(repeatData);
+                                return "0";
+                            }else{
+                                throw new  BaseException("1004","该企业已被"+curSiteInfo.getSiteName()+"，工号"+createSiteUserInfo.getUserNo()+"录入！");
+                            }
                         }
                         return "该企业已被"+ curSiteInfo.getSiteName()+"，工号"+createSiteUserInfo.getUserNo()+"录入！";
                     }
@@ -166,50 +174,55 @@ public class CompanyServiceImpl implements CompanyService {
             cro.andCompanyIDEqualTo(data.getCompanyID());
             dbData = pcCompanyMapper.selectByExampleWithBLOBs(exp).stream().findFirst().orElse(null);
         }
-        if(Integer.valueOf(ifHadRepeatData(data,true))>0) {
+        var resultNum = Integer.valueOf(ifHadRepeatData(data,true));
+        if(resultNum>0) {
             throw new  BaseException("1004","该企业已被录入！");
         }
         if (dbData == null) {
-            exp = new PcCompanyExample();
-            dbData = new PcCompanyWithBLOBs();
-//            dbData.setCompanyID(UUID.randomUUID().toString());
-            dbData.setCompanyID(data.getCompanyID());
-            dbData.setCompanyName(data.getCompanyName());
-            dbData.setIsShortage(data.getIsShortage());
-            dbData.setCompanyCode(data.getCompanyCode());
-            dbData.setSiteID(data.getSiteID());
-            dbData.setRegionCode(data.getRegionCode());
-            dbData.setStreetCode(data.getStreetCode());
-            dbData.setCompanyAddress(data.getCompanyAddress());
-            dbData.setWorkSituation(data.getWorkSituation());
-            dbData.setCompanyModel(data.getCompanyModel());
-            dbData.setCompanyType(data.getCompanyType());
-            dbData.setUserName(data.getUserName());
-            dbData.setUserMobile(data.getUserMobile());
-            dbData.setCompanyEmail(data.getCompanyEmail());
-            dbData.setFrName(data.getFrName());
-            dbData.setValidDate(data.getValidDate());
-            dbData.setRecordStatus(data.getRecordStatus());
-            dbData.setBusinScope(data.getBusinScope());
-            dbData.setCompanyDesc(data.getCompanyDesc());
-            dbData.setInsuredCount(data.getInsuredCount());
-            dbData.setLongitude(data.getLongitude());
-            dbData.setLatitude(data.getLatitude());
-            dbData.setOpenId(data.getOpenId());
-            dbData.setCreateTime(new Date());
-            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.setIndustryID(data.getIndustryID());
-            dbData.setEstateCategoryID(data.getEstateCategoryID());
-//            dbData.setTagID(data.getTagID());
-            result = pcCompanyMapper.insert(dbData);
+            //这里直接将公司转至当前驿站下
+            if(resultNum.equals(0)){
+                result = 1;
+            }
+            else{
 
+                dbData = new PcCompanyWithBLOBs();
+                dbData.setCompanyID(data.getCompanyID());
+                dbData.setCompanyName(data.getCompanyName());
+                dbData.setIsShortage(data.getIsShortage());
+                dbData.setCompanyCode(data.getCompanyCode());
+                dbData.setSiteID(data.getSiteID());
+                dbData.setRegionCode(data.getRegionCode());
+                dbData.setStreetCode(data.getStreetCode());
+                dbData.setCompanyAddress(data.getCompanyAddress());
+                dbData.setWorkSituation(data.getWorkSituation());
+                dbData.setCompanyModel(data.getCompanyModel());
+                dbData.setCompanyType(data.getCompanyType());
+                dbData.setUserName(data.getUserName());
+                dbData.setUserMobile(data.getUserMobile());
+                dbData.setCompanyEmail(data.getCompanyEmail());
+                dbData.setFrName(data.getFrName());
+                dbData.setValidDate(data.getValidDate());
+                dbData.setRecordStatus(data.getRecordStatus());
+                dbData.setBusinScope(data.getBusinScope());
+                dbData.setCompanyDesc(data.getCompanyDesc());
+                dbData.setInsuredCount(data.getInsuredCount());
+                dbData.setLongitude(data.getLongitude());
+                dbData.setLatitude(data.getLatitude());
+                dbData.setOpenId(data.getOpenId());
+                dbData.setCreateTime(new Date());
+                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.setIndustryID(data.getIndustryID());
+                dbData.setEstateCategoryID(data.getEstateCategoryID());
+                //dbData.setTagID(data.getTagID());
+                result = pcCompanyMapper.insert(dbData);
+            }
         } else {
             dbData.setCompanyName(data.getCompanyName());
             dbData.setCompanyCode(data.getCompanyCode());
@@ -243,7 +256,7 @@ public class CompanyServiceImpl implements CompanyService {
             dbData.setIndustryID(data.getIndustryID());
             dbData.setEstateCategoryID(data.getEstateCategoryID());
 //            dbData.setTagID(data.getTagID());
-            result = pcCompanyMapper.updateByPrimaryKey(dbData);
+            result = pcCompanyMapper.updateByPrimaryKeyWithBLOBs(dbData);
         }
 
         PcLabelCompanyExample labelEmp = new PcLabelCompanyExample();
@@ -561,7 +574,7 @@ public class CompanyServiceImpl implements CompanyService {
         companyVo.setFrName(pcFirm.getDbrName());
         if (pcFirm.getRegisteredCapital() != null && !pcFirm.getRegisteredCapital().trim().isBlank()) {
             try {
-                companyVo.setRegisteredCapital(Double.valueOf(pcFirm.getRegisteredCapital()));
+                companyVo.setRegisteredCapital(BigDecimal.valueOf(Double.valueOf(pcFirm.getRegisteredCapital())));
             } catch (Exception e) {
             }
         }

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

@@ -85,12 +85,13 @@ public class CompanyVo {
     public String latitude;
 
     public Date establishmentTime;
-    public Double registeredCapital;
+    public BigDecimal registeredCapital;
     public String signInPoliticalArea;
     public String signInPoliticalAreaName;
 
     public String industryID;
     public String industryName;
+    public String showIndustryName;
     public Integer estateCategoryID;
     public String estateCategoryName;
     public Integer tagID;

src/main/resources/mapping/PcCompanyMapper.xml

@@ -2,38 +2,39 @@
 <!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="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="DOUBLE" property="registeredCapital"/>
-    <result column="IndustryID" jdbcType="VARCHAR" property="industryID"/>
-    <result column="EstateCategoryID" jdbcType="INTEGER" property="estateCategoryID"/>
-    <result column="TagID" jdbcType="INTEGER" property="tagID"/>
+    <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" />
+    <result column="EstablishmentTime" jdbcType="TIMESTAMP" property="establishmentTime" />
+    <result column="RegisteredCapital" jdbcType="DECIMAL" property="registeredCapital" />
+    <result column="SignInPoliticalArea" jdbcType="VARCHAR" property="signInPoliticalArea" />
+    <result column="IndustryID" jdbcType="VARCHAR" property="industryID" />
+    <result column="EstateCategoryID" jdbcType="INTEGER" property="estateCategoryID" />
+    <result column="TagID" jdbcType="INTEGER" property="tagID" />
+    <result column="Website" jdbcType="VARCHAR" property="website" />
+    <result column="Bonus" jdbcType="VARCHAR" property="bonus" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hz.employmentsite.model.PcCompanyWithBLOBs">
     <result column="BusinScope" jdbcType="LONGVARCHAR" property="businScope" />
@@ -98,11 +99,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, EstablishmentTime,SignInPoliticalArea,Website,Bonus,RegisteredCapital,IndustryID,EstateCategoryID,TagID
+    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, EstablishmentTime, RegisteredCapital, SignInPoliticalArea, 
+    IndustryID, EstateCategoryID, TagID, Website, Bonus
   </sql>
   <sql id="Blob_Column_List">
     BusinScope, CompanyDesc
@@ -138,7 +139,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
-    select
+    select 
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
@@ -156,31 +157,30 @@
     </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,
-                            EstablishmentTime, RegisteredCapital, SignInPoliticalArea,
-                            IndustryID, 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=DOUBLE},
-            #{signInPoliticalArea,jdbcType=VARCHAR}, #{industryID,jdbcType=VARCHAR},
-            #{estateCategoryID,jdbcType=INTEGER},
-            #{tagID,jdbcType=INTEGER}, #{website,jdbcType=VARCHAR}, #{bonus,jdbcType=VARCHAR})
+    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, EstablishmentTime, RegisteredCapital, 
+      SignInPoliticalArea, IndustryID, EstateCategoryID, 
+      TagID, Website, Bonus, 
+      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}, #{establishmentTime,jdbcType=TIMESTAMP}, #{registeredCapital,jdbcType=DECIMAL}, 
+      #{signInPoliticalArea,jdbcType=VARCHAR}, #{industryID,jdbcType=VARCHAR}, #{estateCategoryID,jdbcType=INTEGER}, 
+      #{tagID,jdbcType=INTEGER}, #{website,jdbcType=VARCHAR}, #{bonus,jdbcType=VARCHAR}, 
+      #{businScope,jdbcType=LONGVARCHAR}, #{companyDesc,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcCompanyWithBLOBs">
     insert into pc_company
@@ -260,35 +260,35 @@
       <if test="openId != null">
         openId,
       </if>
-      <if test="businScope != null">
-        BusinScope,
-      </if>
-      <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,
+        EstablishmentTime,
       </if>
       <if test="registeredCapital != null">
-        registeredCapital,
+        RegisteredCapital,
+      </if>
+      <if test="signInPoliticalArea != null">
+        SignInPoliticalArea,
       </if>
       <if test="industryID != null">
-        industryID,
+        IndustryID,
       </if>
       <if test="estateCategoryID != null">
-        estateCategoryID,
+        EstateCategoryID,
       </if>
       <if test="tagID != null">
-        tagID,
+        TagID,
+      </if>
+      <if test="website != null">
+        Website,
+      </if>
+      <if test="bonus != null">
+        Bonus,
+      </if>
+      <if test="businScope != null">
+        BusinScope,
+      </if>
+      <if test="companyDesc != null">
+        CompanyDesc,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -367,27 +367,15 @@
       <if test="openId != null">
         #{openId,jdbcType=VARCHAR},
       </if>
-      <if test="businScope != null">
-        #{businScope,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="companyDesc != null">
-        #{companyDesc,jdbcType=LONGVARCHAR},
-      </if>
       <if test="establishmentTime != null">
         #{establishmentTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="registeredCapital != null">
+        #{registeredCapital,jdbcType=DECIMAL},
+      </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=DOUBLE},
-      </if>
       <if test="industryID != null">
         #{industryID,jdbcType=VARCHAR},
       </if>
@@ -397,6 +385,18 @@
       <if test="tagID != null">
         #{tagID,jdbcType=INTEGER},
       </if>
+      <if test="website != null">
+        #{website,jdbcType=VARCHAR},
+      </if>
+      <if test="bonus != null">
+        #{bonus,jdbcType=VARCHAR},
+      </if>
+      <if test="businScope != null">
+        #{businScope,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="companyDesc != null">
+        #{companyDesc,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hz.employmentsite.model.PcCompanyExample" resultType="java.lang.Long">
@@ -483,27 +483,15 @@
       <if test="row.openId != null">
         openId = #{row.openId,jdbcType=VARCHAR},
       </if>
-      <if test="row.businScope != null">
-        BusinScope = #{row.businScope,jdbcType=LONGVARCHAR},
-      </if>
-      <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.registeredCapital != null">
+        RegisteredCapital = #{row.registeredCapital,jdbcType=DECIMAL},
+      </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=DOUBLE},
-      </if>
       <if test="row.industryID != null">
         IndustryID = #{row.industryID,jdbcType=VARCHAR},
       </if>
@@ -513,6 +501,18 @@
       <if test="row.tagID != null">
         TagID = #{row.tagID,jdbcType=INTEGER},
       </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.businScope != null">
+        BusinScope = #{row.businScope,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="row.companyDesc != null">
+        CompanyDesc = #{row.companyDesc,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -521,40 +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},
-    EstablishmentTime = #{row.establishmentTime,jdbcType=TIMESTAMP},
-    SignInPoliticalArea = #{row.signInPoliticalArea,jdbcType=VARCHAR},
-    Website = #{row.website,jdbcType=VARCHAR},
-    Bonus = #{row.bonus,jdbcType=VARCHAR},
-    RegisteredCapital = #{row.registeredCapital,jdbcType=DOUBLE},
-    IndustryID = #{row.industryID,jdbcType=VARCHAR},
-    EstateCategoryID = #{row.estateCategoryID,jdbcType=INTEGER},
-    TagID = #{row.tagID,jdbcType=INTEGER}
+      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},
+      RegisteredCapital = #{row.registeredCapital,jdbcType=DECIMAL},
+      SignInPoliticalArea = #{row.signInPoliticalArea,jdbcType=VARCHAR},
+      IndustryID = #{row.industryID,jdbcType=VARCHAR},
+      EstateCategoryID = #{row.estateCategoryID,jdbcType=INTEGER},
+      TagID = #{row.tagID,jdbcType=INTEGER},
+      Website = #{row.website,jdbcType=VARCHAR},
+      Bonus = #{row.bonus,jdbcType=VARCHAR},
+      BusinScope = #{row.businScope,jdbcType=LONGVARCHAR},
+      CompanyDesc = #{row.companyDesc,jdbcType=LONGVARCHAR}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -562,38 +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},
-    EstablishmentTime = #{row.establishmentTime,jdbcType=TIMESTAMP},
-    SignInPoliticalArea = #{row.signInPoliticalArea,jdbcType=VARCHAR},
-    Website = #{row.website,jdbcType=VARCHAR},
-    Bonus = #{row.bonus,jdbcType=VARCHAR},
-    RegisteredCapital = #{row.registeredCapital,jdbcType=DOUBLE},
-    IndustryID = #{row.industryID,jdbcType=VARCHAR},
-    EstateCategoryID = #{row.estateCategoryID,jdbcType=INTEGER},
-    TagID = #{row.tagID,jdbcType=INTEGER}
+      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},
+      RegisteredCapital = #{row.registeredCapital,jdbcType=DECIMAL},
+      SignInPoliticalArea = #{row.signInPoliticalArea,jdbcType=VARCHAR},
+      IndustryID = #{row.industryID,jdbcType=VARCHAR},
+      EstateCategoryID = #{row.estateCategoryID,jdbcType=INTEGER},
+      TagID = #{row.tagID,jdbcType=INTEGER},
+      Website = #{row.website,jdbcType=VARCHAR},
+      Bonus = #{row.bonus,jdbcType=VARCHAR}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -673,27 +673,15 @@
       <if test="openId != null">
         openId = #{openId,jdbcType=VARCHAR},
       </if>
-      <if test="businScope != null">
-        BusinScope = #{businScope,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="companyDesc != null">
-        CompanyDesc = #{companyDesc,jdbcType=LONGVARCHAR},
-      </if>
       <if test="establishmentTime != null">
         EstablishmentTime = #{establishmentTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="registeredCapital != null">
+        RegisteredCapital = #{registeredCapital,jdbcType=DECIMAL},
+      </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=DOUBLE},
-      </if>
       <if test="industryID != null">
         IndustryID = #{industryID,jdbcType=VARCHAR},
       </if>
@@ -703,82 +691,93 @@
       <if test="tagID != null">
         TagID = #{tagID,jdbcType=INTEGER},
       </if>
+      <if test="website != null">
+        Website = #{website,jdbcType=VARCHAR},
+      </if>
+      <if test="bonus != null">
+        Bonus = #{bonus,jdbcType=VARCHAR},
+      </if>
+      <if test="businScope != null">
+        BusinScope = #{businScope,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="companyDesc != null">
+        CompanyDesc = #{companyDesc,jdbcType=LONGVARCHAR},
+      </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},
-        EstablishmentTime   = #{establishmentTime,jdbcType=TIMESTAMP},
-        SignInPoliticalArea = #{signInPoliticalArea,jdbcType=VARCHAR},
-        Website             = #{website,jdbcType=VARCHAR},
-        Bonus               = #{bonus,jdbcType=VARCHAR},
-        RegisteredCapital   = #{registeredCapital,jdbcType=DOUBLE},
-        IndustryID          = #{industryID,jdbcType=VARCHAR},
-        EstateCategoryID    = #{estateCategoryID,jdbcType=INTEGER},
-        TagID               = #{tagID,jdbcType=INTEGER}
+    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},
+      RegisteredCapital = #{registeredCapital,jdbcType=DECIMAL},
+      SignInPoliticalArea = #{signInPoliticalArea,jdbcType=VARCHAR},
+      IndustryID = #{industryID,jdbcType=VARCHAR},
+      EstateCategoryID = #{estateCategoryID,jdbcType=INTEGER},
+      TagID = #{tagID,jdbcType=INTEGER},
+      Website = #{website,jdbcType=VARCHAR},
+      Bonus = #{bonus,jdbcType=VARCHAR},
+      BusinScope = #{businScope,jdbcType=LONGVARCHAR},
+      CompanyDesc = #{companyDesc,jdbcType=LONGVARCHAR}
     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},
-        EstablishmentTime   = #{establishmentTime,jdbcType=TIMESTAMP},
-        SignInPoliticalArea = #{signInPoliticalArea,jdbcType=VARCHAR},
-        Website             = #{website,jdbcType=VARCHAR},
-        Bonus               = #{bonus,jdbcType=VARCHAR},
-        RegisteredCapital   = #{registeredCapital,jdbcType=DOUBLE},
-        IndustryID          = #{industryID,jdbcType=VARCHAR},
-        EstateCategoryID    = #{estateCategoryID,jdbcType=INTEGER},
-        TagID               = #{tagID,jdbcType=INTEGER}
-
+    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},
+      RegisteredCapital = #{registeredCapital,jdbcType=DECIMAL},
+      SignInPoliticalArea = #{signInPoliticalArea,jdbcType=VARCHAR},
+      IndustryID = #{industryID,jdbcType=VARCHAR},
+      EstateCategoryID = #{estateCategoryID,jdbcType=INTEGER},
+      TagID = #{tagID,jdbcType=INTEGER},
+      Website = #{website,jdbcType=VARCHAR},
+      Bonus = #{bonus,jdbcType=VARCHAR}
     where CompanyID = #{companyID,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -6,7 +6,8 @@
         signInPoliticalAreaName,sys_cmodel.Name as companyModelType,
         postCountData.postCount,u.`Name` as createUserName
         ,inSites.InstitutionID as institutionID,site.SiteName,com_status.Name as recordStatusName,
-        industry.industryName as industryName, com_estate.Name as estateCategoryName,com_type.Name as companyTypeName,
+        industry.industryName as industryName,industry.industryName as showIndustryName,
+        com_estate.Name as estateCategoryName,com_type.Name as companyTypeName,
         com_tag.Name as tagName,com_short.Name as isShortageName,modifyUser.Name as modifyUserName
         from pc_company company
         left join sys_user u on u.UserID = company.CreateUserID

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

@@ -183,10 +183,9 @@
           <a-form-item
             label="所属行业"
             :label-col="{ span: 8 }"
-            name="industryID"
+            name="showIndustryName"
           >
-            <a-cascader :load-data="loadLevelIndustryList"
-                        v-model:value="dataModel.industryName"
+            <a-cascader :load-data="loadLevelIndustryList" v-model:value="dataModel.showIndustryName"
                         :options="IndustryList" change-on-select @change="industryChange">
             </a-cascader>
           </a-form-item>
@@ -486,6 +485,13 @@ export default defineComponent(
         firmNameFetching.value = false;
       });
 
+      watch(() => formState.dataModel.showIndustryName, (selectedValues) => {
+        if (selectedValues && selectedValues.length == 2) {
+          formState.dataModel.industryID = selectedValues[1];
+          formState.dataModel.hasIndustry = true;
+        }
+      });
+
       const regionList = ref<SelectProps['options']>();
       const streetList = ref<SelectProps['options']>();
       const companyTypeList = ref<SelectProps['options']>();
@@ -624,8 +630,14 @@ export default defineComponent(
         };
         companyCodeValidate();
         inputDataValidate();
-        console.log("isAllowCommit",isAllowCommit.value);
+        if(!formState.dataModel.hasIndustry){
+          message.error("请选择完整的所属行业！");
+          return;
+        }
+        console.log("当前企业信息",formState.dataModel);
+
         if(isAllowCommit.value){
+          formState.dataModel.showIndustryName = null;
           saveCompany(formState.dataModel).then(result => {
             if (result) {
               tabsViewStore.closeCurrentTabByPath('/companyService/enterprise/add');
@@ -651,6 +663,7 @@ export default defineComponent(
       const loadLevelIndustryList = (selectedOptions) => {
         let targetOption = selectedOptions[selectedOptions.length - 1];
         if (targetOption) {
+          if (targetOption.tag == 'firstLevel') {
           get("industry/getListByParentIndustryID", {parentIndustryID: targetOption.value}).then(data => {
             targetOption.loading = false;
             targetOption.children = (data as any[]).map((x) => {
@@ -662,14 +675,14 @@ export default defineComponent(
               };
             });
           });
-          formState.dataModel.hasindustry = false;
+          formState.dataModel.hasIndustry = false;
+        }
         }
       };
 
       // 职业资格选择变更事件
       function industryChange(value: any, selectedOptions: any) {
         if (value.length >= 2) {
-          formState.dataModel.industryID = selectedOptions[1].value;
           formState.dataModel.industryName = selectedOptions[1].label;
         }
       }
@@ -719,7 +732,8 @@ export default defineComponent(
           console.log("userInfo",loginUserInfo.userID);
           getCompanyById(id,loginUserInfo.userID).then(result => {
             formState.dataModel = result;
-            // console.log("curDataModel",formState.dataModel);
+            formState.dataModel.hasIndustry = true;
+            console.log("curDataModel",formState.dataModel);
             showPicker.value = formState.dataModel.validDate == '2099-12-31T00:00:00.000+08:00' ? '1' : '2';
             if (showPicker.value === '1') {
               showDateTime.value = dayjs(new Date().toLocaleDateString().replaceAll("/", "-"));

vue/src/views/companyService/post/edit.vue

@@ -551,8 +551,8 @@ export default defineComponent(
       function companyChange(value: any) {
         getInfo().then((loginUserInfo: any) => {
           getCompanyById(value, loginUserInfo.userID).then(result => {
-            console.log(result)
-            postCompany.dataModel.welfare = result.bonus
+            console.log(result);
+            postCompany.dataModel.welfare = result.bonus;
           })
         });
       }