求职人员、企业信息导入逻辑、模板调整

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

@@ -361,6 +361,8 @@ public class CompanyServiceImpl implements CompanyService {
         List<PcIndustry> industryList = industryService.getAllList();
         // 企业产业分类
         List<SysDictionaryItem> companyEstateCategory = dictionaryService.getDictionaryItemByCodeList("CompanyEstateCategory");
+        // 企业注册资本类型
+        List<SysDictionaryItem> registeredCapitalTypeList = dictionaryService.getDictionaryItemList("RegisteredCapitalType");
 
         List<CompanyVo> resultList = new ArrayList<>();
         PcSite finalCurLoginUserSiteInfo = curLoginUserSiteInfo;
@@ -437,19 +439,33 @@ public class CompanyServiceImpl implements CompanyService {
                 else item.isShortage = 0;
             }
 
+            if (!stringUtils.IsNullOrEmpty(item.getRegisteredCapitalTypeStr())) {
+                item.registeredCapitalType = registeredCapitalTypeList.stream().filter(it -> it.getName().equals(item.getRegisteredCapitalTypeStr().trim()))
+                        .findFirst().orElse(new SysDictionaryItem()).getValue();
+                if (item.registeredCapitalType == null)
+                    errorInfo += "注册资本类型不存在！";
+            }
+
+
             if (!stringUtils.IsNullOrEmpty(item.getSignInPoliticalAreaName())) {
                 item.signInPoliticalArea = regionDataList.stream().filter(it -> it.getName().equals(item.signInPoliticalAreaName.trim()))
                         .findFirst().orElse(new SysDictionaryItem()).getCode();
+                if (item.signInPoliticalArea == null)
+                    errorInfo += "注册地址行政区划不存在！";
             }
 
             if (!stringUtils.IsNullOrEmpty(item.getIndustryName())) {
                 item.industryID = industryList.stream().filter(it -> it.getIndustryName().equals(item.industryName.trim()))
                         .findFirst().orElse(new PcIndustry()).getIndustryId();
+                if (item.industryID == null)
+                    errorInfo += "所属行业不存在！";
             }
 
             if (!stringUtils.IsNullOrEmpty(item.getEstateCategoryName())) {
                 item.estateCategoryID = companyEstateCategory.stream().filter(it -> it.getName().equals(item.estateCategoryName.trim()))
                         .findFirst().orElse(new SysDictionaryItem()).getValue();
+                if (item.estateCategoryID == null)
+                    errorInfo += "所属产业分类不存在！";
             }
 
             if (!stringUtils.IsNullOrEmpty(item.validDateStr))
@@ -474,8 +490,9 @@ public class CompanyServiceImpl implements CompanyService {
                     errorInfo += "经济类型不存在！";
             }
 
-
-            if (!stringUtils.IsNullOrEmpty(item.getRegionName())) {
+            if (stringUtils.IsNullOrEmpty(item.isShortageName))
+                errorInfo += "请选择所属县区!";
+            else {
                 item.setRegionCode(regionDataList.stream().filter(it -> it.getName().equals(item.getRegionName().trim()))
                         .findFirst().orElse(new SysDictionaryItem()).getCode());
                 if (item.getRegionCode() == null)

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobUserServiceImpl.java

@@ -778,7 +778,9 @@ public class JobUserServiceImpl implements JobUserService {
                 }
             }
 
-            if (!stringUtils.IsNullOrEmpty(item.getRegionName())) {
+            if (stringUtils.IsNullOrEmpty(item.getUserMobile()))
+                errorInfo += "请选择市/县!";
+            else{
                 item.setRegionCode(regionDataList.stream().filter(it -> it.getName().equals(item.getRegionName().trim()))
                         .findFirst().orElse(new SysDictionaryItem()).getCode());
                 if (item.getRegionCode() == null)

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

@@ -87,6 +87,7 @@ public class CompanyVo {
     public Date establishmentTime;
     public BigDecimal registeredCapital;
     public Integer registeredCapitalType;
+    public String registeredCapitalTypeStr;
     public String signInPoliticalArea;
     public String signInPoliticalAreaName;
 

vue/src/views/companyService/company/index.vue

@@ -208,7 +208,8 @@ export default defineComponent({
         {cnName: '企业所在纬度', enName: 'latitude', width: 100},
         {cnName: '企业成立日期', enName: 'establishmentTime', width: 140},
         {cnName: '营业执照有效期', enName: 'validDateStr', width: 100},
-        {cnName: '企业注册资本（万元）', enName: 'registeredCapital', width: 100},
+        {cnName: '企业注册资本', enName: 'registeredCapital', width: 100},
+        {cnName: '注册资本类型', enName: 'registeredCapitalTypeStr', width: 100},
         {cnName: '注册地址行政区划', enName: 'signInPoliticalAreaName', width: 100},
         {cnName: '所属行业', enName: 'industryName', width: 100},
         {cnName: '所属产业分类', enName: 'estateCategoryName', width: 100},