Merge remote-tracking branch 'origin/master'

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

@@ -19,7 +19,7 @@
                :class="[record.val < curStepData?.statusVal ? 'greenLine' : 'grayLine']"></div>
           <div class="stepFlex-item-label">
             <p class="stepFlex-item-label-title" @click="onRedirect(record.val)" >{{ record.title }}</p>
-            <p class="stepFlex-item-label-desc"  @click="onRedirect(record.val)" >{{ record.desc }}</p>
+            <!--<p class="stepFlex-item-label-desc"  @click="onRedirect(record.val)" >{{ record.desc }}</p>-->
           </div>
         </div>
       </div>
@@ -810,7 +810,7 @@ ion-item {
     margin-top: -10px;
 
     .stepFlex-item-label {
-      padding-top: 60px;
+      padding-top: 30px;
       font-size: 14px;
 
       .stepFlex-item-label-title {

h5app/src/views/pages/company/postList.vue

@@ -20,7 +20,7 @@
                :class="[record.val < curStepData?.statusVal ? 'greenLine' : 'grayLine']"></div>
           <div class="stepFlex-item-label">
             <p class="stepFlex-item-label-title" @click="onRedirect(record.val)">{{ record.title }}</p>
-            <p class="stepFlex-item-label-desc"  @click="onRedirect(record.val)">{{ record.desc }}</p>
+           <!-- <p class="stepFlex-item-label-desc"  @click="onRedirect(record.val)">{{ record.desc }}</p>-->
           </div>
         </div>
       </div>
@@ -346,7 +346,7 @@ export default defineComponent({
     margin-top: -10px;
 
     .stepFlex-item-label {
-      padding-top: 60px;
+      padding-top: 30px;
       font-size: 14px;
 
       .stepFlex-item-label-title {

h5app/src/views/pages/jobUserInfo/companyEdit.vue

@@ -17,7 +17,7 @@
                :class="[record.val < curStepData?.statusVal ? 'greenLine' : 'grayLine']"></div>
           <div class="stepFlex-item-label">
             <p class="stepFlex-item-label-title">{{ record.title }}</p>
-            <p class="stepFlex-item-label-desc">{{ record.desc }}</p>
+            <!--<p class="stepFlex-item-label-desc">{{ record.desc }}</p>-->
           </div>
         </div>
       </div>
@@ -753,7 +753,7 @@ ion-item {
     margin-top: -10px;
 
     .stepFlex-item-label {
-      padding-top: 60px;
+      padding-top: 30px;
       font-size: 14px;
 
       .stepFlex-item-label-title {

h5app/src/views/pages/jobUserInfo/userEdit.vue

@@ -17,7 +17,7 @@
                :class="[record.val < curStepData?.statusVal ? 'greenLine' : 'grayLine']"></div>
           <div class="stepFlex-item-label">
             <p class="stepFlex-item-label-title">{{ record.title }}</p>
-            <p class="stepFlex-item-label-desc">{{ record.desc }}</p>
+            <!--<p class="stepFlex-item-label-desc">{{ record.desc }}</p>-->
           </div>
         </div>
       </div>
@@ -1001,7 +1001,7 @@ ion-select#regionCode.md.select-disabled.legacy-select::after{display: none;}
     margin-top: -10px;
 
     .stepFlex-item-label {
-      padding-top: 60px;
+      padding-top: 30px;
       font-size: 14px;
 
       .stepFlex-item-label-title{

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

@@ -17,7 +17,7 @@
                :class="[record.val < curStepData?.statusVal ? 'greenLine' : 'grayLine']"></div>
           <div class="stepFlex-item-label">
             <p class="stepFlex-item-label-title" @click="onPathRedirect(record.val)">{{ record.title }}</p>
-            <p class="stepFlex-item-label-desc"  @click="onPathRedirect(record.val)">{{ record.desc }}</p>
+            <!--<p class="stepFlex-item-label-desc"  @click="onPathRedirect(record.val)">{{ record.desc }}</p>-->
           </div>
         </div>
       </div>
@@ -1005,7 +1005,7 @@ ion-select#regionCode.md.select-disabled.legacy-select::after{display: none;}
     margin-top: -10px;
 
     .stepFlex-item-label {
-      padding-top: 60px;
+      padding-top: 30px;
       font-size: 14px;
 
       .stepFlex-item-label-title{

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

@@ -123,7 +123,7 @@ export default defineComponent({
     });
     const stepList = ref([
       {title: '基础信息', desc: '个人基础信息', val: 1},
-      {title: '教育经历', desc: '完善教育经历',val: 2},
+      {title: '教育经历', desc: '完善教育经历', val: 2},
       {title: '工作经验', desc: '完善工作经验', val: 3},
       {title: '求职意向', desc: '个人求职意向', val: 4},
     ]);

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

@@ -120,7 +120,7 @@ export default defineComponent({
     });
     const stepList = ref([
       {title: '基础信息', desc: '个人基础信息', val: 1},
-      {title: '教育经历', desc: '完善教育经历',val: 2},
+      {title: '教育经历', desc: '完善教育经历', val: 2},
       {title: '工作经验', desc: '完善工作经验', val: 3},
       {title: '求职意向', desc: '个人求职意向', val: 4},
     ]);

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

@@ -173,7 +173,7 @@ export default defineComponent({
     });
     const stepList = ref([
       {title: '基础信息', desc: '个人基础信息', val: 1},
-      {title: '教育经历', desc: '完善教育经历',val: 2},
+      {title: '教育经历', desc: '完善教育经历', val: 2},
       {title: '工作经验', desc: '完善工作经验', val: 3},
       {title: '求职意向', desc: '个人求职意向', val: 4}
     ]);

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

@@ -207,7 +207,7 @@ public class CompanyServiceImpl implements CompanyService {
             dbData.setIndustryID(data.getIndustryID());
             dbData.setEstateCategoryID(data.getEstateCategoryID());
 //            dbData.setTagID(data.getTagID());
-            result = pcCompanyMapper.updateByPrimaryKeySelective(dbData);
+            result = pcCompanyMapper.updateByPrimaryKey(dbData);
         }
 
         if(data.listLabel!=null && data.listLabel.size()>0){

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

@@ -245,7 +245,7 @@ public class PostServiceImpl implements PostService {
             dbData.setContactEmail(data.getContactEmail());
             dbData.setWorkNatureID(data.getWorkNatureID());
 //            dbData.setTagID(data.getTagID());
-            result = pcPostMapper.updateByPrimaryKeySelective(dbData);
+            result = pcPostMapper.updateByPrimaryKey(dbData);
         }
 
         if (data.listLabel != null && data.listLabel.size() > 0) {

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

@@ -312,7 +312,7 @@ public class JobUserServiceImpl implements JobUserService {
             dbData.setModifyUserID(userId);
             dbData.setLongitude(data.getLongitude());
             dbData.setLatitude(data.getLatitude());
-            result = pcJobuserMapper.updateByPrimaryKeySelective(dbData);
+            result = pcJobuserMapper.updateByPrimaryKey(dbData);
         }
         if (result >= 1) {
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -508,7 +508,7 @@ public class JobUserServiceImpl implements JobUserService {
             dbData.setNativePlace(data.getNativePlace());
             dbData.setModifyTime(new Date());
             dbData.setModifyUserID(userId);
-            result = pcJobuserMapper.updateByPrimaryKeySelective(dbData);
+            result = pcJobuserMapper.updateByPrimaryKey(dbData);
         }
         return result;
     }

src/main/java/com/hz/employmentsite/services/impl/taskAndLog/DoTaskImpl.java

@@ -156,7 +156,7 @@ public class DoTaskImpl implements DoTaskService {
             dbData.setModifyUserID(userId);
             dbData.setTaskStatus(data.taskStatus);
             dbData.setTaskLevel(data.taskLevel);
-            result = doTaskMapper.updateByPrimaryKeySelective(dbData);
+            result = doTaskMapper.updateByPrimaryKey(dbData);
         }
         if (result == 1) {
             String doTaskID = dbData.getDotaskID();

vue/src/views/companyService/company/detail.vue

@@ -15,7 +15,12 @@
       <a-descriptions-item label="企业成立日期">
         {{ companyInfo.establishmentTime ? dayjs(companyInfo.establishmentTime).format('YYYY-MM-DD') : '' }}
       </a-descriptions-item>
-      <a-descriptions-item label="注册资本">{{ companyInfo.registeredCapital }}万元</a-descriptions-item>
+      <a-descriptions-item label="注册资本">
+        {{ companyInfo.registeredCapital }}
+        <span v-if="companyInfo.registeredCapital != null">
+          万元
+        </span>
+      </a-descriptions-item>
       <a-descriptions-item label="注册地行政区划">{{ companyInfo.signInPoliticalAreaName }}</a-descriptions-item>
       <a-descriptions-item label="所属行业">{{ companyInfo.industryName }}</a-descriptions-item>
       <a-descriptions-item label="所属产业分类">{{ companyInfo.estateCategoryName }}</a-descriptions-item>

vue/src/views/companyService/post/detail.vue

@@ -26,16 +26,12 @@
     <a-divider orientation="left">其他信息</a-divider>
     <a-descriptions bordered>
       <a-descriptions-item label="岗位月薪（元）">
-        {{ postInfo.minSalary }}
-        至
-        {{ postInfo.maxSalary }}
+        {{ showSalary(postInfo.minSalary, postInfo.maxSalary) }}
       </a-descriptions-item>
       <a-descriptions-item label="是否有试用期">{{ postInfo.isTrail ? '是' : '否' }}</a-descriptions-item>
       <a-descriptions-item label="试用期（月）">{{ postInfo.trailMonths }}</a-descriptions-item>
       <a-descriptions-item label="试用期月薪（元）">
-        {{ postInfo.trailMinSalary }}
-        至
-        {{ postInfo.trailMaxSalary }}
+        {{ showSalary(postInfo.trailMinSalary, postInfo.trailMaxSalary) }}
       </a-descriptions-item>
       <a-descriptions-item label="工作年限要求">{{ workYear }}</a-descriptions-item>
       <a-descriptions-item label="学历要求">{{ postInfo.cultureLevelName }}</a-descriptions-item>
@@ -106,6 +102,22 @@ function loadData(id: any) {
   })
 }
 
+const showSalary = (minSalary: any, maxSalary: any) => {
+  if (minSalary != null) {
+    if (maxSalary != null) {
+      return minSalary.toString() + "-" + maxSalary.toString();
+    } else {
+      return "≥" + minSalary.toString();
+    }
+  } else {
+    if (maxSalary != null) {
+      return "≤" + maxSalary.toString();
+    } else {
+      return "";
+    }
+  }
+}
+
 // 页面初始化
 onMounted(() => {
   const id = history.state.params?.id;

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

@@ -144,6 +144,7 @@
               v-model:value="dataModel.isTrail"
               :options="trialStatusList"
               :field-names="{ label: 'name', value: 'value' }"
+              @change="isTrailChange"
             >
             </a-select>
           </a-form-item>
@@ -155,7 +156,8 @@
             name="trailMonths"
             :rules="[{ required: false, message: '请选择试用期时长!' }]"
           >
-            <a-input-number style="width: 100%" :controls="false" v-model:value="dataModel.trailMonths" placeholder=""/>
+            <a-input-number :min="0" :disabled="!dataModel.isTrail" style="width: 100%" :controls="false"
+                            v-model:value="dataModel.trailMonths" placeholder="" @change="trailMonthsChange"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -204,7 +206,7 @@
             label="学历要求"
             :label-col="{ span: 7 }"
             name="cultureRank"
-            :rules="[{ required: false, message: '请选择试用期时长!' }]"
+            :rules="[{ required: false, message: '请选择学历要求!' }]"
           >
             <a-select
               ref="select"
@@ -521,13 +523,6 @@ export default defineComponent(
 
       // 月薪变更
       function salaryChange() {
-        if (!postCompany.dataModel.minSalary) {
-          postCompany.dataModel.minSalary = 0;
-        }
-        if (!postCompany.dataModel.maxSalary) {
-          postCompany.dataModel.maxSalary = 0;
-        }
-
         if (postCompany.dataModel.maxSalary < postCompany.dataModel.minSalary) {
           postCompany.dataModel.maxSalary = postCompany.dataModel.minSalary;
         }
@@ -535,18 +530,23 @@ export default defineComponent(
 
       // 试用期月薪变更
       function trailSalaryChange() {
-        if (!postCompany.dataModel.trailMinSalary) {
-          postCompany.dataModel.trailMinSalary = 0;
-        }
-        if (!postCompany.dataModel.trailMaxSalary) {
-          postCompany.dataModel.trailMaxSalary = 0;
-        }
-
         if (postCompany.dataModel.trailMaxSalary < postCompany.dataModel.trailMinSalary) {
           postCompany.dataModel.trailMaxSalary = postCompany.dataModel.trailMinSalary;
         }
       }
 
+      // 是否有试用期
+      function isTrailChange() {
+        if (!postCompany.dataModel.isTrail) {
+          postCompany.dataModel.trailMonths = 0;
+        }
+      }
+
+      // 试用期取证
+      function trailMonthsChange() {
+        postCompany.dataModel.trailMonths = Math.floor(postCompany.dataModel.trailMonths);
+      }
+
       return {
         ...toRefs(postCompany),
         loadData,
@@ -571,7 +571,9 @@ export default defineComponent(
         professionChange,
         companyChange,
         salaryChange,
-        trailSalaryChange
+        trailSalaryChange,
+        isTrailChange,
+        trailMonthsChange
       }
     },
     created() {

vue/src/views/jobUserManager/jobhunt/detail.vue

@@ -4,7 +4,8 @@
     <a-descriptions bordered>
       <a-descriptions-item label="姓名">{{ jobHuntInfo.jobUserName }}</a-descriptions-item>
       <a-descriptions-item label="人才类型">{{ jobHuntInfo.jobUserTypeStr }}</a-descriptions-item>
-      <a-descriptions-item label="月薪要求">{{ jobHuntInfo.minSalary }} 至 {{ jobHuntInfo.maxSalary }}
+      <a-descriptions-item label="月薪要求">
+        {{ showSalary(jobHuntInfo.minSalary, jobHuntInfo.maxSalary) }}
       </a-descriptions-item>
       <a-descriptions-item label="工作年限">{{ jobHuntInfo.workYear }}</a-descriptions-item>
       <a-descriptions-item label="求职类型">{{ jobHuntInfo.jobHuntTypeStr }}</a-descriptions-item>
@@ -57,6 +58,22 @@ function loadData(id: string) {
   });
 }
 
+const showSalary = (minSalary: any, maxSalary: any) => {
+  if (minSalary != null) {
+    if (maxSalary != null) {
+      return minSalary.toString() + "-" + maxSalary.toString();
+    } else {
+      return "≥" + minSalary.toString();
+    }
+  } else {
+    if (maxSalary != null) {
+      return "≤" + maxSalary.toString();
+    } else {
+      return "";
+    }
+  }
+}
+
 // 页面初始化
 onMounted(() => {
   const id = history.state.params?.id;

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

@@ -263,13 +263,6 @@ export default defineComponent({
     };
 
     function salaryChange() {
-      if (!formData.dataModel.minSalary) {
-        formData.dataModel.minSalary = 0;
-      }
-      if (!formData.dataModel.maxSalary) {
-        formData.dataModel.maxSalary = 0;
-      }
-
       if (formData.dataModel.maxSalary < formData.dataModel.minSalary) {
         formData.dataModel.maxSalary = formData.dataModel.minSalary
       }