web-bug调整

h5app/src/components/areaPicker.vue

@@ -0,0 +1,105 @@
+<template>
+  <ion-button style="color: #02a6f1;font-size: 15px;" fill="clear" @click="openPicker()">选择</ion-button>
+</template>
+
+<script lang="ts">
+import {ref, watch, defineComponent} from 'vue';
+import {pickerController} from '@ionic/vue';
+import {PickerButton, PickerColumnOption, PickerColumn, PickerOptions} from '@ionic/core';
+import {getRegionCodeList,getStreetCodeList} from "@/api/system/area";
+
+interface PickerColumnOptions extends PickerColumnOption {
+  parent?: any;
+}
+
+export default defineComponent({
+  name: 'areaPicker',
+  props: {
+    code: {type: String, default: ''},
+    },
+  setup(props,context) {
+    const cityList = ref();
+    const areaList = ref();
+    //const pickerOptions = ref<PickerOptions>();
+    const pickerColumns = ref<PickerColumn[]>([]);
+    const pickerButtons = ref<PickerButton[]>([]);
+    const CityOptions = ref<PickerColumnOptions[]>([]);
+    const AreaOptions = ref<PickerColumnOptions[]>([]);
+    const oldCityCode = ref(props.code);
+    const oldAreaCode = ref();
+
+
+    pickerColumns.value = [
+      {name: 'one', selectedIndex: 0, options: CityOptions.value},
+      {name: 'two', selectedIndex: 1, options: AreaOptions.value},
+    ]
+    pickerButtons.value = [
+      {text: '取消', role: 'cancel',},
+      {
+        text: '确定',
+        handler: (value) => {
+          context.emit("SetAreaCode",value.three);
+        },
+      },
+    ];
+
+    getRegionCodeList().then(data => {
+      cityList.value = data;
+
+      CityOptions.value = cityList.value.map((m: any) => ({
+        text: m.name,
+        value: m.code,
+        parent: m.fid,
+        selected: false
+      }));
+      CityOptions.value[0].selected=true;
+      oldCityCode.value = pickerColumns.value[0]?.options[0].value;
+    });
+
+    getStreetCodeList("").then(data=>{
+      AreaOptions.value = areaList.value.map((m: any) => ({
+        text: m.name,
+        value: m.code,
+        parent: m.fid,
+        selected: false
+      }))
+      AreaOptions.value[0].selected=true;
+      oldAreaCode.value = pickerColumns.value[1]?.options[0].value;
+    })
+
+    const picker = ref();
+    const openPicker = async () => {
+      picker.value = await pickerController.create({
+        columns: pickerColumns.value,
+        buttons: pickerButtons.value
+      });
+
+      watch(pickerColumns.value.filter(f=>f.name=="one")[0].options.filter(f=>f.selected==true)[0], () => {
+        const newVal = pickerColumns.value.filter(f=>f.name=="one")[0].options.filter(f=>f.selected==true)[0];
+        if (oldCityCode.value != newVal?.value) {
+          pickerColumns.value.map(x => {
+            if (x.name == "two") {
+              x.options = AreaOptions.value.filter(x => x.parent==newVal?.value);
+              if(x.options.length>0){
+                oldAreaCode.value = x.options[0].value;
+                x.options[0].selected=true;
+              }
+            }
+          })
+
+          pickerController.dismiss().then((e) => {console.log(e)})
+          openPicker()
+          oldCityCode.value = newVal?.value;
+        }
+      });
+
+      await picker.value.present();
+    }
+
+    return {
+      openPicker,
+    }
+  }
+});
+</script>
+

h5app/src/views/pages/jobhunt/edit.vue

@@ -55,7 +55,7 @@
             </div>
             <div class="form-select">
               <ion-label>所属驿站<span class="danger">*</span></ion-label>
-              <ion-select name="siteID"  id="siteID" okText="确定" cancelText="取消" v-model="baseData.siteID"
+              <ion-select disabled name="siteID"  id="siteID" okText="确定" cancelText="取消" v-model="baseData.siteID"
                           interface="action-sheet" placeholder="请选择所属驿站"  style="width:100%;text-align:left;">
                 <ion-select-option v-for=" (it,key) in siteInfoList" :key="key" :value="it.value">
                   {{ it.text }}

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

@@ -140,8 +140,8 @@ public class CompanyController {
     }
 
     @PostMapping("/importCompany")
-    public BaseResponse<Object> importCompany(@RequestBody List<CompanyVo> dataList) {
-        List<CompanyVo> result = companyService.importCompany(dataList, accountService.getLoginUserID());
+    public BaseResponse<Object> importCompany(@RequestBody List<CompanyVo> data) {
+        List<CompanyVo> result = companyService.importCompany(data, accountService.getLoginUserID());
 
         if (result != null && result.size() > 0) {
             return RespGenerstor.fail(BaseErrorEnum.IMPORT_DATA_ERROR, result);

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

@@ -40,11 +40,10 @@ public class PostController {
                                 @RequestParam(required = false) Integer maxCount,
                                 @RequestParam(required = false) String companyName,
                                 @RequestParam(required = false) String recordStatus,
-                                @RequestParam(required = false) String workName,
                                 @RequestParam(required = false) String companyID
                                 ) {
 
-        PageInfo<PostVo> result = postService.getList(pageIndex, pageSize, postIDList, professionName, minCount, maxCount, companyName, recordStatus, workName,companyID);
+        PageInfo<PostVo> result = postService.getList(pageIndex, pageSize, postIDList, professionName, minCount, maxCount, companyName, recordStatus,companyID);
         return RespGenerstor.success(result);
     }
 
@@ -96,8 +95,8 @@ public class PostController {
     }
 
     @GetMapping("/getPostsByCompanyID")
-    public BaseResponse<List<PcPost>> getPostsByCompanyID(@RequestParam(required = false) String companyId) {
-        var dataList = postService.getDataListByCompanyId(companyId);
+    public BaseResponse<List<PostVo>> getPostsByCompanyID(@RequestParam(required = false) String companyId) {
+        var dataList = postService.getDataListByCompanyID(companyId);
         return RespGenerstor.success(dataList);
     }
 
@@ -128,9 +127,8 @@ public class PostController {
                                @RequestParam(required = false) Integer minCount,
                                @RequestParam(required = false) Integer maxCount,
                                @RequestParam(required = false) String companyName,
-                               @RequestParam(required = false) String recordStatus,
-                               @RequestParam(required = false) String workName) throws Exception {
-        PageInfo<PostVo> result = postService.getList(pageIndex, pageSize, postIDList, professionName, minCount, maxCount, companyName, recordStatus, workName,null);
+                               @RequestParam(required = false) String recordStatus ) throws Exception {
+        PageInfo<PostVo> result = postService.getList(pageIndex, pageSize, postIDList, professionName, minCount, maxCount, companyName, recordStatus,null);
 
         if (isExport == null || !isExport) {
             return RespGenerstor.success(result);

src/main/java/com/hz/employmentsite/mapper/cquery/PostCQuery.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 public interface PostCQuery {
     List<PostVo> selectPostList(@Param("postIDList")String postIDList,@Param("professionName") String professionName, @Param("minCount")Integer minCount, @Param("maxCount")Integer maxCount,
-                                @Param("companyName")String companyName, @Param("RecordStatus") String RecordStatus, @Param("WorkName")String WorkName,@Param("companyID")String companyID);
+                                @Param("companyName")String companyName, @Param("RecordStatus") String RecordStatus,@Param("companyID")String companyID);
 
     List<RecommendPostVo> selectRecommendPostList(@Param("jobUserID") String jobUserID);
 

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

@@ -21,7 +21,7 @@ public class PcCompany {
 
     private String workSituation;
 
-    private String companyType;
+    private Integer companyType;
 
     private String companyAddress;
 
@@ -125,12 +125,12 @@ public class PcCompany {
         this.workSituation = workSituation == null ? null : workSituation.trim();
     }
 
-    public String getCompanyType() {
+    public Integer getCompanyType() {
         return companyType;
     }
 
-    public void setCompanyType(String companyType) {
-        this.companyType = companyType == null ? null : companyType.trim();
+    public void setCompanyType(Integer companyType) {
+        this.companyType = companyType;
     }
 
     public String getCompanyAddress() {

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

@@ -725,62 +725,52 @@ public class PcCompanyExample {
             return (Criteria) this;
         }
 
-        public Criteria andCompanyTypeEqualTo(String value) {
+        public Criteria andCompanyTypeEqualTo(Integer value) {
             addCriterion("CompanyType =", value, "companyType");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyTypeNotEqualTo(String value) {
+        public Criteria andCompanyTypeNotEqualTo(Integer value) {
             addCriterion("CompanyType <>", value, "companyType");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyTypeGreaterThan(String value) {
+        public Criteria andCompanyTypeGreaterThan(Integer value) {
             addCriterion("CompanyType >", value, "companyType");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyTypeGreaterThanOrEqualTo(String value) {
+        public Criteria andCompanyTypeGreaterThanOrEqualTo(Integer value) {
             addCriterion("CompanyType >=", value, "companyType");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyTypeLessThan(String value) {
+        public Criteria andCompanyTypeLessThan(Integer value) {
             addCriterion("CompanyType <", value, "companyType");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyTypeLessThanOrEqualTo(String value) {
+        public Criteria andCompanyTypeLessThanOrEqualTo(Integer value) {
             addCriterion("CompanyType <=", value, "companyType");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyTypeLike(String value) {
-            addCriterion("CompanyType like", value, "companyType");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyTypeNotLike(String value) {
-            addCriterion("CompanyType not like", value, "companyType");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyTypeIn(List<String> values) {
+        public Criteria andCompanyTypeIn(List<Integer> values) {
             addCriterion("CompanyType in", values, "companyType");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyTypeNotIn(List<String> values) {
+        public Criteria andCompanyTypeNotIn(List<Integer> values) {
             addCriterion("CompanyType not in", values, "companyType");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyTypeBetween(String value1, String value2) {
+        public Criteria andCompanyTypeBetween(Integer value1, Integer value2) {
             addCriterion("CompanyType between", value1, value2, "companyType");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyTypeNotBetween(String value1, String value2) {
+        public Criteria andCompanyTypeNotBetween(Integer value1, Integer value2) {
             addCriterion("CompanyType not between", value1, value2, "companyType");
             return (Criteria) this;
         }

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

@@ -195,7 +195,7 @@ public class CompanyServiceImpl implements CompanyService {
     @Override
     public List<CompanyVo> importCompany(List<CompanyVo> dataList, String userID) {
         if (dataList.size() <= 0)
-            throw new BaseException("", "请添加导入数据！");
+            throw new BaseException("1004", "请添加导入数据！");
         //所属驿站
         List<PcSite> siteList = siteMapper.selectByExample(null);
         //所属县区
@@ -209,9 +209,11 @@ public class CompanyServiceImpl implements CompanyService {
         List<CompanyVo> resultList = new ArrayList<>();
         //企业规模
         List<SysDictionaryItem> dicCompanyModelList = dictionaryService.getDictionaryItemList("CompanyModel");
+        List<SysDictionaryItem> dicCompanyTypeList = dictionaryService.getDictionaryItemList("CompanyType");
 
         dataList.forEach(item -> {
             String errorInfo = "";
+            item.companyID = UUID.randomUUID().toString();
             if (stringUtils.IsNullOrEmpty(item.companyCode))
                 errorInfo += "请填写统一信用代码!";
             if (stringUtils.IsNullOrEmpty(item.companyName))
@@ -272,6 +274,14 @@ public class CompanyServiceImpl implements CompanyService {
                     errorInfo += "街道名称不存在！";
             }
 
+            if (!stringUtils.IsNullOrEmpty(item.companyTypeStr))
+            {
+                item.companyType = dicCompanyTypeList.stream().filter(it -> it.getName().equals(item.companyTypeStr.trim()))
+                        .findFirst().orElse(new SysDictionaryItem()).getValue();
+                if (item.companyType == null || item.companyType == 0)
+                    errorInfo += "企业分类不存在！";
+            }
+
             if (!stringUtils.IsNullOrEmpty(item.companyModelStr))
             {
                 item.companyModel = dicCompanyModelList.stream().filter(it -> it.getName().equals(item.companyModelStr.trim()))

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

@@ -3,16 +3,12 @@ package com.hz.employmentsite.services.impl.companyService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.filter.exception.BaseException;
-import com.hz.employmentsite.mapper.PcCompanyMapper;
-import com.hz.employmentsite.mapper.PcPostMapper;
-import com.hz.employmentsite.mapper.PcRecommendMapper;
-import com.hz.employmentsite.mapper.PcRecommendMgtMapper;
+import com.hz.employmentsite.mapper.*;
 import com.hz.employmentsite.mapper.cquery.PostCQuery;
 import com.hz.employmentsite.model.*;
 import com.hz.employmentsite.services.service.companyService.PostService;
 import com.hz.employmentsite.services.service.system.DictionaryService;
 import com.hz.employmentsite.util.StringUtils;
-import com.hz.employmentsite.vo.jobUserManager.RecommendCompanyPostVo;
 import com.hz.employmentsite.vo.companyService.RecommendPostVo;
 import com.hz.employmentsite.vo.companyService.PostVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +38,9 @@ public class PostServiceImpl implements PostService {
     @Autowired
     private PcRecommendMgtMapper pcRecommendMgtMapper;
 
+    @Autowired
+    private PcProfessionMapper pcProfessionMapper;
+
     @Autowired
     private PcCompanyMapper companyMapper;
 
@@ -49,9 +48,9 @@ public class PostServiceImpl implements PostService {
     private DictionaryService dictionaryService;
 
     @Override
-    public PageInfo<PostVo> getList(Integer page, Integer rows, List<String> postIDList, String professionName, Integer minCount, Integer maxCount, String companyName, String recordStatus, String WorkName,String companyID) {
+    public PageInfo<PostVo> getList(Integer page, Integer rows, List<String> postIDList, String professionName, Integer minCount, Integer maxCount, String companyName, String recordStatus,String companyID) {
         PageHelper.startPage(page, rows);
-        List<PostVo> list = postCQuery.selectPostList(stringUtils.ListToInSql(postIDList), professionName, minCount, maxCount, companyName, recordStatus, WorkName,companyID);
+        List<PostVo> list = postCQuery.selectPostList(stringUtils.ListToInSql(postIDList), professionName, minCount, maxCount, companyName, recordStatus,companyID);
         PageInfo<PostVo> result = new PageInfo(list);
         return result;
 
@@ -214,14 +213,30 @@ public class PostServiceImpl implements PostService {
         }else{
             ids.add(id);
         }
-        return postCQuery.selectPostList(stringUtils.ListToInSql(ids), null, null, null, null, null, null,null).stream().findFirst().orElse(null);
+        return postCQuery.selectPostList(stringUtils.ListToInSql(ids), null, null, null, null, null,null).stream().findFirst().orElse(null);
     }
 
     @Override
-    public List<PcPost> getDataListByCompanyId(String companyId) {
+    public List<PostVo> getDataListByCompanyID(String companyId) {
+        List<PostVo> resultList = new ArrayList<>();
         PcPostExample postExp = new PcPostExample();
         postExp.or().andCompanyIDEqualTo(companyId);
-        return pcPostMapper.selectByExample(postExp);
+        var postList = pcPostMapper.selectByExample(postExp);
+        for(PcPost curPost : postList){
+            PostVo item= new PostVo();
+            item.setPostID(curPost.getPostID());
+            item.setProfessionID(curPost.getProfessionID());
+            PcProfessionExample professionExp = new PcProfessionExample();
+            professionExp.or().andProfessionIDEqualTo(curPost.getProfessionID());
+            var curProfession = pcProfessionMapper.selectByExample(professionExp).get(0);
+            item.setProfessionName(curProfession.getProfessionName());
+            item.setCompanyID(curPost.getCompanyID());
+            item.setRecruitCount(curPost.getRecruitCount());
+            item.setStartTime(curPost.getStartTime());
+            item.setEndTime(curPost.getEndTime());
+            resultList.add(item);
+        }
+        return resultList;
     }
 
     @Override
@@ -232,8 +247,31 @@ public class PostServiceImpl implements PostService {
         PcCompanyExample companyExp = new PcCompanyExample();
         companyExp.or().andRecordStatusEqualTo(1);
         List<PcCompany> companyList = companyMapper.selectByExample(companyExp);
+        //岗位信息
+        List<SysDictionaryItem> thirdLevelProfessionList =  new ArrayList<>();
+        PcProfessionExample professionExp = new PcProfessionExample();
+        professionExp.or().andParentProfessionIDEqualTo("").andStatusEqualTo(1);
+        var firstLevelData = pcProfessionMapper.selectByExample(professionExp);
+        for(PcProfession curProfession : firstLevelData){
+            professionExp = new PcProfessionExample();
+            professionExp.or().andParentProfessionIDEqualTo(curProfession.getProfessionID()).andStatusEqualTo(1);
+            var secondLevelData = pcProfessionMapper.selectByExample(professionExp);
+            for(PcProfession curParentProfession: secondLevelData){
+                professionExp = new PcProfessionExample();
+                professionExp.or().andParentProfessionIDEqualTo(curParentProfession.getProfessionID()).andStatusEqualTo(1);
+                var thirdLevelData = pcProfessionMapper.selectByExample(professionExp);
+                for(PcProfession curItem : thirdLevelData){
+                    SysDictionaryItem item = new SysDictionaryItem();
+                    item.setCode(curItem.getProfessionID());
+                    item.setCode(curItem.getProfessionName());
+                    thirdLevelProfessionList.add(item);
+                }
+            }
+        }
+
         //文化程度
-        List<SysDictionaryItem> dicDataList = dictionaryService.getDictionaryItemList("CultureLevel");
+        List<SysDictionaryItem> dicCultureDataList = dictionaryService.getDictionaryItemList("CultureLevel");
+        List<SysDictionaryItem> dicWorkYearDataList = dictionaryService.getDictionaryItemList("WorkYearType");
         List<PostVo> resultList = new ArrayList<>();
 
         dataList.forEach(item -> {
@@ -246,10 +284,18 @@ public class PostServiceImpl implements PostService {
                 if (item.companyID == null)
                     errorInfo += "企业不存在！";
             }
-            if (stringUtils.IsNullOrEmpty(item.postName))
+            if (stringUtils.IsNullOrEmpty(item.professionName))
                 errorInfo += "请填写岗位名称!";
+            else {
+                item.professionID = thirdLevelProfessionList.stream().filter(it -> it.getName().equals(item.getProfessionName().trim()))
+                        .findFirst().orElse(new SysDictionaryItem()).getCode();
+                if (item.professionID == null||item.professionID=="")
+                    errorInfo += "岗位不存在！";
+            }
+
             if (stringUtils.IsNullOrEmpty(String.valueOf(item.recruitCount)) || item.recruitCount == null)
                 errorInfo += "请填写招聘人数!";
+
             if (stringUtils.IsNullOrEmpty(String.valueOf(item.startTime)) || item.startTime == null)
                 errorInfo += "请填写开始日期!";
             if (stringUtils.IsNullOrEmpty(String.valueOf(item.startTime)) || item.startTime == null)
@@ -257,11 +303,18 @@ public class PostServiceImpl implements PostService {
             if (stringUtils.IsNullOrEmpty(item.jobPlace))
                 errorInfo += "请填写招聘地点!";
 
+            if (stringUtils.IsNullOrEmpty(item.workYearStr)){
+                item.workYear = dicWorkYearDataList.stream().filter(it -> it.getName().equals(item.workYearStr.trim()))
+                        .findFirst().orElse(new SysDictionaryItem()).getValue();
+                if (item.workYear == null || item.workYear == 0)
+                    errorInfo += "输入的工作年限不存在!";
+            }
+
             if (item.isTrailName.trim().equals("是")) item.isTrail = true;
             else if (item.isTrailName.trim().equals("否"))item.isTrail = false;
 
             if (!stringUtils.IsNullOrEmpty(item.cultureLevelName)){
-                item.cultureRank = dicDataList.stream().filter(it -> it.getName().equals(item.cultureLevelName.trim()))
+                item.cultureRank = dicCultureDataList.stream().filter(it -> it.getName().equals(item.cultureLevelName.trim()))
                         .findFirst().orElse(new SysDictionaryItem()).getValue();
                 if (item.cultureRank == null || item.cultureRank == 0)
                     errorInfo += "输入的学历要求不存在!";

src/main/java/com/hz/employmentsite/services/impl/system/CityAreaImpl.java

@@ -26,8 +26,11 @@ public class CityAreaImpl implements CityAreaService {
     @Override
     public List<AreaCode> getAreaList(String code) {
         AreaCodeExample exp=new AreaCodeExample();
-        exp.or().andLvEqualTo("4")
-        .andFidEqualTo(code);
+        if(code!="") {
+            exp.or().andLvEqualTo("4").andFidEqualTo(code);
+        }else{
+            exp.or().andLvEqualTo("4");
+        }
         exp.setOrderByClause("code");
         return areaCodeMapper.selectByExample(exp);
     }

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

@@ -6,13 +6,13 @@ import com.hz.employmentsite.vo.companyService.PostVo;
 import java.util.List;
 
 public interface PostService {
-    PageInfo<PostVo> getList(Integer page, Integer rows, List<String> postIDList,String professionName, Integer minCount, Integer maxCount, String companyName,String RecordStatus,String WorkName,String companyID);
+    PageInfo<PostVo> getList(Integer page, Integer rows, List<String> postIDList,String professionName, Integer minCount, Integer maxCount, String companyName,String RecordStatus ,String companyID);
     PageInfo<RecommendPostVo> getCommendPostList(Integer page, Integer rows, String jobUserID);
     Integer saveCommendPost(RecommendPostVo data, String userId);
     int save(PostVo data, String userId);
     int delete(List<String> ids);
     PostVo getDataById(String id);
-    List<PcPost> getDataListByCompanyId(String companyID);
+    List<PostVo> getDataListByCompanyID(String companyID);
     List<PostVo> importPost(List<PostVo> dataList, String userID);
 
     int deletePostAndRecommendMgt(String id);

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

@@ -32,7 +32,10 @@ public class CompanyVo {
 
     public String workSituation;
 
-    public String companyType;
+    public Integer companyType;
+    public String  companyTypeName;
+
+    public String  companyTypeStr;
 
     public String companyAddress;
 

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

@@ -32,6 +32,8 @@ public class PostVo {
 
     public Integer workYear;
 
+    public String workYearStr;
+
     public Integer cultureRank;
 
     public BigDecimal maxSalary;

src/main/resources/application.yml

@@ -6,7 +6,7 @@ server:
 spring:
   web:
     resources:
-      static-locations: file:D:\work\projects\EmploymentSite\siteproject\EmploymentSite\src\main\resources\static\
+      static-locations: file:D:\Work\JavaProjects\EmploymentSite\src\main\resources\static\
   datasource:
     name: employmentsitedb
     type: com.alibaba.druid.pool.DruidDataSource

src/main/resources/generatorConfig.xml

@@ -78,7 +78,6 @@
         <table schema="" tableName="sys_user"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="sys_user_sys_role"><property name="useActualColumnNames" value="true"/></table>
          <table schema="" tableName="pc_company"><property name="useActualColumnNames" value="true"/></table>
-         <table schema="" tableName="pc_company"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_dotask"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_dowork"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_education"><property name="useActualColumnNames" value="true"/></table>

src/main/resources/mapping/PcCompanyMapper.xml

@@ -11,7 +11,7 @@
     <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="VARCHAR" property="companyType" />
+    <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" />
@@ -161,7 +161,7 @@
     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=VARCHAR}, #{companyAddress,jdbcType=VARCHAR}, #{userName,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}, 
@@ -283,7 +283,7 @@
         #{workSituation,jdbcType=VARCHAR},
       </if>
       <if test="companyType != null">
-        #{companyType,jdbcType=VARCHAR},
+        #{companyType,jdbcType=INTEGER},
       </if>
       <if test="companyAddress != null">
         #{companyAddress,jdbcType=VARCHAR},
@@ -375,7 +375,7 @@
         WorkSituation = #{row.workSituation,jdbcType=VARCHAR},
       </if>
       <if test="row.companyType != null">
-        CompanyType = #{row.companyType,jdbcType=VARCHAR},
+        CompanyType = #{row.companyType,jdbcType=INTEGER},
       </if>
       <if test="row.companyAddress != null">
         CompanyAddress = #{row.companyAddress,jdbcType=VARCHAR},
@@ -444,7 +444,7 @@
       CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
       CompanyModel = #{row.companyModel,jdbcType=INTEGER},
       WorkSituation = #{row.workSituation,jdbcType=VARCHAR},
-      CompanyType = #{row.companyType,jdbcType=VARCHAR},
+      CompanyType = #{row.companyType,jdbcType=INTEGER},
       CompanyAddress = #{row.companyAddress,jdbcType=VARCHAR},
       UserName = #{row.userName,jdbcType=VARCHAR},
       UserMobile = #{row.userMobile,jdbcType=VARCHAR},
@@ -477,7 +477,7 @@
       CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
       CompanyModel = #{row.companyModel,jdbcType=INTEGER},
       WorkSituation = #{row.workSituation,jdbcType=VARCHAR},
-      CompanyType = #{row.companyType,jdbcType=VARCHAR},
+      CompanyType = #{row.companyType,jdbcType=INTEGER},
       CompanyAddress = #{row.companyAddress,jdbcType=VARCHAR},
       UserName = #{row.userName,jdbcType=VARCHAR},
       UserMobile = #{row.userMobile,jdbcType=VARCHAR},
@@ -525,7 +525,7 @@
         WorkSituation = #{workSituation,jdbcType=VARCHAR},
       </if>
       <if test="companyType != null">
-        CompanyType = #{companyType,jdbcType=VARCHAR},
+        CompanyType = #{companyType,jdbcType=INTEGER},
       </if>
       <if test="companyAddress != null">
         CompanyAddress = #{companyAddress,jdbcType=VARCHAR},
@@ -591,7 +591,7 @@
       CompanyCode = #{companyCode,jdbcType=VARCHAR},
       CompanyModel = #{companyModel,jdbcType=INTEGER},
       WorkSituation = #{workSituation,jdbcType=VARCHAR},
-      CompanyType = #{companyType,jdbcType=VARCHAR},
+      CompanyType = #{companyType,jdbcType=INTEGER},
       CompanyAddress = #{companyAddress,jdbcType=VARCHAR},
       UserName = #{userName,jdbcType=VARCHAR},
       UserMobile = #{userMobile,jdbcType=VARCHAR},
@@ -621,7 +621,7 @@
       CompanyCode = #{companyCode,jdbcType=VARCHAR},
       CompanyModel = #{companyModel,jdbcType=INTEGER},
       WorkSituation = #{workSituation,jdbcType=VARCHAR},
-      CompanyType = #{companyType,jdbcType=VARCHAR},
+      CompanyType = #{companyType,jdbcType=INTEGER},
       CompanyAddress = #{companyAddress,jdbcType=VARCHAR},
       UserName = #{userName,jdbcType=VARCHAR},
       UserMobile = #{userMobile,jdbcType=VARCHAR},

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

@@ -34,9 +34,6 @@
             <if test="RecordStatus != null and RecordStatus != ''">
                 and post.RecordStatus = #{RecordStatus}
             </if>
-            <if test="WorkName != null and WorkName != ''">
-                and post.WorkName like Concat('%', #{WorkName},'%')
-            </if>
             <if test="companyID != null and companyID != ''">
                 and post.CompanyID = #{companyID}
             </if>

vue/src/api/companyService/company.ts

@@ -36,12 +36,12 @@ export function save(data: any) {
   })
 }
 
-export function del(id) {
+export function del(ids) {
   return request<object>(
     {
       url: 'companyService/company/delete',
-      method: 'get',
-      params: {id},
+      method: 'post',
+      data: ids,
     },
     {
       isNew: true,

vue/src/api/companyService/post.ts

@@ -48,12 +48,12 @@ export  function  savePost(data:any){
   });
 }
 
-export function del(id: any) {
+export function del(ids: any) {
   return request<object>(
     {
       url: "companyService/post/delete",
       method: 'post',
-      params: {id}
+      data: ids
     },
     {
       isNew: true,

vue/src/components/basic/excel/importExcel/importExcel.vue

@@ -107,7 +107,7 @@ export default defineComponent({
 
     const addData = (result: any) => {
       okButtonProps.value.disabled = false;
-      console.log(result);
+      console.log("result",result);
       if (result) {
         result.forEach(sheet => {
           sheet.results.forEach(item => {
@@ -120,7 +120,7 @@ export default defineComponent({
           });
         });
 
-        console.log(excelData.value);
+        console.log("excel数据",excelData.value);
       }
     }
 

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

@@ -5,7 +5,7 @@
       <a-row :gutter="24">
         <a-col :span="8">
           <a-form-item
-            label="统一社会信用代码"
+            label="统一信用代码"
             :label-col="{ span: 8 }"
             name="companyCode"
             :rules="[{ required: true, message: '请输入统一信用代码!' }]"
@@ -179,7 +179,7 @@
               ref="select"
               v-model:value="dataModel.companyType"
               :options="companyTypeList"
-              :field-names="{ label: 'name', value: 'name' }"
+              :field-names="{ label: 'name', value: 'value' }"
             >
             </a-select>
           </a-form-item>

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

@@ -158,21 +158,21 @@ export default defineComponent({
       title: '导入',
       url: 'companyService/company/importCompany',
       columns: [
-        {cnName: '统一社会信用代码', enName: 'companyCode', width: 140},
+        {cnName: '统一信用代码', enName: 'companyCode', width: 140},
         {cnName: '企业名称', enName: 'companyName', width: 100},
         {cnName: '所属驿站', enName: 'SiteName', width: 100},
-        {cnName: '企业办公地址', enName: 'address', width: 100},
+        {cnName: '企业办公地址', enName: 'companyAddress', width: 100},
         {cnName: '企业联系人', enName: 'userName', width: 100},
         {cnName: '企业联系电话', enName: 'userMobile', width: 100},
         {cnName: '企业状态', enName: 'recordStatusName', width: 100},
-        {cnName: '是否缺工', enName: 'isShortage', width: 100},
+        {cnName: '是否缺工', enName: 'isShortageName', width: 100},
         {cnName: '法定代表人(负责人)', enName: 'frName', width: 140},
         {cnName: '营业执照有效期', enName: 'validTime', width: 100},
-        {cnName: '联系邮箱', enName: 'companyEmail', width: 100},
-        {cnName: '企业分类', enName: 'companyType', width: 100},
+        {cnName: '企业邮箱', enName: 'companyEmail', width: 100},
+        {cnName: '企业分类', enName: 'companyTypeStr', width: 100},
         {cnName: '所属县区', enName: 'regionName', width: 100},
         {cnName: '所属街道', enName: 'streetName', width: 100},
-        {cnName: '企业规模', enName: 'companyModel', width: 100},
+        {cnName: '企业规模', enName: 'companyModelStr', width: 100},
         {cnName: '用工情况(人)', enName: 'workSituation', width: 100},
         {cnName: '参保人数(人)', enName: 'insuredCount', width: 100},
         {cnName: '经营范围', enName: 'businScope', width: 100},
@@ -276,7 +276,7 @@ export default defineComponent({
 
     const onDel = (item: any) => {
       Modal.confirm({
-        title: '确认删除选中的公司信息?',
+        title: '确认删除选中的企业信息?',
         icon: createVNode(ExclamationCircleOutlined),
         content: '',
         okText: '确认删除',
@@ -284,7 +284,7 @@ export default defineComponent({
         okButtonProps: {},
         cancelText: '取消',
         onOk() {
-          del(item.companyID).then(() => {
+          del([item.companyID]).then(() => {
             loadData();
           });
         },

vue/src/views/companyService/company/show.vue

@@ -50,8 +50,8 @@ const formState = reactive({
 const columns: TableColumnsType = [
   {title: '序号', align: "center", key: 'companyID', width:60,
     customRender: item => `${searchParams.pageSize * (searchParams.pageIndex - 1) + item.index + 1}`},
-  {title: '岗位名称', dataIndex: 'postName', key: 'companyName',width: 200, align: "center"},
-  {title: '招聘人数', dataIndex: 'recruitCount', key: 'regionName', width: 120, align: "center"},
+  {title: '岗位名称', dataIndex: 'professionName', key: 'professionName',width: 200, align: "center"},
+  {title: '招聘人数', dataIndex: 'recruitCount', key: 'recruitCount', width: 120, align: "center"},
   {title: '招聘开始日期', dataIndex: 'startTime', key: 'startTime', width: 120,align: "center",
     customRender: (item) => {return item.record.startTime == null ? "" : (dayjs(item.record.startTime).format('YYYY-MM-DD'))}
   },

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

@@ -263,14 +263,12 @@ export default defineComponent(
       };
 
       watch(() => postCompany.dataModel.professionName, (selectedValues) => {
-        console.log("dd",selectedValues);
+        //console.log("dd",selectedValues);
         if (selectedValues && selectedValues.length == 3) {
           postCompany.dataModel.professionID = selectedValues[2];
           postCompany.dataModel.hasProfession = true;
-        } else {
-          postCompany.dataModel.professionID = '';
-          postCompany.dataModel.hasProfession = false;
         }
+        //console.log("dsd",postCompany.dataModel);
       });
 
       get('system/dictionary/getDictionaryItemByCodeList', {code: 'CultureLevel'}).then(result => {
@@ -312,9 +310,10 @@ export default defineComponent(
         isEdit.value = id != null;
         getFirstProfessionList();
         getPostByID(id).then(result => {
-          console.log(result);
           postCompany.dataModel = result;
+          postCompany.dataModel.hasProfession = true;
         })
+        console.log("初始化岗位信息",postCompany.dataModel);
       };
 
       return {

vue/src/views/companyService/post/index.vue

@@ -65,11 +65,6 @@
             </a-select>
           </a-form-item>
         </a-col>
-        <a-col :span="6">
-          <a-form-item label="工种名称" :label-col="{span:6}" name="WorkName">
-            <a-input v-model:value="searchParams.workName" placeholder=""/>
-          </a-form-item>
-        </a-col>
       </a-row>
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
@@ -139,7 +134,6 @@ export default defineComponent({
       pageSize: 20,
       minCount: null,
       maxCount: null,
-      workName: null,
       professionName: null,
       recordStatus: null
     });
@@ -299,7 +293,7 @@ export default defineComponent({
         okButtonProps: {},
         cancelText: '取消',
         onOk() {
-          del(item.postID).then(() => {
+          del([item.postID]).then(() => {
             loadData();
           });
         },

vue/src/views/jobUserManager/jobhunt/edit.vue

@@ -189,9 +189,6 @@ export default defineComponent({
       if (selectedValues && selectedValues.length == 3) {
         formData.dataModel.professionID = selectedValues[2];
         formData.dataModel.hasProfession = true;
-      } else {
-        formData.dataModel.professionID = '';
-        formData.dataModel.hasProfession = false;
       }
     });
     const getJobUserList = async function() {
@@ -225,6 +222,7 @@ export default defineComponent({
       getJobWorkTypeList();
       getJobHuntByID(id).then((result: any) => {
         formData.dataModel = result;
+        formData.dataModel.hasProfession = true;
       });
       formState.loading = false;
     };