feat: 企业行业数据录入

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

@@ -0,0 +1,35 @@
+package com.hz.employmentsite.controller.companyService;
+
+import com.hz.employmentsite.filter.exception.BaseResponse;
+import com.hz.employmentsite.filter.exception.RespGenerstor;
+import com.hz.employmentsite.model.SysDictionaryItem;
+import com.hz.employmentsite.services.service.companyService.IndustryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/industry")
+public class IndustryController {
+    @Autowired
+    private IndustryService industryService;
+
+    @ResponseBody
+    @GetMapping("/getFirstIndustryList")
+    public BaseResponse<List<SysDictionaryItem>> getList() {
+        return RespGenerstor.success(industryService.getList());
+    }
+
+    @ResponseBody
+    @GetMapping("/getListByParentIndustryID")
+    public BaseResponse<List<SysDictionaryItem>> getListByParentOccupationalID(@RequestParam("parentIndustryID") String parentIndustryID) {
+        return RespGenerstor.success(industryService.getListByParentIndustryID(parentIndustryID));
+    }
+
+    @ResponseBody
+    @GetMapping("/getParentIndustryID")
+    public BaseResponse<String> getParentOccupationalID(@RequestParam("IndustryID") String IndustryID) {
+        return RespGenerstor.success(industryService.getParentIndustryID(IndustryID));
+    }
+}

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

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

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

@@ -63,7 +63,7 @@ public class PcCompany {
 
     private Integer registeredCapital;
 
-    private Integer professionID;
+    private String industryID;
 
     private Integer estateCategoryID;
 
@@ -309,12 +309,12 @@ public class PcCompany {
         this.registeredCapital = registeredCapital;
     }
 
-    public Integer getProfessionID() {
-        return professionID;
+    public String getIndustryID() {
+        return industryID;
     }
 
-    public void setProfessionID(Integer professionID) {
-        this.professionID = professionID;
+    public void setIndustryID(String industryID) {
+        this.industryID = industryID;
     }
 
     public Integer getEstateCategoryID() {

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

@@ -0,0 +1,85 @@
+package com.hz.employmentsite.model;
+
+import java.util.Date;
+
+public class PcIndustry {
+    private String industryId;
+
+    private String industryName;
+
+    private Integer sort;
+
+    private String parentId;
+
+    private Date createTime;
+
+    private String createBy;
+
+    private Date updateTime;
+
+    private String updateBy;
+
+    public String getIndustryId() {
+        return industryId;
+    }
+
+    public void setIndustryId(String industryId) {
+        this.industryId = industryId == null ? null : industryId.trim();
+    }
+
+    public String getIndustryName() {
+        return industryName;
+    }
+
+    public void setIndustryName(String industryName) {
+        this.industryName = industryName == null ? null : industryName.trim();
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId == null ? null : parentId.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy == null ? null : createBy.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy == null ? null : updateBy.trim();
+    }
+}

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

@@ -0,0 +1,730 @@
+package com.hz.employmentsite.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PcIndustryExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public PcIndustryExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        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 andIndustryNameIsNull() {
+            addCriterion("industryName is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryNameIsNotNull() {
+            addCriterion("industryName is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryNameEqualTo(String value) {
+            addCriterion("industryName =", value, "industryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryNameNotEqualTo(String value) {
+            addCriterion("industryName <>", value, "industryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryNameGreaterThan(String value) {
+            addCriterion("industryName >", value, "industryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryNameGreaterThanOrEqualTo(String value) {
+            addCriterion("industryName >=", value, "industryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryNameLessThan(String value) {
+            addCriterion("industryName <", value, "industryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryNameLessThanOrEqualTo(String value) {
+            addCriterion("industryName <=", value, "industryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryNameLike(String value) {
+            addCriterion("industryName like", value, "industryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryNameNotLike(String value) {
+            addCriterion("industryName not like", value, "industryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryNameIn(List<String> values) {
+            addCriterion("industryName in", values, "industryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryNameNotIn(List<String> values) {
+            addCriterion("industryName not in", values, "industryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryNameBetween(String value1, String value2) {
+            addCriterion("industryName between", value1, value2, "industryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndustryNameNotBetween(String value1, String value2) {
+            addCriterion("industryName not between", value1, value2, "industryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortIsNull() {
+            addCriterion("sort is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortIsNotNull() {
+            addCriterion("sort is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortEqualTo(Integer value) {
+            addCriterion("sort =", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortNotEqualTo(Integer value) {
+            addCriterion("sort <>", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortGreaterThan(Integer value) {
+            addCriterion("sort >", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortGreaterThanOrEqualTo(Integer value) {
+            addCriterion("sort >=", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortLessThan(Integer value) {
+            addCriterion("sort <", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortLessThanOrEqualTo(Integer value) {
+            addCriterion("sort <=", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortIn(List<Integer> values) {
+            addCriterion("sort in", values, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortNotIn(List<Integer> values) {
+            addCriterion("sort not in", values, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortBetween(Integer value1, Integer value2) {
+            addCriterion("sort between", value1, value2, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortNotBetween(Integer value1, Integer value2) {
+            addCriterion("sort not between", value1, value2, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdIsNull() {
+            addCriterion("parentId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdIsNotNull() {
+            addCriterion("parentId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdEqualTo(String value) {
+            addCriterion("parentId =", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotEqualTo(String value) {
+            addCriterion("parentId <>", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdGreaterThan(String value) {
+            addCriterion("parentId >", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdGreaterThanOrEqualTo(String value) {
+            addCriterion("parentId >=", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdLessThan(String value) {
+            addCriterion("parentId <", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdLessThanOrEqualTo(String value) {
+            addCriterion("parentId <=", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdLike(String value) {
+            addCriterion("parentId like", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotLike(String value) {
+            addCriterion("parentId not like", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdIn(List<String> values) {
+            addCriterion("parentId in", values, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotIn(List<String> values) {
+            addCriterion("parentId not in", values, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdBetween(String value1, String value2) {
+            addCriterion("parentId between", value1, value2, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotBetween(String value1, String value2) {
+            addCriterion("parentId not between", value1, value2, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("createTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("createTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("createTime =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("createTime <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("createTime >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("createTime >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("createTime <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("createTime <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("createTime in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("createTime not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("createTime between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("createTime not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNull() {
+            addCriterion("createBy is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNotNull() {
+            addCriterion("createBy is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByEqualTo(String value) {
+            addCriterion("createBy =", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotEqualTo(String value) {
+            addCriterion("createBy <>", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThan(String value) {
+            addCriterion("createBy >", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThanOrEqualTo(String value) {
+            addCriterion("createBy >=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThan(String value) {
+            addCriterion("createBy <", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThanOrEqualTo(String value) {
+            addCriterion("createBy <=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLike(String value) {
+            addCriterion("createBy like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotLike(String value) {
+            addCriterion("createBy not like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIn(List<String> values) {
+            addCriterion("createBy in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotIn(List<String> values) {
+            addCriterion("createBy not in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByBetween(String value1, String value2) {
+            addCriterion("createBy between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotBetween(String value1, String value2) {
+            addCriterion("createBy not between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("updateTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("updateTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("updateTime =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("updateTime <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("updateTime >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updateTime >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("updateTime <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("updateTime <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("updateTime in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("updateTime not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("updateTime between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("updateTime not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNull() {
+            addCriterion("updateBy is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNotNull() {
+            addCriterion("updateBy is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByEqualTo(String value) {
+            addCriterion("updateBy =", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotEqualTo(String value) {
+            addCriterion("updateBy <>", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThan(String value) {
+            addCriterion("updateBy >", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThanOrEqualTo(String value) {
+            addCriterion("updateBy >=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThan(String value) {
+            addCriterion("updateBy <", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThanOrEqualTo(String value) {
+            addCriterion("updateBy <=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLike(String value) {
+            addCriterion("updateBy like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotLike(String value) {
+            addCriterion("updateBy not like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIn(List<String> values) {
+            addCriterion("updateBy in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotIn(List<String> values) {
+            addCriterion("updateBy not in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByBetween(String value1, String value2) {
+            addCriterion("updateBy between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotBetween(String value1, String value2) {
+            addCriterion("updateBy not between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -146,7 +146,7 @@ public class CompanyServiceImpl implements CompanyService {
             dbData.setSignInPoliticalArea(data.getSignInPoliticalArea());
             dbData.setWebsite(data.getWebsite());
             dbData.setBonus(data.getBonus());
-            dbData.setProfessionID(data.getProfessionID());
+            dbData.setIndustryID(data.getIndustryID());
             dbData.setEstateCategoryID(data.getEstateCategoryID());
             dbData.setTagID(data.getTagID());
             result = pcCompanyMapper.insert(dbData);
@@ -181,7 +181,7 @@ public class CompanyServiceImpl implements CompanyService {
             dbData.setSignInPoliticalArea(data.getSignInPoliticalArea());
             dbData.setWebsite(data.getWebsite());
             dbData.setBonus(data.getBonus());
-            dbData.setProfessionID(data.getProfessionID());
+            dbData.setIndustryID(data.getIndustryID());
             dbData.setEstateCategoryID(data.getEstateCategoryID());
             dbData.setTagID(data.getTagID());
             result = pcCompanyMapper.updateByPrimaryKeySelective(dbData);

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

@@ -0,0 +1,56 @@
+package com.hz.employmentsite.services.impl.companyService;
+
+import com.hz.employmentsite.mapper.PcIndustryMapper;
+import com.hz.employmentsite.model.PcIndustry;
+import com.hz.employmentsite.model.PcIndustryExample;
+import com.hz.employmentsite.model.SysDictionaryItem;
+import com.hz.employmentsite.services.service.companyService.IndustryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service("IndustryService")
+public class IndustryServiceImpl implements IndustryService {
+    @Autowired
+    private PcIndustryMapper pcIndustryMapper;
+
+    @Override
+    public List<SysDictionaryItem> getList() {
+        List<SysDictionaryItem> list = new ArrayList<>();
+        PcIndustryExample industryExample = new PcIndustryExample();
+        industryExample.or().andParentIdEqualTo("");
+        List<PcIndustry> dataList = pcIndustryMapper.selectByExample(industryExample);
+        for (PcIndustry industry : dataList) {
+            SysDictionaryItem item = new SysDictionaryItem();
+            item.setCode(industry.getIndustryId());
+            item.setName(industry.getIndustryName());
+            list.add(item);
+        }
+        return list;
+    }
+
+    @Override
+    public List<SysDictionaryItem> getListByParentIndustryID(String industryID) {
+        List<SysDictionaryItem> list = new ArrayList<>();
+        PcIndustryExample industryExample = new PcIndustryExample();
+        industryExample.or().andParentIdEqualTo(industryID);
+        List<PcIndustry> dataList = pcIndustryMapper.selectByExample(industryExample);
+        for (PcIndustry industry : dataList) {
+            SysDictionaryItem item = new SysDictionaryItem();
+            item.setCode(industry.getIndustryId());
+            item.setName(industry.getIndustryName());
+            list.add(item);
+        }
+        return list;
+    }
+
+    @Override
+    public String getParentIndustryID(String industryID) {
+        PcIndustryExample industryExample = new PcIndustryExample();
+        industryExample.or().andIndustryIdEqualTo(industryID);
+        PcIndustry pcIndustry = pcIndustryMapper.selectByExample(industryExample).get(0);
+        return pcIndustry.getIndustryId();
+    }
+}

src/main/java/com/hz/employmentsite/services/service/companyService/IndustryService.java

@@ -0,0 +1,13 @@
+package com.hz.employmentsite.services.service.companyService;
+
+import com.hz.employmentsite.model.SysDictionaryItem;
+
+import java.util.List;
+
+public interface IndustryService {
+    List<SysDictionaryItem> getList();
+
+    List<SysDictionaryItem> getListByParentIndustryID(String industryID);
+
+    String getParentIndustryID(String industryID);
+}

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

@@ -82,8 +82,8 @@ public class CompanyVo {
     public Integer registeredCapital;
     public String signInPoliticalArea;
 
-    public Integer professionID;
-    public String professionName;
+    public String industryID;
+    public String industryName;
     public Integer estateCategoryID;
     public String estateCategoryName;
     public Integer tagID;

src/main/resources/mapping/PcCompanyMapper.xml

@@ -31,7 +31,7 @@
     <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="IndustryID" jdbcType="VARCHAR" property="industryID"/>
     <result column="EstateCategoryID" jdbcType="INTEGER" property="estateCategoryID"/>
     <result column="TagID" jdbcType="INTEGER" property="tagID"/>
   </resultMap>
@@ -102,7 +102,7 @@
     , 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
+    ModifyTime, Longitude, Latitude, EstablishmentTime,SignInPoliticalArea,Website,Bonus,RegisteredCapital,IndustryID,EstateCategoryID,TagID
   </sql>
   <sql id="Blob_Column_List">
     BusinScope, CompanyDesc
@@ -166,7 +166,7 @@
                             ModifyTime, Longitude, Latitude,
                             openId, BusinScope, CompanyDesc,
                             EstablishmentTime, RegisteredCapital, SignInPoliticalArea,
-                            ProfessionID, EstateCategoryID, TagID,
+                            IndustryID, EstateCategoryID, TagID,
                             Website, Bonus)
     values (#{companyID,jdbcType=VARCHAR}, #{siteID,jdbcType=VARCHAR}, #{regionCode,jdbcType=VARCHAR},
             #{insuredCount,jdbcType=INTEGER}, #{streetCode,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},
@@ -178,7 +178,7 @@
             #{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},
+            #{signInPoliticalArea,jdbcType=VARCHAR}, #{industryID,jdbcType=VARCHAR},
             #{estateCategoryID,jdbcType=INTEGER},
             #{tagID,jdbcType=INTEGER}, #{website,jdbcType=VARCHAR}, #{bonus,jdbcType=VARCHAR})
   </insert>
@@ -281,8 +281,8 @@
       <if test="registeredCapital != null">
         registeredCapital,
       </if>
-      <if test="professionID != null">
-        professionID,
+      <if test="industryID != null">
+        industryID,
       </if>
       <if test="estateCategoryID != null">
         estateCategoryID,
@@ -388,8 +388,8 @@
       <if test="registeredCapital != null">
         #{registeredCapital,jdbcType=INTEGER},
       </if>
-      <if test="professionID != null">
-        #{professionID,jdbcType=INTEGER},
+      <if test="industryID != null">
+        #{industryID,jdbcType=VARCHAR},
       </if>
       <if test="estateCategoryID != null">
         #{estateCategoryID,jdbcType=INTEGER},
@@ -504,8 +504,8 @@
       <if test="row.registeredCapital != null">
         RegisteredCapital = #{row.registeredCapital,jdbcType=INTEGER},
       </if>
-      <if test="row.professionID != null">
-        ProfessionID = #{row.professionID,jdbcType=INTEGER},
+      <if test="row.industryID != null">
+        IndustryID = #{row.industryID,jdbcType=VARCHAR},
       </if>
       <if test="row.estateCategoryID != null">
         EstateCategoryID = #{row.estateCategoryID,jdbcType=INTEGER},
@@ -552,7 +552,7 @@
     Website = #{row.website,jdbcType=VARCHAR},
     Bonus = #{row.bonus,jdbcType=VARCHAR},
     RegisteredCapital = #{row.registeredCapital,jdbcType=INTEGER},
-    ProfessionID = #{row.professionID,jdbcType=INTEGER},
+    IndustryID = #{row.industryID,jdbcType=VARCHAR},
     EstateCategoryID = #{row.estateCategoryID,jdbcType=INTEGER},
     TagID = #{row.tagID,jdbcType=INTEGER}
     <if test="example != null">
@@ -591,7 +591,7 @@
     Website = #{row.website,jdbcType=VARCHAR},
     Bonus = #{row.bonus,jdbcType=VARCHAR},
     RegisteredCapital = #{row.registeredCapital,jdbcType=INTEGER},
-    ProfessionID = #{row.professionID,jdbcType=INTEGER},
+    IndustryID = #{row.industryID,jdbcType=VARCHAR},
     EstateCategoryID = #{row.estateCategoryID,jdbcType=INTEGER},
     TagID = #{row.tagID,jdbcType=INTEGER}
     <if test="example != null">
@@ -694,8 +694,8 @@
       <if test="registeredCapital != null">
         RegisteredCapital = #{registeredCapital,jdbcType=INTEGER},
       </if>
-      <if test="professionID != null">
-        ProfessionID = #{professionID,jdbcType=INTEGER},
+      <if test="industryID != null">
+        IndustryID = #{industryID,jdbcType=VARCHAR},
       </if>
       <if test="estateCategoryID != null">
         EstateCategoryID = #{estateCategoryID,jdbcType=INTEGER},
@@ -739,7 +739,7 @@
         Website             = #{website,jdbcType=VARCHAR},
         Bonus               = #{bonus,jdbcType=VARCHAR},
         RegisteredCapital   = #{registeredCapital,jdbcType=INTEGER},
-        ProfessionID        = #{professionID,jdbcType=INTEGER},
+        IndustryID          = #{industryID,jdbcType=VARCHAR},
         EstateCategoryID    = #{estateCategoryID,jdbcType=INTEGER},
         TagID               = #{tagID,jdbcType=INTEGER}
     where CompanyID = #{companyID,jdbcType=VARCHAR}
@@ -775,7 +775,7 @@
         Website             = #{website,jdbcType=VARCHAR},
         Bonus               = #{bonus,jdbcType=VARCHAR},
         RegisteredCapital   = #{registeredCapital,jdbcType=INTEGER},
-        ProfessionID        = #{professionID,jdbcType=INTEGER},
+        IndustryID          = #{industryID,jdbcType=VARCHAR},
         EstateCategoryID    = #{estateCategoryID,jdbcType=INTEGER},
         TagID               = #{tagID,jdbcType=INTEGER}
 

src/main/resources/mapping/PcIndustryMapper.xml

@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hz.employmentsite.mapper.PcIndustryMapper">
+  <resultMap id="BaseResultMap" type="com.hz.employmentsite.model.PcIndustry">
+    <id column="industryId" jdbcType="VARCHAR" property="industryId" />
+    <result column="industryName" jdbcType="VARCHAR" property="industryName" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
+    <result column="parentId" jdbcType="VARCHAR" property="parentId" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="createBy" jdbcType="VARCHAR" property="createBy" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="updateBy" jdbcType="VARCHAR" property="updateBy" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    industryId, industryName, sort, parentId, createTime, createBy, updateTime, updateBy
+  </sql>
+  <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcIndustryExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from pc_industry
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from pc_industry
+    where industryId = #{industryId,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from pc_industry
+    where industryId = #{industryId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hz.employmentsite.model.PcIndustryExample">
+    delete from pc_industry
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hz.employmentsite.model.PcIndustry">
+    insert into pc_industry (industryId, industryName, sort, 
+      parentId, createTime, createBy, 
+      updateTime, updateBy)
+    values (#{industryId,jdbcType=VARCHAR}, #{industryName,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, 
+      #{parentId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createBy,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcIndustry">
+    insert into pc_industry
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="industryId != null">
+        industryId,
+      </if>
+      <if test="industryName != null">
+        industryName,
+      </if>
+      <if test="sort != null">
+        sort,
+      </if>
+      <if test="parentId != null">
+        parentId,
+      </if>
+      <if test="createTime != null">
+        createTime,
+      </if>
+      <if test="createBy != null">
+        createBy,
+      </if>
+      <if test="updateTime != null">
+        updateTime,
+      </if>
+      <if test="updateBy != null">
+        updateBy,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="industryId != null">
+        #{industryId,jdbcType=VARCHAR},
+      </if>
+      <if test="industryName != null">
+        #{industryName,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null">
+        #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="parentId != null">
+        #{parentId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hz.employmentsite.model.PcIndustryExample" resultType="java.lang.Long">
+    select count(*) from pc_industry
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update pc_industry
+    <set>
+      <if test="row.industryId != null">
+        industryId = #{row.industryId,jdbcType=VARCHAR},
+      </if>
+      <if test="row.industryName != null">
+        industryName = #{row.industryName,jdbcType=VARCHAR},
+      </if>
+      <if test="row.sort != null">
+        sort = #{row.sort,jdbcType=INTEGER},
+      </if>
+      <if test="row.parentId != null">
+        parentId = #{row.parentId,jdbcType=VARCHAR},
+      </if>
+      <if test="row.createTime != null">
+        createTime = #{row.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="row.createBy != null">
+        createBy = #{row.createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="row.updateTime != null">
+        updateTime = #{row.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="row.updateBy != null">
+        updateBy = #{row.updateBy,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="example != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update pc_industry
+    set industryId = #{row.industryId,jdbcType=VARCHAR},
+      industryName = #{row.industryName,jdbcType=VARCHAR},
+      sort = #{row.sort,jdbcType=INTEGER},
+      parentId = #{row.parentId,jdbcType=VARCHAR},
+      createTime = #{row.createTime,jdbcType=TIMESTAMP},
+      createBy = #{row.createBy,jdbcType=VARCHAR},
+      updateTime = #{row.updateTime,jdbcType=TIMESTAMP},
+      updateBy = #{row.updateBy,jdbcType=VARCHAR}
+    <if test="example != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hz.employmentsite.model.PcIndustry">
+    update pc_industry
+    <set>
+      <if test="industryName != null">
+        industryName = #{industryName,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="parentId != null">
+        parentId = #{parentId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        createTime = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createBy != null">
+        createBy = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        updateBy = #{updateBy,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where industryId = #{industryId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hz.employmentsite.model.PcIndustry">
+    update pc_industry
+    set industryName = #{industryName,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=INTEGER},
+      parentId = #{parentId,jdbcType=VARCHAR},
+      createTime = #{createTime,jdbcType=TIMESTAMP},
+      createBy = #{createBy,jdbcType=VARCHAR},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      updateBy = #{updateBy,jdbcType=VARCHAR}
+    where industryId = #{industryId,jdbcType=VARCHAR}
+  </update>
+</mapper>

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

@@ -5,7 +5,7 @@
         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,com_status.Name as recordStatusName,
-        com_profession.Name as professionName, com_estate.Name as estateCategoryName,com_type.Name as companyTypeName,
+        industry.industryName as industryName, com_estate.Name as estateCategoryName,com_type.Name as companyTypeName,
         com_tag.Name as tagName,com_short.Name as isShortageName
         from pc_company company
         left join sys_user u on u.UserID = company.CreateUserID
@@ -15,14 +15,13 @@
         company.CompanyType = com_type.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 (select * from sys_dictionary_item where DictionaryCode ='CompanyTag') com_tag on
         company.TagID = com_tag.Value
         left join (select * from sys_dictionary_item where DictionaryCode ='IsShortAge') com_short on
         company.IsShortage = com_short.Value
+        left join pc_industry industry on company.IndustryID = industry.industryId
         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/views/companyService/company/detail.vue

@@ -17,7 +17,7 @@
       </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.industryName }}</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>
@@ -81,7 +81,7 @@ const companyInfo = reactive({
   establishmentTime: "",
   registeredCapital: "",
   signInPoliticalArea: "",
-  professionName: "",
+  industryName: "",
   estateCategoryName: "",
   tagName: "",
   website: "",

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

@@ -152,15 +152,12 @@
           <a-form-item
             label="所属行业"
             :label-col="{ span: 8 }"
-            name="professionID"
+            name="industryID"
           >
-            <a-select
-              ref="select"
-              v-model:value="dataModel.professionID"
-              :options="professionList"
-              :field-names="{ label: 'name', value: 'value' }"
-            >
-            </a-select>
+            <a-cascader :load-data="loadLevelIndustryList"
+                        v-model:value="dataModel.industryName"
+                        :options="IndustryList" change-on-select @change="industryChange">
+            </a-cascader>
           </a-form-item>
         </a-col>
         <a-col :span="8">
@@ -383,6 +380,7 @@ import {getInfo} from '@/api/account';
 import dayjs from "dayjs";
 import {message} from "ant-design-vue";
 import {useUserStore} from "@/store/modules/user";
+import {get} from "@/api/common";
 
 interface FormState {
   dataModel: any;
@@ -420,6 +418,7 @@ export default defineComponent(
       const streetList = ref<SelectProps['options']>();
       const companyTypeList = ref<SelectProps['options']>();
       const companyModelList = ref<SelectProps['options']>();
+      const IndustryList = ref<SelectProps["options"]>();
       const fullPath = router.currentRoute.value.fullPath;
 
       const onClose = () => {
@@ -548,7 +547,45 @@ export default defineComponent(
               tabsViewStore.addTabByPath('/companyService/enterprise/index', {reload: 1});
             }
           })
-        };
+        }
+      }
+
+      const getFirstIndustryList = () => {
+        get("industry/getFirstIndustryList", null).then(data => {
+          IndustryList.value = (data as any[]).map((x) => {
+            return {
+              label: x.name,
+              value: x.code,
+              isLeaf: false,
+              tag: 'firstLevel'
+            }
+          });
+        });
+      }
+      const loadLevelIndustryList = (selectedOptions) => {
+        let targetOption = selectedOptions[selectedOptions.length - 1];
+        if (targetOption) {
+          get("industry/getListByParentIndustryID", {parentIndustryID: targetOption.value}).then(data => {
+            targetOption.loading = false;
+            targetOption.children = (data as any[]).map((x) => {
+              return {
+                label: x.name,
+                value: x.code,
+                isLeaf: true,
+                tag: 'secondLevel'
+              };
+            });
+          });
+          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;
+        }
       }
 
       const loadData = (id: any) => {
@@ -558,6 +595,7 @@ export default defineComponent(
         getCompanyTypeList();
         getCompanyStatusList();
         getEstateCategoryList();
+        getFirstIndustryList();
         getInfo().then((loginUserInfo:any)=>{
           console.log("userInfo",loginUserInfo.userID);
           getCompanyById(id,loginUserInfo.userID).then(result => {
@@ -591,7 +629,11 @@ export default defineComponent(
         setFileList,
         shortageStatusList,
         userInfo,
-        estateCategoryList
+        estateCategoryList,
+        getFirstIndustryList,
+        industryChange,
+        loadLevelIndustryList,
+        IndustryList
       }
     },
     mounted() {

vue/src/views/jobUserManager/jobuser/edit.vue

@@ -139,7 +139,7 @@
           </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="职业资格类别" :label-col="{span:6}" name="finishSchool">
+          <a-form-item label="职业资格类别" :label-col="{span:6}" name="occupationalCategoryName">
             <a-cascader :load-data="loadLevelOccupationalCategoryList"
                         v-model:value="dataModel.occupationalCategoryName"
                         :options="occupationalCategoryList" change-on-select @change="occupationalChange">
@@ -830,7 +830,7 @@ export default defineComponent(
         }
       };
 
-      // 岗位名称选择变更事件
+      // 职业资格选择变更事件
       function occupationalChange(value: any, selectedOptions: any) {
         if (value.length >= 2) {
           formState.dataModel.occupationalCategory = selectedOptions[1].value;