求职信息查询、月薪数据调整

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

@@ -73,9 +73,9 @@
               <ion-input name="userMobile" id="userMobile"  style="text-align: right;" placeholder="请输入联系电话" v-model="baseData.userMobile" ></ion-input>
               <ion-note slot="error">联系电话不能为空</ion-note>
             </ion-item>
-            <ion-item :class="[baseDataValid.baseData.birthPlace.$error?'ion-invalid':'ion-valid']">
+            <ion-item :class="[baseDataValid.baseData.address.$error?'ion-invalid':'ion-valid']">
               <ion-label>地址<span class="danger">*</span></ion-label>
-              <ion-input name="birthPlace" id="birthPlace"  style="text-align: right;"  placeholder="请输入地址" v-model="baseData.birthPlace" ></ion-input>
+              <ion-input name="address" id="address"  style="text-align: right;"  placeholder="请输入地址" v-model="baseData.address" ></ion-input>
               <ion-note slot="error">地址不能为空</ion-note>
             </ion-item>
             <ion-item :class="[baseDataValid.baseData.siteID.$error?'ion-invalid':'ion-valid']"  >
@@ -152,7 +152,7 @@
               <ion-label>省份</ion-label>
               <ion-select name="provinceCode"  id="provinceCode" okText="确定" cancelText="取消" v-model="baseData.provinceCode"
                           interface="action-sheet" placeholder="请选择省份" @change="provinceChange()" >
-                <ion-select-option v-for=" (it,key) in provinceList" :key="key" :value="it.value">
+                <ion-select-option v-for=" (it,key) in provinceList" :key="key" :value="it.code">
                   {{ it.name }}
                 </ion-select-option>
               </ion-select>
@@ -226,8 +226,8 @@
           </ion-item>
           <ion-item v-for="(record,key) in jobHuntList" :key="key" >
             <ion-label>
-              <h3>{{record.jobUserType}}</h3>
-              <p>期望薪资：{{record.salary}}</p>
+              <h3>{{record.jobUserTypeStr}}</h3>
+              <p>期望薪资：{{record.minSalary}}-{{record.maxSalary}}</p>
             </ion-label>
             <img alt="" src="@/assets/icon/forward.png" class="iconBtn"
                  @click="onPathForward( './jobHuntEdit',null,record.jobHuntID,3)"  />
@@ -293,7 +293,7 @@ export default defineComponent({
     const userHealthList = ref<SelectProps[]>([]);
     const bloodTypeList  = ref<SelectProps[]>([]);
     const maritalStatusList  = ref<SelectProps[]>([]);
-    const provinceList  = ref([{code:'01',name:'广东省'}]);
+    const provinceList  = ref([{code:'440000000000000',name:'广东省'}]);
     const regionList  = ref<SelectProps[]>([]);
     const streetList  = ref<SelectProps[]>([]);
 
@@ -308,7 +308,7 @@ export default defineComponent({
         identityNumber: null,
         sex: null,
         userMobile: null,
-        birthPlace: null,
+        address: null,
         jobStatusID: null,
         keyPersonTypeID: null,
         cultureRank:null,
@@ -341,7 +341,7 @@ export default defineComponent({
           identityNumber:{required},
           sex:{required},
           userMobile:{required},
-          birthPlace:{required},
+          address:{required},
           jobStatusID:{required},
           keyPersonTypeID:{required},
         }}});
@@ -373,7 +373,7 @@ export default defineComponent({
           }
         });
       }
-      else{
+      else if (curStepData.value.statusVal==2){
          await router.push({path: './edit', query: {reload:1,jobUserID: baseInfoData.baseData.jobUserID,status:3}});
       }
     }
@@ -387,9 +387,9 @@ export default defineComponent({
     }
 
     const onBack = () => {
-      const toStepValue :number = curStepData.value.statusVal-1;
-      if(toStepValue > 0){
-        router.back();
+      curStepData.value.statusVal-=1;
+      if(curStepData.value.statusVal > 0){
+        onPathForward("./edit",null,null,curStepData.value.statusVal);
       }else{
         router.push("./list");
       }
@@ -449,6 +449,7 @@ export default defineComponent({
 
     const loadData = async (jobUserID: any,status:any) => {
       pageParams.jobUserID = jobUserID;
+      console.log("当前jobUserID",pageParams);
       baseInfoData.baseData.jobUserID = jobUserID;
       curStepData.value.statusVal = status;
       if(curStepData.value.statusVal==1){
@@ -468,6 +469,7 @@ export default defineComponent({
       else if(curStepData.value.statusVal==3){
         const reqData = await getJobHuntListByJobUserID(pageParams);
         jobHuntList.value= reqData.list;
+        console.log("jobHuntList",jobHuntList.value);
       }
     };
 
@@ -478,6 +480,7 @@ export default defineComponent({
     });
 
     const reload = (jobUserID:any,status:any) => {
+      expand.value = false;
       loadData(jobUserID,status);
     }
 

h5app/src/views/pages/jobuser/jobHuntEdit.vue

@@ -5,7 +5,7 @@
         <ion-buttons slot="start">
           <ion-icon :icon="arrowBackOutline" @click="onCancel" style="padding-left:10px;width:24px;height:24px;"></ion-icon>
         </ion-buttons>
-        <ion-title>教育经历收集</ion-title>
+        <ion-title>求职意向收集</ion-title>
       </ion-toolbar>
     </ion-header>
     <ion-content>
@@ -35,9 +35,9 @@
               <ion-input name="workName" id="workName"  style="text-align: right;" placeholder="请输入工种名称" v-model="dataModel.workName" ></ion-input>
               <ion-note slot="error">工种名称不能为空</ion-note>
             </ion-item>
-            <ion-item :class="[huntDataValid.dataModel.ucHuntType.$error?'ion-invalid':'ion-valid']">
+            <ion-item :class="[huntDataValid.dataModel.jobHuntType.$error?'ion-invalid':'ion-valid']">
               <ion-label>求职类型<span class="danger">*</span></ion-label>
-              <ion-select name="ucHuntType"  id="ucHuntType" okText="确定" cancelText="取消" v-model="dataModel.ucHuntType"
+              <ion-select name="jobHuntType"  id="jobHuntType" okText="确定" cancelText="取消" v-model="dataModel.jobHuntType"
                           interface="action-sheet" placeholder="请选择求职类型" >
                 <ion-select-option v-for=" (it,key) in jobHuntTypeList" :key="key" :value="it.value">
                   {{ it.name }}
@@ -45,9 +45,9 @@
               </ion-select>
               <ion-note slot="error">求职类型不能为空</ion-note>
             </ion-item>
-            <ion-item :class="[huntDataValid.dataModel.abilityType.$error?'ion-invalid':'ion-valid']">
+            <ion-item :class="[huntDataValid.dataModel.jobUserType.$error?'ion-invalid':'ion-valid']">
               <ion-label>人才类型<span class="danger">*</span></ion-label>
-              <ion-select name="abilityType"  id="abilityType" okText="确定" cancelText="取消" v-model="dataModel.abilityType"
+              <ion-select name="jobUserType"  id="jobUserType" okText="确定" cancelText="取消" v-model="dataModel.jobUserType"
                           interface="action-sheet" placeholder="请选择人才类型" >
                 <ion-select-option v-for=" (it,key) in jobUserTypeList" :key="key" :value="it.value">
                   {{ it.name }}
@@ -58,6 +58,7 @@
             <ion-item :class="[huntDataValid.dataModel.maxSalary.$error||huntDataValid.dataModel.minSalary.$error?'ion-invalid':'ion-valid']">
               <ion-label>月薪要求<span class="danger">*</span></ion-label>
               <ion-input name="minSalary" id="minSalary" style="text-align: right;" placeholder="请输入最低薪资" v-model="dataModel.minSalary" ></ion-input>
+              至
               <ion-input name="maxSalary" id="maxSalary" style="text-align: right;" placeholder="请输入最高薪资" v-model="dataModel.maxSalary" ></ion-input>
               <ion-note slot="error">月薪要求不能为空</ion-note>
             </ion-item>
@@ -119,8 +120,8 @@ export default defineComponent({
     const jobHuntData = reactive<huntModel>({dataModel:{
         jobUserID:null,
         workName:null,
-        ucHuntType:null,
-        abilityType:null,
+        jobHuntType:null,
+        jobUserType:null,
         minSalary:null,
         maxSalary:null,
         workYear:null,
@@ -129,8 +130,8 @@ export default defineComponent({
     const huntDataRule = computed(()=>{
       return {dataModel:{
           workName:{required},
-          ucHuntType:{required},
-          abilityType:{required},
+          jobHuntType:{required},
+          jobUserType:{required},
           minSalary:{required},
           maxSalary:{required},
           workYear:{required},

h5app/src/views/pages/jobuser/list.vue

@@ -40,8 +40,6 @@
 </template>
 
 <script lang="ts">
-
-import dayjs from "dayjs";
 import {useRouter} from "vue-router";
 import {computed, defineComponent, reactive, ref} from 'vue';
 import {arrowBackOutline,addCircleOutline} from 'ionicons/icons';
@@ -119,7 +117,6 @@ export default defineComponent({
       formState,
       pagination,
       searchParamsState,
-      dayjs,
       onScroll,
       onAdd,
       onBack,

src/main/java/com/hz/employmentsite/controller/jobUserManager/JobHuntController.java

@@ -10,6 +10,7 @@ import com.hz.employmentsite.util.ExcelHelper;
 import com.hz.employmentsite.vo.baseSettings.InstitutionVo;
 import com.hz.employmentsite.vo.companyService.PostVo;
 import com.hz.employmentsite.vo.jobUserManager.JobHuntVo;
+import org.apache.commons.collections.IterableMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
@@ -36,6 +37,7 @@ public class JobHuntController {
     @GetMapping("/getList")
     public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
                                     @RequestParam(required = false) String jobHuntID,
+                                    @RequestParam(required = false) String jobUserID,
                                     @RequestParam(required = false) String jobUserName,
                                     @RequestParam(required = false) String workName,
                                     @RequestParam(required = false) Integer minWorkYear,
@@ -46,7 +48,7 @@ public class JobHuntController {
                                     @RequestParam(required = false) BigDecimal maxSalary,
                                     @RequestParam(required = false) Integer isAccomplish) {
 
-        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize,jobHuntID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
+        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize,jobHuntID,jobUserID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
         return RespGenerstor.success(result);
     }
 
@@ -84,18 +86,14 @@ public class JobHuntController {
 
     @GetMapping("export")
     public BaseResponse export(HttpServletResponse response, @RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
-                               @RequestParam(required = false) String jobHuntID,
-                               @RequestParam(required = false) String jobUserName,
-                               @RequestParam(required = false) String workName,
-                               @RequestParam(required = false) Integer minWorkYear,
-                               @RequestParam(required = false) Integer maxWorkYear,
-                               @RequestParam(required = false) Integer jobHuntType,
-                               @RequestParam(required = false) Integer jobUserTypeID,
-                               @RequestParam(required = false) BigDecimal minSalary,
-                               @RequestParam(required = false) BigDecimal maxSalary,
+                               @RequestParam(required = false) String jobHuntID, @RequestParam(required = false) String jobUserID,
+                               @RequestParam(required = false) String jobUserName,@RequestParam(required = false) String workName,
+                               @RequestParam(required = false) Integer minWorkYear,@RequestParam(required = false) Integer maxWorkYear,
+                               @RequestParam(required = false) Integer jobHuntTypeID,@RequestParam(required = false) Integer jobUserTypeID,
+                               @RequestParam(required = false) BigDecimal minSalary, @RequestParam(required = false) BigDecimal maxSalary,
                                @RequestParam(required = false) Integer isAccomplish) throws Exception{
 
-        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize,jobHuntID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntType, jobUserTypeID, minSalary, maxSalary, isAccomplish);
+        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize,jobHuntID,jobUserID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
         ExcelHelper.ExcelData data = excelHelper.new ExcelData();
         data.setTitles(Arrays.asList(new String[]{"序号","姓名","工种名称", "希望工作地区", "可到职日期","工作年限", "求职类型", "人才类型", "月薪要求"}));
         int i = 0;
@@ -109,9 +107,9 @@ public class JobHuntController {
             row.add(item.areaWork);
             row.add(item.inDate);
             row.add(item.workYear);
-            row.add(item.jobHuntType);
-            row.add(item.jobUserType);
-            row.add(item.salary);
+            row.add(item.jobHuntTypeStr);
+            row.add(item.jobUserTypeStr);
+            row.add(item.minSalary+"-"+item.maxSalary);
             rowDatas.add(row);
         }
         data.setRows(rowDatas);

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

@@ -10,7 +10,7 @@ public interface PcJobhuntMapper {
 
     int deleteByExample(PcJobhuntExample example);
 
-    int deleteByPrimaryKey(String jobhuntID);
+    int deleteByPrimaryKey(String jobHuntID);
 
     int insert(PcJobhunt row);
 
@@ -18,7 +18,7 @@ public interface PcJobhuntMapper {
 
     List<PcJobhunt> selectByExample(PcJobhuntExample example);
 
-    PcJobhunt selectByPrimaryKey(String jobhuntID);
+    PcJobhunt selectByPrimaryKey(String jobHuntID);
 
     int updateByExampleSelective(@Param("row") PcJobhunt row, @Param("example") PcJobhuntExample example);
 

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

@@ -7,7 +7,8 @@ import java.math.BigDecimal;
 import java.util.List;
 
 public interface JobHuntCQuery {
-    List<JobHuntVo> selectJobHuntList(@Param("jobHuntID") String jobHuntID,@Param("jobUserName") String jobUserName,@Param("workName") String workName,
+    List<JobHuntVo> getJobHuntList(@Param("jobHuntID") String jobHuntID,@Param("jobUserID") String jobUserID,
+                                      @Param("jobUserName") String jobUserName,@Param("workName") String workName,
                                       @Param("minWorkYear")Integer minWorkYear,@Param("maxWorkYear")Integer maxWorkYear,
                                       @Param("jobHuntTypeID")Integer jobHuntTypeID, @Param("jobUserTypeID")Integer jobUserTypeID,
                                       @Param("minSalary")BigDecimal minSalary, @Param("maxSalary")BigDecimal maxSalary,

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

@@ -4,9 +4,9 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 public class PcJobhunt {
-    private String jobhuntID;
+    private String jobHuntID;
 
-    private String jobuserID;
+    private String jobUserID;
 
     private String workCode;
 
@@ -18,11 +18,13 @@ public class PcJobhunt {
 
     private Integer workYear;
 
-    private Integer uchuntType;
+    private Integer jobHuntType;
 
-    private Integer abilityType;
+    private Integer jobUserType;
 
-    private BigDecimal salary;
+    private BigDecimal minSalary;
+
+    private BigDecimal maxSalary;
 
     private String createUserID;
 
@@ -32,20 +34,20 @@ public class PcJobhunt {
 
     private Date modifyTime;
 
-    public String getJobhuntID() {
-        return jobhuntID;
+    public String getJobHuntID() {
+        return jobHuntID;
     }
 
-    public void setJobhuntID(String jobhuntID) {
-        this.jobhuntID = jobhuntID == null ? null : jobhuntID.trim();
+    public void setJobHuntID(String jobHuntID) {
+        this.jobHuntID = jobHuntID == null ? null : jobHuntID.trim();
     }
 
-    public String getJobuserID() {
-        return jobuserID;
+    public String getJobUserID() {
+        return jobUserID;
     }
 
-    public void setJobuserID(String jobuserID) {
-        this.jobuserID = jobuserID == null ? null : jobuserID.trim();
+    public void setJobUserID(String jobUserID) {
+        this.jobUserID = jobUserID == null ? null : jobUserID.trim();
     }
 
     public String getWorkCode() {
@@ -88,28 +90,36 @@ public class PcJobhunt {
         this.workYear = workYear;
     }
 
-    public Integer getUchuntType() {
-        return uchuntType;
+    public Integer getJobHuntType() {
+        return jobHuntType;
+    }
+
+    public void setJobHuntType(Integer jobHuntType) {
+        this.jobHuntType = jobHuntType;
+    }
+
+    public Integer getJobUserType() {
+        return jobUserType;
     }
 
-    public void setUchuntType(Integer uchuntType) {
-        this.uchuntType = uchuntType;
+    public void setJobUserType(Integer jobUserType) {
+        this.jobUserType = jobUserType;
     }
 
-    public Integer getAbilityType() {
-        return abilityType;
+    public BigDecimal getMinSalary() {
+        return minSalary;
     }
 
-    public void setAbilityType(Integer abilityType) {
-        this.abilityType = abilityType;
+    public void setMinSalary(BigDecimal minSalary) {
+        this.minSalary = minSalary;
     }
 
-    public BigDecimal getSalary() {
-        return salary;
+    public BigDecimal getMaxSalary() {
+        return maxSalary;
     }
 
-    public void setSalary(BigDecimal salary) {
-        this.salary = salary;
+    public void setMaxSalary(BigDecimal maxSalary) {
+        this.maxSalary = maxSalary;
     }
 
     public String getCreateUserID() {

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

@@ -106,143 +106,143 @@ public class PcJobhuntExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
-        public Criteria andJobhuntIDIsNull() {
-            addCriterion("JobhuntID is null");
+        public Criteria andJobHuntIDIsNull() {
+            addCriterion("JobHuntID is null");
             return (Criteria) this;
         }
 
-        public Criteria andJobhuntIDIsNotNull() {
-            addCriterion("JobhuntID is not null");
+        public Criteria andJobHuntIDIsNotNull() {
+            addCriterion("JobHuntID is not null");
             return (Criteria) this;
         }
 
-        public Criteria andJobhuntIDEqualTo(String value) {
-            addCriterion("JobhuntID =", value, "jobhuntID");
+        public Criteria andJobHuntIDEqualTo(String value) {
+            addCriterion("JobHuntID =", value, "jobHuntID");
             return (Criteria) this;
         }
 
-        public Criteria andJobhuntIDNotEqualTo(String value) {
-            addCriterion("JobhuntID <>", value, "jobhuntID");
+        public Criteria andJobHuntIDNotEqualTo(String value) {
+            addCriterion("JobHuntID <>", value, "jobHuntID");
             return (Criteria) this;
         }
 
-        public Criteria andJobhuntIDGreaterThan(String value) {
-            addCriterion("JobhuntID >", value, "jobhuntID");
+        public Criteria andJobHuntIDGreaterThan(String value) {
+            addCriterion("JobHuntID >", value, "jobHuntID");
             return (Criteria) this;
         }
 
-        public Criteria andJobhuntIDGreaterThanOrEqualTo(String value) {
-            addCriterion("JobhuntID >=", value, "jobhuntID");
+        public Criteria andJobHuntIDGreaterThanOrEqualTo(String value) {
+            addCriterion("JobHuntID >=", value, "jobHuntID");
             return (Criteria) this;
         }
 
-        public Criteria andJobhuntIDLessThan(String value) {
-            addCriterion("JobhuntID <", value, "jobhuntID");
+        public Criteria andJobHuntIDLessThan(String value) {
+            addCriterion("JobHuntID <", value, "jobHuntID");
             return (Criteria) this;
         }
 
-        public Criteria andJobhuntIDLessThanOrEqualTo(String value) {
-            addCriterion("JobhuntID <=", value, "jobhuntID");
+        public Criteria andJobHuntIDLessThanOrEqualTo(String value) {
+            addCriterion("JobHuntID <=", value, "jobHuntID");
             return (Criteria) this;
         }
 
-        public Criteria andJobhuntIDLike(String value) {
-            addCriterion("JobhuntID like", value, "jobhuntID");
+        public Criteria andJobHuntIDLike(String value) {
+            addCriterion("JobHuntID like", value, "jobHuntID");
             return (Criteria) this;
         }
 
-        public Criteria andJobhuntIDNotLike(String value) {
-            addCriterion("JobhuntID not like", value, "jobhuntID");
+        public Criteria andJobHuntIDNotLike(String value) {
+            addCriterion("JobHuntID not like", value, "jobHuntID");
             return (Criteria) this;
         }
 
-        public Criteria andJobhuntIDIn(List<String> values) {
-            addCriterion("JobhuntID in", values, "jobhuntID");
+        public Criteria andJobHuntIDIn(List<String> values) {
+            addCriterion("JobHuntID in", values, "jobHuntID");
             return (Criteria) this;
         }
 
-        public Criteria andJobhuntIDNotIn(List<String> values) {
-            addCriterion("JobhuntID not in", values, "jobhuntID");
+        public Criteria andJobHuntIDNotIn(List<String> values) {
+            addCriterion("JobHuntID not in", values, "jobHuntID");
             return (Criteria) this;
         }
 
-        public Criteria andJobhuntIDBetween(String value1, String value2) {
-            addCriterion("JobhuntID between", value1, value2, "jobhuntID");
+        public Criteria andJobHuntIDBetween(String value1, String value2) {
+            addCriterion("JobHuntID between", value1, value2, "jobHuntID");
             return (Criteria) this;
         }
 
-        public Criteria andJobhuntIDNotBetween(String value1, String value2) {
-            addCriterion("JobhuntID not between", value1, value2, "jobhuntID");
+        public Criteria andJobHuntIDNotBetween(String value1, String value2) {
+            addCriterion("JobHuntID not between", value1, value2, "jobHuntID");
             return (Criteria) this;
         }
 
-        public Criteria andJobuserIDIsNull() {
-            addCriterion("JobuserID is null");
+        public Criteria andJobUserIDIsNull() {
+            addCriterion("JobUserID is null");
             return (Criteria) this;
         }
 
-        public Criteria andJobuserIDIsNotNull() {
-            addCriterion("JobuserID is not null");
+        public Criteria andJobUserIDIsNotNull() {
+            addCriterion("JobUserID is not null");
             return (Criteria) this;
         }
 
-        public Criteria andJobuserIDEqualTo(String value) {
-            addCriterion("JobuserID =", value, "jobuserID");
+        public Criteria andJobUserIDEqualTo(String value) {
+            addCriterion("JobUserID =", value, "jobUserID");
             return (Criteria) this;
         }
 
-        public Criteria andJobuserIDNotEqualTo(String value) {
-            addCriterion("JobuserID <>", value, "jobuserID");
+        public Criteria andJobUserIDNotEqualTo(String value) {
+            addCriterion("JobUserID <>", value, "jobUserID");
             return (Criteria) this;
         }
 
-        public Criteria andJobuserIDGreaterThan(String value) {
-            addCriterion("JobuserID >", value, "jobuserID");
+        public Criteria andJobUserIDGreaterThan(String value) {
+            addCriterion("JobUserID >", value, "jobUserID");
             return (Criteria) this;
         }
 
-        public Criteria andJobuserIDGreaterThanOrEqualTo(String value) {
-            addCriterion("JobuserID >=", value, "jobuserID");
+        public Criteria andJobUserIDGreaterThanOrEqualTo(String value) {
+            addCriterion("JobUserID >=", value, "jobUserID");
             return (Criteria) this;
         }
 
-        public Criteria andJobuserIDLessThan(String value) {
-            addCriterion("JobuserID <", value, "jobuserID");
+        public Criteria andJobUserIDLessThan(String value) {
+            addCriterion("JobUserID <", value, "jobUserID");
             return (Criteria) this;
         }
 
-        public Criteria andJobuserIDLessThanOrEqualTo(String value) {
-            addCriterion("JobuserID <=", value, "jobuserID");
+        public Criteria andJobUserIDLessThanOrEqualTo(String value) {
+            addCriterion("JobUserID <=", value, "jobUserID");
             return (Criteria) this;
         }
 
-        public Criteria andJobuserIDLike(String value) {
-            addCriterion("JobuserID like", value, "jobuserID");
+        public Criteria andJobUserIDLike(String value) {
+            addCriterion("JobUserID like", value, "jobUserID");
             return (Criteria) this;
         }
 
-        public Criteria andJobuserIDNotLike(String value) {
-            addCriterion("JobuserID not like", value, "jobuserID");
+        public Criteria andJobUserIDNotLike(String value) {
+            addCriterion("JobUserID not like", value, "jobUserID");
             return (Criteria) this;
         }
 
-        public Criteria andJobuserIDIn(List<String> values) {
-            addCriterion("JobuserID in", values, "jobuserID");
+        public Criteria andJobUserIDIn(List<String> values) {
+            addCriterion("JobUserID in", values, "jobUserID");
             return (Criteria) this;
         }
 
-        public Criteria andJobuserIDNotIn(List<String> values) {
-            addCriterion("JobuserID not in", values, "jobuserID");
+        public Criteria andJobUserIDNotIn(List<String> values) {
+            addCriterion("JobUserID not in", values, "jobUserID");
             return (Criteria) this;
         }
 
-        public Criteria andJobuserIDBetween(String value1, String value2) {
-            addCriterion("JobuserID between", value1, value2, "jobuserID");
+        public Criteria andJobUserIDBetween(String value1, String value2) {
+            addCriterion("JobUserID between", value1, value2, "jobUserID");
             return (Criteria) this;
         }
 
-        public Criteria andJobuserIDNotBetween(String value1, String value2) {
-            addCriterion("JobuserID not between", value1, value2, "jobuserID");
+        public Criteria andJobUserIDNotBetween(String value1, String value2) {
+            addCriterion("JobUserID not between", value1, value2, "jobUserID");
             return (Criteria) this;
         }
 
@@ -576,183 +576,243 @@ public class PcJobhuntExample {
             return (Criteria) this;
         }
 
-        public Criteria andUchuntTypeIsNull() {
-            addCriterion("UchuntType is null");
+        public Criteria andJobHuntTypeIsNull() {
+            addCriterion("JobHuntType is null");
             return (Criteria) this;
         }
 
-        public Criteria andUchuntTypeIsNotNull() {
-            addCriterion("UchuntType is not null");
+        public Criteria andJobHuntTypeIsNotNull() {
+            addCriterion("JobHuntType is not null");
             return (Criteria) this;
         }
 
-        public Criteria andUchuntTypeEqualTo(Integer value) {
-            addCriterion("UchuntType =", value, "uchuntType");
+        public Criteria andJobHuntTypeEqualTo(Integer value) {
+            addCriterion("JobHuntType =", value, "jobHuntType");
             return (Criteria) this;
         }
 
-        public Criteria andUchuntTypeNotEqualTo(Integer value) {
-            addCriterion("UchuntType <>", value, "uchuntType");
+        public Criteria andJobHuntTypeNotEqualTo(Integer value) {
+            addCriterion("JobHuntType <>", value, "jobHuntType");
             return (Criteria) this;
         }
 
-        public Criteria andUchuntTypeGreaterThan(Integer value) {
-            addCriterion("UchuntType >", value, "uchuntType");
+        public Criteria andJobHuntTypeGreaterThan(Integer value) {
+            addCriterion("JobHuntType >", value, "jobHuntType");
             return (Criteria) this;
         }
 
-        public Criteria andUchuntTypeGreaterThanOrEqualTo(Integer value) {
-            addCriterion("UchuntType >=", value, "uchuntType");
+        public Criteria andJobHuntTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("JobHuntType >=", value, "jobHuntType");
             return (Criteria) this;
         }
 
-        public Criteria andUchuntTypeLessThan(Integer value) {
-            addCriterion("UchuntType <", value, "uchuntType");
+        public Criteria andJobHuntTypeLessThan(Integer value) {
+            addCriterion("JobHuntType <", value, "jobHuntType");
             return (Criteria) this;
         }
 
-        public Criteria andUchuntTypeLessThanOrEqualTo(Integer value) {
-            addCriterion("UchuntType <=", value, "uchuntType");
+        public Criteria andJobHuntTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("JobHuntType <=", value, "jobHuntType");
             return (Criteria) this;
         }
 
-        public Criteria andUchuntTypeIn(List<Integer> values) {
-            addCriterion("UchuntType in", values, "uchuntType");
+        public Criteria andJobHuntTypeIn(List<Integer> values) {
+            addCriterion("JobHuntType in", values, "jobHuntType");
             return (Criteria) this;
         }
 
-        public Criteria andUchuntTypeNotIn(List<Integer> values) {
-            addCriterion("UchuntType not in", values, "uchuntType");
+        public Criteria andJobHuntTypeNotIn(List<Integer> values) {
+            addCriterion("JobHuntType not in", values, "jobHuntType");
             return (Criteria) this;
         }
 
-        public Criteria andUchuntTypeBetween(Integer value1, Integer value2) {
-            addCriterion("UchuntType between", value1, value2, "uchuntType");
+        public Criteria andJobHuntTypeBetween(Integer value1, Integer value2) {
+            addCriterion("JobHuntType between", value1, value2, "jobHuntType");
             return (Criteria) this;
         }
 
-        public Criteria andUchuntTypeNotBetween(Integer value1, Integer value2) {
-            addCriterion("UchuntType not between", value1, value2, "uchuntType");
+        public Criteria andJobHuntTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("JobHuntType not between", value1, value2, "jobHuntType");
             return (Criteria) this;
         }
 
-        public Criteria andAbilityTypeIsNull() {
-            addCriterion("AbilityType is null");
+        public Criteria andJobUserTypeIsNull() {
+            addCriterion("JobUserType is null");
             return (Criteria) this;
         }
 
-        public Criteria andAbilityTypeIsNotNull() {
-            addCriterion("AbilityType is not null");
+        public Criteria andJobUserTypeIsNotNull() {
+            addCriterion("JobUserType is not null");
             return (Criteria) this;
         }
 
-        public Criteria andAbilityTypeEqualTo(Integer value) {
-            addCriterion("AbilityType =", value, "abilityType");
+        public Criteria andJobUserTypeEqualTo(Integer value) {
+            addCriterion("JobUserType =", value, "jobUserType");
             return (Criteria) this;
         }
 
-        public Criteria andAbilityTypeNotEqualTo(Integer value) {
-            addCriterion("AbilityType <>", value, "abilityType");
+        public Criteria andJobUserTypeNotEqualTo(Integer value) {
+            addCriterion("JobUserType <>", value, "jobUserType");
             return (Criteria) this;
         }
 
-        public Criteria andAbilityTypeGreaterThan(Integer value) {
-            addCriterion("AbilityType >", value, "abilityType");
+        public Criteria andJobUserTypeGreaterThan(Integer value) {
+            addCriterion("JobUserType >", value, "jobUserType");
             return (Criteria) this;
         }
 
-        public Criteria andAbilityTypeGreaterThanOrEqualTo(Integer value) {
-            addCriterion("AbilityType >=", value, "abilityType");
+        public Criteria andJobUserTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("JobUserType >=", value, "jobUserType");
             return (Criteria) this;
         }
 
-        public Criteria andAbilityTypeLessThan(Integer value) {
-            addCriterion("AbilityType <", value, "abilityType");
+        public Criteria andJobUserTypeLessThan(Integer value) {
+            addCriterion("JobUserType <", value, "jobUserType");
             return (Criteria) this;
         }
 
-        public Criteria andAbilityTypeLessThanOrEqualTo(Integer value) {
-            addCriterion("AbilityType <=", value, "abilityType");
+        public Criteria andJobUserTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("JobUserType <=", value, "jobUserType");
             return (Criteria) this;
         }
 
-        public Criteria andAbilityTypeIn(List<Integer> values) {
-            addCriterion("AbilityType in", values, "abilityType");
+        public Criteria andJobUserTypeIn(List<Integer> values) {
+            addCriterion("JobUserType in", values, "jobUserType");
             return (Criteria) this;
         }
 
-        public Criteria andAbilityTypeNotIn(List<Integer> values) {
-            addCriterion("AbilityType not in", values, "abilityType");
+        public Criteria andJobUserTypeNotIn(List<Integer> values) {
+            addCriterion("JobUserType not in", values, "jobUserType");
             return (Criteria) this;
         }
 
-        public Criteria andAbilityTypeBetween(Integer value1, Integer value2) {
-            addCriterion("AbilityType between", value1, value2, "abilityType");
+        public Criteria andJobUserTypeBetween(Integer value1, Integer value2) {
+            addCriterion("JobUserType between", value1, value2, "jobUserType");
             return (Criteria) this;
         }
 
-        public Criteria andAbilityTypeNotBetween(Integer value1, Integer value2) {
-            addCriterion("AbilityType not between", value1, value2, "abilityType");
+        public Criteria andJobUserTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("JobUserType not between", value1, value2, "jobUserType");
             return (Criteria) this;
         }
 
-        public Criteria andSalaryIsNull() {
-            addCriterion("Salary is null");
+        public Criteria andMinSalaryIsNull() {
+            addCriterion("MinSalary is null");
             return (Criteria) this;
         }
 
-        public Criteria andSalaryIsNotNull() {
-            addCriterion("Salary is not null");
+        public Criteria andMinSalaryIsNotNull() {
+            addCriterion("MinSalary is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSalaryEqualTo(BigDecimal value) {
-            addCriterion("Salary =", value, "salary");
+        public Criteria andMinSalaryEqualTo(BigDecimal value) {
+            addCriterion("MinSalary =", value, "minSalary");
             return (Criteria) this;
         }
 
-        public Criteria andSalaryNotEqualTo(BigDecimal value) {
-            addCriterion("Salary <>", value, "salary");
+        public Criteria andMinSalaryNotEqualTo(BigDecimal value) {
+            addCriterion("MinSalary <>", value, "minSalary");
             return (Criteria) this;
         }
 
-        public Criteria andSalaryGreaterThan(BigDecimal value) {
-            addCriterion("Salary >", value, "salary");
+        public Criteria andMinSalaryGreaterThan(BigDecimal value) {
+            addCriterion("MinSalary >", value, "minSalary");
             return (Criteria) this;
         }
 
-        public Criteria andSalaryGreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("Salary >=", value, "salary");
+        public Criteria andMinSalaryGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("MinSalary >=", value, "minSalary");
             return (Criteria) this;
         }
 
-        public Criteria andSalaryLessThan(BigDecimal value) {
-            addCriterion("Salary <", value, "salary");
+        public Criteria andMinSalaryLessThan(BigDecimal value) {
+            addCriterion("MinSalary <", value, "minSalary");
             return (Criteria) this;
         }
 
-        public Criteria andSalaryLessThanOrEqualTo(BigDecimal value) {
-            addCriterion("Salary <=", value, "salary");
+        public Criteria andMinSalaryLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("MinSalary <=", value, "minSalary");
             return (Criteria) this;
         }
 
-        public Criteria andSalaryIn(List<BigDecimal> values) {
-            addCriterion("Salary in", values, "salary");
+        public Criteria andMinSalaryIn(List<BigDecimal> values) {
+            addCriterion("MinSalary in", values, "minSalary");
             return (Criteria) this;
         }
 
-        public Criteria andSalaryNotIn(List<BigDecimal> values) {
-            addCriterion("Salary not in", values, "salary");
+        public Criteria andMinSalaryNotIn(List<BigDecimal> values) {
+            addCriterion("MinSalary not in", values, "minSalary");
             return (Criteria) this;
         }
 
-        public Criteria andSalaryBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("Salary between", value1, value2, "salary");
+        public Criteria andMinSalaryBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("MinSalary between", value1, value2, "minSalary");
             return (Criteria) this;
         }
 
-        public Criteria andSalaryNotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("Salary not between", value1, value2, "salary");
+        public Criteria andMinSalaryNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("MinSalary not between", value1, value2, "minSalary");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxSalaryIsNull() {
+            addCriterion("MaxSalary is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxSalaryIsNotNull() {
+            addCriterion("MaxSalary is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxSalaryEqualTo(BigDecimal value) {
+            addCriterion("MaxSalary =", value, "maxSalary");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxSalaryNotEqualTo(BigDecimal value) {
+            addCriterion("MaxSalary <>", value, "maxSalary");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxSalaryGreaterThan(BigDecimal value) {
+            addCriterion("MaxSalary >", value, "maxSalary");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxSalaryGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("MaxSalary >=", value, "maxSalary");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxSalaryLessThan(BigDecimal value) {
+            addCriterion("MaxSalary <", value, "maxSalary");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxSalaryLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("MaxSalary <=", value, "maxSalary");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxSalaryIn(List<BigDecimal> values) {
+            addCriterion("MaxSalary in", values, "maxSalary");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxSalaryNotIn(List<BigDecimal> values) {
+            addCriterion("MaxSalary not in", values, "maxSalary");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxSalaryBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("MaxSalary between", value1, value2, "maxSalary");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxSalaryNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("MaxSalary not between", value1, value2, "maxSalary");
             return (Criteria) this;
         }
 

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

@@ -39,11 +39,11 @@ public class JobHuntServiceImpl implements JobHuntService {
     private StringUtils stringUtils;
 
     @Override
-    public PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize, String jobHuntID, String jobUserName, String workName,
+    public PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize, String jobHuntID,String jobUserID, String jobUserName, String workName,
                                        Integer minWorkYear, Integer maxWorkYear, Integer jobHuntTypeID, Integer jobUserTypeID,
                                        BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<JobHuntVo> list = jobhuntCQuery.selectJobHuntList(jobHuntID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
+        List<JobHuntVo> list = jobhuntCQuery.getJobHuntList(jobHuntID,jobUserID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
 
         PageInfo<JobHuntVo> result = new PageInfo(list);
 
@@ -54,7 +54,7 @@ public class JobHuntServiceImpl implements JobHuntService {
     public JobHuntVo get(String jobHuntId) {
         List<String> ids = new ArrayList<>();
         ids.add(jobHuntId);
-        JobHuntVo model = jobhuntCQuery.selectJobHuntList(stringUtils.ListToInSql(ids),null,null,null,null,
+        JobHuntVo model = jobhuntCQuery.getJobHuntList(stringUtils.ListToInSql(ids),null,null,null,null,null,
                 null,null,null,null,null).stream().findFirst().orElse(null);
         return model;
     }
@@ -62,7 +62,7 @@ public class JobHuntServiceImpl implements JobHuntService {
     @Override
     public Integer delete(List<String> idList){
         PcJobhuntExample contactExample = new PcJobhuntExample();
-        contactExample.or().andJobhuntIDIn(idList);
+        contactExample.or().andJobHuntIDIn(idList);
         pcJobhuntMapper.deleteByExample(contactExample);
         return pcJobhuntMapper.deleteByExample(contactExample);
     }
@@ -76,31 +76,33 @@ public class JobHuntServiceImpl implements JobHuntService {
         if (!isExist) {
             //添加
             dbData = new PcJobhunt();
-            dbData.setJobhuntID(data.getJobHuntID());
-            dbData.setJobuserID(data.getJobUserID());
+            dbData.setJobHuntID(data.getJobHuntID());
+            dbData.setJobUserID(data.getJobUserID());
             dbData.setWorkCode(data.getWorkCode());
             dbData.setWorkName(data.getWorkName());
             dbData.setAreaWork(data.getAreaWork());
             dbData.setInDate(data.getInDate());
             dbData.setWorkYear(data.getWorkYear());
-            dbData.setUchuntType(data.getUcHuntType());
-            dbData.setAbilityType(data.getAbilityType());
-            dbData.setSalary(data.getSalary());
+            dbData.setJobHuntType(data.getJobHuntType());
+            dbData.setJobUserType(data.getJobUserType());
+            dbData.setMinSalary(data.getMinSalary());
+            dbData.setMaxSalary(data.getMaxSalary());
             dbData.setCreateUserID(userId);
             dbData.setCreateTime(new Date());
             result = pcJobhuntMapper.insert(dbData);
         } else {
             //修改
-            dbData.setJobhuntID(data.jobHuntID);
-            dbData.setJobuserID(data.jobUserID);
+            dbData.setJobHuntID(data.jobHuntID);
+            dbData.setJobUserID(data.jobUserID);
             dbData.setWorkCode(data.workCode);
             dbData.setWorkName(data.workName);
             dbData.setAreaWork(data.areaWork);
             dbData.setInDate(data.inDate);
             dbData.setWorkYear(data.workYear);
-            dbData.setUchuntType(data.ucHuntType);
-            dbData.setAbilityType(data.abilityType);
-            dbData.setSalary(data.salary);
+            dbData.setJobHuntType(data.jobHuntType);
+            dbData.setJobUserType(data.jobUserType);
+            dbData.setMinSalary(data.minSalary);
+            dbData.setMaxSalary(data.maxSalary);
             dbData.setModifyUserID(userId);
             dbData.setModifyTime(new Date());
             result = pcJobhuntMapper.updateByPrimaryKey(dbData);
@@ -141,23 +143,26 @@ public class JobHuntServiceImpl implements JobHuntService {
                 errorInfo += "请填写可到职日期!";
             if (stringUtils.IsNullOrEmpty(String.valueOf(item.workYear)) || item.workYear==0)
                 errorInfo += "请填写工作年限!";
-            if (stringUtils.IsNullOrEmpty(item.jobHuntType))
+            if (stringUtils.IsNullOrEmpty(item.jobHuntTypeStr))
                 errorInfo += "请填写求职类型!";
             else {
-                item.ucHuntType = dicHuntTypeList.stream().filter(it -> it.getName().equals(item.jobHuntType.trim()))
+                item.jobHuntType = dicHuntTypeList.stream().filter(it -> it.getName().equals(item.jobHuntTypeStr.trim()))
                         .findFirst().orElse(new SysDictionaryItem()).getValue();
-                if (item.ucHuntType == null || item.ucHuntType == 0)
+                if (item.jobHuntType == null || item.jobHuntType == 0)
                     errorInfo += "输入求职类型不存在!";
             }
-            if (stringUtils.IsNullOrEmpty(item.jobUserType))
-                errorInfo += "请填写求职类型!";
+            if (stringUtils.IsNullOrEmpty(item.jobUserTypeStr))
+                errorInfo += "请填写人才类型!";
             else {
-                item.abilityType = dicUserTypeList.stream().filter(it -> it.getName().equals(item.jobUserType.trim()))
+                item.jobUserType = dicUserTypeList.stream().filter(it -> it.getName().equals(item.jobUserTypeStr.trim()))
                         .findFirst().orElse(new SysDictionaryItem()).getValue();
-                if (item.abilityType == null || item.abilityType == 0)
+                if (item.jobUserType == null || item.jobUserType == 0)
                     errorInfo += "输入人才类型不存在!";
             }
-            if (stringUtils.IsNullOrEmpty(String.valueOf(item.salary)) || item.salary == null)
+            if (stringUtils.IsNullOrEmpty(String.valueOf(item.minSalary)) || item.minSalary == null)
+                errorInfo += "请填写最低薪酬!";
+
+            if (stringUtils.IsNullOrEmpty(String.valueOf(item.maxSalary)) || item.maxSalary == null)
                 errorInfo += "请填写最高薪酬!";
 
             if (stringUtils.IsNullOrEmpty(errorInfo)) {

src/main/java/com/hz/employmentsite/services/service/jobUserManager/JobHuntService.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 public interface JobHuntService {
 
-    PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize, String jobHuntID, String jobUserName, String workName,
+    PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize, String jobHuntID,String jobUserID, String jobUserName, String workName,
                                 Integer minWorkYear, Integer maxWorkYear, Integer jobHuntTypeID, Integer jobUserTypeID,
                                 BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish);
 

src/main/java/com/hz/employmentsite/vo/jobUserManager/JobHuntVo.java

@@ -15,12 +15,13 @@ public class JobHuntVo {
     public String areaWork;
     public Date inDate;
     public Integer workYear;
-    public Integer ucHuntType;
-    public Integer abilityType;
+    public Integer jobHuntType;
+    public Integer jobUserType;
 
-    public String jobHuntType;
-    public String jobUserType;
-    public BigDecimal salary;
+    public String jobHuntTypeStr;
+    public String jobUserTypeStr;
+    public BigDecimal minSalary;
+    public BigDecimal maxSalary;
     public Boolean isAccomplish;
     public String errorMessage;
 }

src/main/resources/mapping/PcJobhuntMapper.xml

@@ -2,16 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hz.employmentsite.mapper.PcJobhuntMapper">
   <resultMap id="BaseResultMap" type="com.hz.employmentsite.model.PcJobhunt">
-    <id column="JobhuntID" jdbcType="VARCHAR" property="jobhuntID" />
-    <result column="JobuserID" jdbcType="VARCHAR" property="jobuserID" />
+    <id column="JobHuntID" jdbcType="VARCHAR" property="jobHuntID" />
+    <result column="JobUserID" jdbcType="VARCHAR" property="jobUserID" />
     <result column="WorkCode" jdbcType="VARCHAR" property="workCode" />
     <result column="WorkName" jdbcType="VARCHAR" property="workName" />
     <result column="AreaWork" jdbcType="VARCHAR" property="areaWork" />
     <result column="InDate" jdbcType="TIMESTAMP" property="inDate" />
     <result column="WorkYear" jdbcType="INTEGER" property="workYear" />
-    <result column="UchuntType" jdbcType="INTEGER" property="uchuntType" />
-    <result column="AbilityType" jdbcType="INTEGER" property="abilityType" />
-    <result column="Salary" jdbcType="DECIMAL" property="salary" />
+    <result column="JobHuntType" jdbcType="INTEGER" property="jobHuntType" />
+    <result column="JobUserType" jdbcType="INTEGER" property="jobUserType" />
+    <result column="MinSalary" jdbcType="DECIMAL" property="minSalary" />
+    <result column="MaxSalary" jdbcType="DECIMAL" property="maxSalary" />
     <result column="CreateUserID" jdbcType="VARCHAR" property="createUserID" />
     <result column="CreateTime" jdbcType="TIMESTAMP" property="createTime" />
     <result column="ModifyUserID" jdbcType="VARCHAR" property="modifyUserID" />
@@ -76,8 +77,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    JobhuntID, JobuserID, WorkCode, WorkName, AreaWork, InDate, WorkYear, UchuntType, 
-    AbilityType, Salary, CreateUserID, CreateTime, ModifyUserID, ModifyTime
+    JobHuntID, JobUserID, WorkCode, WorkName, AreaWork, InDate, WorkYear, JobHuntType, 
+    JobUserType, MinSalary, MaxSalary, CreateUserID, CreateTime, ModifyUserID, ModifyTime
   </sql>
   <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcJobhuntExample" resultMap="BaseResultMap">
     select
@@ -97,11 +98,11 @@
     select 
     <include refid="Base_Column_List" />
     from pc_jobhunt
-    where JobhuntID = #{jobhuntID,jdbcType=VARCHAR}
+    where JobHuntID = #{jobHuntID,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from pc_jobhunt
-    where JobhuntID = #{jobhuntID,jdbcType=VARCHAR}
+    where JobHuntID = #{jobHuntID,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="com.hz.employmentsite.model.PcJobhuntExample">
     delete from pc_jobhunt
@@ -110,25 +111,27 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.hz.employmentsite.model.PcJobhunt">
-    insert into pc_jobhunt (JobhuntID, JobuserID, WorkCode, 
+    insert into pc_jobhunt (JobHuntID, JobUserID, WorkCode, 
       WorkName, AreaWork, InDate, 
-      WorkYear, UchuntType, AbilityType, 
-      Salary, CreateUserID, CreateTime, 
-      ModifyUserID, ModifyTime)
-    values (#{jobhuntID,jdbcType=VARCHAR}, #{jobuserID,jdbcType=VARCHAR}, #{workCode,jdbcType=VARCHAR}, 
+      WorkYear, JobHuntType, JobUserType, 
+      MinSalary, MaxSalary, CreateUserID, 
+      CreateTime, ModifyUserID, ModifyTime
+      )
+    values (#{jobHuntID,jdbcType=VARCHAR}, #{jobUserID,jdbcType=VARCHAR}, #{workCode,jdbcType=VARCHAR}, 
       #{workName,jdbcType=VARCHAR}, #{areaWork,jdbcType=VARCHAR}, #{inDate,jdbcType=TIMESTAMP}, 
-      #{workYear,jdbcType=INTEGER}, #{uchuntType,jdbcType=INTEGER}, #{abilityType,jdbcType=INTEGER}, 
-      #{salary,jdbcType=DECIMAL}, #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP})
+      #{workYear,jdbcType=INTEGER}, #{jobHuntType,jdbcType=INTEGER}, #{jobUserType,jdbcType=INTEGER}, 
+      #{minSalary,jdbcType=DECIMAL}, #{maxSalary,jdbcType=DECIMAL}, #{createUserID,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcJobhunt">
     insert into pc_jobhunt
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="jobhuntID != null">
-        JobhuntID,
+      <if test="jobHuntID != null">
+        JobHuntID,
       </if>
-      <if test="jobuserID != null">
-        JobuserID,
+      <if test="jobUserID != null">
+        JobUserID,
       </if>
       <if test="workCode != null">
         WorkCode,
@@ -145,14 +148,17 @@
       <if test="workYear != null">
         WorkYear,
       </if>
-      <if test="uchuntType != null">
-        UchuntType,
+      <if test="jobHuntType != null">
+        JobHuntType,
       </if>
-      <if test="abilityType != null">
-        AbilityType,
+      <if test="jobUserType != null">
+        JobUserType,
       </if>
-      <if test="salary != null">
-        Salary,
+      <if test="minSalary != null">
+        MinSalary,
+      </if>
+      <if test="maxSalary != null">
+        MaxSalary,
       </if>
       <if test="createUserID != null">
         CreateUserID,
@@ -168,11 +174,11 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="jobhuntID != null">
-        #{jobhuntID,jdbcType=VARCHAR},
+      <if test="jobHuntID != null">
+        #{jobHuntID,jdbcType=VARCHAR},
       </if>
-      <if test="jobuserID != null">
-        #{jobuserID,jdbcType=VARCHAR},
+      <if test="jobUserID != null">
+        #{jobUserID,jdbcType=VARCHAR},
       </if>
       <if test="workCode != null">
         #{workCode,jdbcType=VARCHAR},
@@ -189,14 +195,17 @@
       <if test="workYear != null">
         #{workYear,jdbcType=INTEGER},
       </if>
-      <if test="uchuntType != null">
-        #{uchuntType,jdbcType=INTEGER},
+      <if test="jobHuntType != null">
+        #{jobHuntType,jdbcType=INTEGER},
+      </if>
+      <if test="jobUserType != null">
+        #{jobUserType,jdbcType=INTEGER},
       </if>
-      <if test="abilityType != null">
-        #{abilityType,jdbcType=INTEGER},
+      <if test="minSalary != null">
+        #{minSalary,jdbcType=DECIMAL},
       </if>
-      <if test="salary != null">
-        #{salary,jdbcType=DECIMAL},
+      <if test="maxSalary != null">
+        #{maxSalary,jdbcType=DECIMAL},
       </if>
       <if test="createUserID != null">
         #{createUserID,jdbcType=VARCHAR},
@@ -221,11 +230,11 @@
   <update id="updateByExampleSelective" parameterType="map">
     update pc_jobhunt
     <set>
-      <if test="row.jobhuntID != null">
-        JobhuntID = #{row.jobhuntID,jdbcType=VARCHAR},
+      <if test="row.jobHuntID != null">
+        JobHuntID = #{row.jobHuntID,jdbcType=VARCHAR},
       </if>
-      <if test="row.jobuserID != null">
-        JobuserID = #{row.jobuserID,jdbcType=VARCHAR},
+      <if test="row.jobUserID != null">
+        JobUserID = #{row.jobUserID,jdbcType=VARCHAR},
       </if>
       <if test="row.workCode != null">
         WorkCode = #{row.workCode,jdbcType=VARCHAR},
@@ -242,14 +251,17 @@
       <if test="row.workYear != null">
         WorkYear = #{row.workYear,jdbcType=INTEGER},
       </if>
-      <if test="row.uchuntType != null">
-        UchuntType = #{row.uchuntType,jdbcType=INTEGER},
+      <if test="row.jobHuntType != null">
+        JobHuntType = #{row.jobHuntType,jdbcType=INTEGER},
       </if>
-      <if test="row.abilityType != null">
-        AbilityType = #{row.abilityType,jdbcType=INTEGER},
+      <if test="row.jobUserType != null">
+        JobUserType = #{row.jobUserType,jdbcType=INTEGER},
       </if>
-      <if test="row.salary != null">
-        Salary = #{row.salary,jdbcType=DECIMAL},
+      <if test="row.minSalary != null">
+        MinSalary = #{row.minSalary,jdbcType=DECIMAL},
+      </if>
+      <if test="row.maxSalary != null">
+        MaxSalary = #{row.maxSalary,jdbcType=DECIMAL},
       </if>
       <if test="row.createUserID != null">
         CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
@@ -270,16 +282,17 @@
   </update>
   <update id="updateByExample" parameterType="map">
     update pc_jobhunt
-    set JobhuntID = #{row.jobhuntID,jdbcType=VARCHAR},
-      JobuserID = #{row.jobuserID,jdbcType=VARCHAR},
+    set JobHuntID = #{row.jobHuntID,jdbcType=VARCHAR},
+      JobUserID = #{row.jobUserID,jdbcType=VARCHAR},
       WorkCode = #{row.workCode,jdbcType=VARCHAR},
       WorkName = #{row.workName,jdbcType=VARCHAR},
       AreaWork = #{row.areaWork,jdbcType=VARCHAR},
       InDate = #{row.inDate,jdbcType=TIMESTAMP},
       WorkYear = #{row.workYear,jdbcType=INTEGER},
-      UchuntType = #{row.uchuntType,jdbcType=INTEGER},
-      AbilityType = #{row.abilityType,jdbcType=INTEGER},
-      Salary = #{row.salary,jdbcType=DECIMAL},
+      JobHuntType = #{row.jobHuntType,jdbcType=INTEGER},
+      JobUserType = #{row.jobUserType,jdbcType=INTEGER},
+      MinSalary = #{row.minSalary,jdbcType=DECIMAL},
+      MaxSalary = #{row.maxSalary,jdbcType=DECIMAL},
       CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
@@ -291,8 +304,8 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.hz.employmentsite.model.PcJobhunt">
     update pc_jobhunt
     <set>
-      <if test="jobuserID != null">
-        JobuserID = #{jobuserID,jdbcType=VARCHAR},
+      <if test="jobUserID != null">
+        JobUserID = #{jobUserID,jdbcType=VARCHAR},
       </if>
       <if test="workCode != null">
         WorkCode = #{workCode,jdbcType=VARCHAR},
@@ -309,14 +322,17 @@
       <if test="workYear != null">
         WorkYear = #{workYear,jdbcType=INTEGER},
       </if>
-      <if test="uchuntType != null">
-        UchuntType = #{uchuntType,jdbcType=INTEGER},
+      <if test="jobHuntType != null">
+        JobHuntType = #{jobHuntType,jdbcType=INTEGER},
+      </if>
+      <if test="jobUserType != null">
+        JobUserType = #{jobUserType,jdbcType=INTEGER},
       </if>
-      <if test="abilityType != null">
-        AbilityType = #{abilityType,jdbcType=INTEGER},
+      <if test="minSalary != null">
+        MinSalary = #{minSalary,jdbcType=DECIMAL},
       </if>
-      <if test="salary != null">
-        Salary = #{salary,jdbcType=DECIMAL},
+      <if test="maxSalary != null">
+        MaxSalary = #{maxSalary,jdbcType=DECIMAL},
       </if>
       <if test="createUserID != null">
         CreateUserID = #{createUserID,jdbcType=VARCHAR},
@@ -331,23 +347,24 @@
         ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
       </if>
     </set>
-    where JobhuntID = #{jobhuntID,jdbcType=VARCHAR}
+    where JobHuntID = #{jobHuntID,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.hz.employmentsite.model.PcJobhunt">
     update pc_jobhunt
-    set JobuserID = #{jobuserID,jdbcType=VARCHAR},
+    set JobUserID = #{jobUserID,jdbcType=VARCHAR},
       WorkCode = #{workCode,jdbcType=VARCHAR},
       WorkName = #{workName,jdbcType=VARCHAR},
       AreaWork = #{areaWork,jdbcType=VARCHAR},
       InDate = #{inDate,jdbcType=TIMESTAMP},
       WorkYear = #{workYear,jdbcType=INTEGER},
-      UchuntType = #{uchuntType,jdbcType=INTEGER},
-      AbilityType = #{abilityType,jdbcType=INTEGER},
-      Salary = #{salary,jdbcType=DECIMAL},
+      JobHuntType = #{jobHuntType,jdbcType=INTEGER},
+      JobUserType = #{jobUserType,jdbcType=INTEGER},
+      MinSalary = #{minSalary,jdbcType=DECIMAL},
+      MaxSalary = #{maxSalary,jdbcType=DECIMAL},
       CreateUserID = #{createUserID,jdbcType=VARCHAR},
       CreateTime = #{createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
       ModifyTime = #{modifyTime,jdbcType=TIMESTAMP}
-    where JobhuntID = #{jobhuntID,jdbcType=VARCHAR}
+    where JobHuntID = #{jobHuntID,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -1,15 +1,18 @@
 <?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.cquery.JobHuntCQuery">
-    <select id="selectJobHuntList" resultType="com.hz.employmentsite.vo.jobUserManager.JobHuntVo">
-        select jobHunt.*,jobUser.name as JobUserName,dic_jobUserType.Name as JobUserType,dic_huntJobType.Name as JobHuntType from pc_jobhunt jobHunt
-        left join pc_jobuser jobUser on jobHunt.JobuserID = jobUser.JobuserID
-        left join (select * from sys_dictionary_item where DictionaryCode ='JobUserType') dic_jobUserType on jobHunt.AbilityType = dic_jobUserType.value
-        left join (select * from sys_dictionary_item where DictionaryCode ='JobHuntType') dic_huntJobType on jobHunt.UchuntType = dic_huntJobType.value
+    <select id="getJobHuntList" resultType="com.hz.employmentsite.vo.jobUserManager.JobHuntVo">
+        select jobHunt.*,jobUser.name as JobUserName,dic_jobUserType.Name as jobUserTypeStr,dic_huntJobType.Name as jobHuntTypeStr from pc_jobhunt jobHunt
+        left join pc_jobuser jobUser on jobHunt.JobUserID = jobUser.JobUserID
+        left join (select * from sys_dictionary_item where DictionaryCode ='JobUserType') dic_jobUserType on jobHunt.JobUserType = dic_jobUserType.value
+        left join (select * from sys_dictionary_item where DictionaryCode ='JobHuntType') dic_huntJobType on jobHunt.JobHuntType = dic_huntJobType.value
         where 1=1
         <if test="jobHuntID != '' and jobHuntID != null">
             and jobHuntId in (${jobHuntID})
         </if>
+        <if test="jobUserID != '' and jobUserID != null">
+            and jobHunt.jobUserId = #{jobUserID}
+        </if>
         <if test="jobUserName != '' and jobUserName != null">
             and jobUser.name like Concat('%',#{jobUserName},'%')
         </if>
@@ -26,16 +29,20 @@
             and workYear <![CDATA[ <= ]]>  #{maxWorkYear}
         </if>
         <if test="jobHuntTypeID != '' and jobHuntTypeID != null">
-            and ucHuntType = #{jobHuntTypeID}
+            and jobHuntType = #{jobHuntTypeID}
         </if>
         <if test="jobUserTypeID != '' and jobUserTypeID != null">
-            and abilityType = #{jobUserTypeID}
+            and jobUserType = #{jobUserTypeID}
+        </if>
+        <if test="minSalary != '' and minSalary != null and (maxSalary == '' or maxSalary == null)" >
+            and minSalary <![CDATA[ <= ]]> #{minSalary} and maxSalary <![CDATA[ >= ]]> #{minSalary}
         </if>
-        <if test="minSalary != '' and minSalary != null">
-            and salary <![CDATA[ >= ]]> #{minSalary}
+        <if test="maxSalary != '' and maxSalary != null and (minSalary == '' or minSalary == null)">
+            and minSalary <![CDATA[ <= ]]> #{maxSalary} and maxSalary <![CDATA[ >= ]]> #{maxSalary}
         </if>
-        <if test="maxSalary != '' and maxSalary != null">
-            and salary <![CDATA[ <= ]]> #{maxSalary}
+        <if test="minSalary != '' and minSalary != null and maxSalary != '' and maxSalary != null">
+            and (minSalary <![CDATA[ <= ]]> #{minSalary} and maxSalary <![CDATA[ >= ]]> #{minSalary})
+            or  (minSalary <![CDATA[ <= ]]> #{maxSalary} and maxSalary <![CDATA[ >= ]]> #{maxSalary})
         </if>
        <!-- <if test="isAccomplish != '' and isAccomplish != null">
             and isAccomplish = #{isAccomplish}

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

@@ -22,7 +22,7 @@
           </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="工种名称" name="workCode" :label-col="{span:7}" :rules="[{ required: true, message: '请选择工种类型!' }]">
+          <a-form-item label="工种名称" name="workName" :label-col="{span:7}" :rules="[{ required: true, message: '请选择工种类型!' }]">
             <label v-if="opCategory==3">{{dataModel.workName}}</label>
             <a-input  v-model:value="dataModel.workName" placeholder=""/>
             <!--<a-select  ref="select"  v-model:value="dataModel.workCode" :options="jobWorkTypeList"
@@ -31,9 +31,9 @@
           </a-form-item>
         </a-col>
         <a-col :span="9">
-          <a-form-item label="求职类型" name="ucHuntType" :label-col="{span:7}" :rules="[{ required: true, message: '请选择求职类型!' }]">
+          <a-form-item label="求职类型" name="jobHuntType" :label-col="{span:7}" :rules="[{ required: true, message: '请选择求职类型!' }]">
             <label v-if="opCategory==3">{{dataModel.jobHuntType}}</label>
-            <a-select  ref="select"  v-model:value="dataModel.ucHuntType" :options="jobHuntTypeList"
+            <a-select  ref="select"  v-model:value="dataModel.jobHuntType" :options="jobHuntTypeList"
                        :field-names="{label:'name',value:'value'}"  @change="loadData"  :allow-clear="true"  >
             </a-select>
           </a-form-item>
@@ -41,17 +41,19 @@
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="人才类型"  name="abilityType" :label-col="{span:8}" :rules="[{ required: true, message: '请选择人才类型!' }]">
+          <a-form-item label="人才类型"  name="jobUserType" :label-col="{span:8}" :rules="[{ required: true, message: '请选择人才类型!' }]">
             <label v-if="opCategory==3">{{dataModel.jobUserType }}</label>
-            <a-select  ref="select"  v-model:value="dataModel.abilityType" :options="jobUserTypeList"
+            <a-select  ref="select"  v-model:value="dataModel.jobUserType" :options="jobUserTypeList"
                        :field-names="{label:'name',value:'value'}"  @change="loadData"  :allow-clear="true"  >
             </a-select>
           </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="月薪要求"  name="salary" :label-col="{span:7}" :rules="[{ required: true, message: '请输入月薪要求!' }]">
+          <a-form-item label="月薪要求"  name="salary" :label-col="{span:7}">
             <label v-if="opCategory==3">{{dataModel.salary}}</label>
-            <a-input type="number" v-model:value="dataModel.salary" placeholder=""/>
+            <a-input type="number" v-model:value="dataModel.minSalary" style="width:110px;" placeholder=""/>
+            <label style="margin-right: 20px;margin-left: 20px;">-</label>
+            <a-input type="number" v-model:value="dataModel.maxSalary" style="width:110px;" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="9">
@@ -158,11 +160,15 @@ export default defineComponent({
     };
 
     const handleOk = () => {
-      if(formData.dataModel.jobUserID==null||formData.dataModel.workName ==""||formData.dataModel.ucHuntType==null||
-        formData.dataModel.abilityType==null||formData.dataModel.salary==""||formData.dataModel.workYear==null||
-        formData.dataModel.areaWork==null||formData.dataModel.inDate==""){
+
+      if(formData.dataModel.jobUserID==null||formData.dataModel.workName ==""||formData.dataModel.jobHuntType==null||
+        formData.dataModel.jobUserType==null||formData.dataModel.minSalary==""||formData.dataModel.maxSalary==""||
+        formData.dataModel.workYear==null||formData.dataModel.areaWork==null||formData.dataModel.inDate==""){
         message.error("请填写完整的求职意向!");
         isAllowCommit.value = false;
+      }else if(formData.dataModel.minSalary>formData.dataModel.maxSalary){
+        message.error("最低月薪不能大于最高月薪!");
+        isAllowCommit.value = false;
       }
       if (isAllowCommit.value){
         saveJobHunt(formData.dataModel).then(result => {

vue/src/views/jobUserManager/jobhunt/index.vue

@@ -178,12 +178,12 @@ import type {ImportProps} from "@/components/basic/excel/importExcel/ImportProps
         { title: '可到职日期', dataIndex: 'inDate', key: 'inDate', width: 100, align: "center",
           customRender: ({ record }) => record.inDate == null?"":dayjs(record.inDate).format('YYYY-MM-DD'), },
         { title: '工作年限', dataIndex: 'workYear', key: 'workYear' , align: "center",},
-        { title: '求职类型', dataIndex: 'jobHuntType', key: 'jobHuntType', align: "center", },
-        { title: '人才类型', dataIndex: 'jobUserType', key: 'jobUserType' , align: "center",},
-        { title: '月薪要求', dataIndex: 'salary', key: 'salary' , align: "center",},
-       /* { title: '是否完成求职', dataIndex: 'isAccomplish', key: 'isAccomplish' , customRender: ({record}) => (
-            record.isAccomplish == true ? "是" : "否"
-          )},*/
+        { title: '求职类型', dataIndex: 'jobHuntTypeStr', key: 'jobHuntTypeStr', align: "center", },
+        { title: '人才类型', dataIndex: 'jobUserTypeStr', key: 'jobUserTypeStr' , align: "center",},
+        { title: '月薪要求', dataIndex: 'salary', key: 'salary' , align: "center",
+          customRender: ({record}) => (
+            record.minSalary+"-"+record.maxSalary
+          )},
         { title: '操作', key: 'operation', width: 100, align: 'center' },
       ];
       const pagination = computed(() => ({