岗位信息的试用期保存错误处理、基础信息管理各导出功能api地址修改

doc/待更新脚本

@@ -0,0 +1,2 @@
+--2024-02-22
+ALTER TABLE pc_post RENAME COLUMN trailtime TO trailMonths

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

@@ -98,7 +98,7 @@
             <ion-label class="title-item">试用期(月)</ion-label>
             <ion-item mode="md" >
               <ion-input type="number" placeholder="请输入试用期月数" label-placement="stacked"
-                         v-model="dataModel.trailtime" class="custom">
+                         v-model="dataModel.trailMonths" class="custom">
               </ion-input>
             </ion-item>
             <ion-label class="title-item">试用期月薪(元)</ion-label>
@@ -186,7 +186,7 @@ export default defineComponent({
         minSalary:null,
         maxSalary:null,
         isTrail:null,
-        trailtime:null,
+        trailMonths:null,
         trailMinSalary:null,
         trailMaxSalary:null,
         workYear:null,

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

@@ -101,10 +101,10 @@
                 </ion-datetime>
               </ion-modal>
             </ion-item>
-            <ion-label class="title-item">其他要求</ion-label>
+            <ion-label class="title-item">其他信息</ion-label>
             <ion-item>
               <ion-textarea name="areaWork" id="otherDemand" style="text-align: left;" class="custom"  rows="4"
-                         placeholder="请输入其他要求" v-model="dataModel.otherDemand" ></ion-textarea>
+                         placeholder="请输入其他信息" v-model="dataModel.otherDemand" ></ion-textarea>
             </ion-item>
           </ion-item-group>
         </ion-list>

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

@@ -42,7 +42,7 @@ public class PcPost {
 
     private Boolean isTrail;
 
-    private Integer trailtime;
+    private Integer trailMonths;
 
     private BigDecimal trailMaxSalary;
 
@@ -218,12 +218,12 @@ public class PcPost {
         this.isTrail = isTrail;
     }
 
-    public Integer getTrailtime() {
-        return trailtime;
+    public Integer getTrailMonths() {
+        return trailMonths;
     }
 
-    public void setTrailtime(Integer trailtime) {
-        this.trailtime = trailtime;
+    public void setTrailMonths(Integer trailMonths) {
+        this.trailMonths = trailMonths;
     }
 
     public BigDecimal getTrailMaxSalary() {

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

@@ -1346,63 +1346,63 @@ public class PcPostExample {
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeIsNull() {
-            addCriterion("Trailtime is null");
+        public Criteria andTrailMonthsIsNull() {
+            addCriterion("TrailMonths is null");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeIsNotNull() {
-            addCriterion("Trailtime is not null");
+        public Criteria andTrailMonthsIsNotNull() {
+            addCriterion("TrailMonths is not null");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeEqualTo(Integer value) {
-            addCriterion("Trailtime =", value, "trailtime");
+        public Criteria andTrailMonthsEqualTo(Integer value) {
+            addCriterion("TrailMonths =", value, "trailMonths");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeNotEqualTo(Integer value) {
-            addCriterion("Trailtime <>", value, "trailtime");
+        public Criteria andTrailMonthsNotEqualTo(Integer value) {
+            addCriterion("TrailMonths <>", value, "trailMonths");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeGreaterThan(Integer value) {
-            addCriterion("Trailtime >", value, "trailtime");
+        public Criteria andTrailMonthsGreaterThan(Integer value) {
+            addCriterion("TrailMonths >", value, "trailMonths");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeGreaterThanOrEqualTo(Integer value) {
-            addCriterion("Trailtime >=", value, "trailtime");
+        public Criteria andTrailMonthsGreaterThanOrEqualTo(Integer value) {
+            addCriterion("TrailMonths >=", value, "trailMonths");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeLessThan(Integer value) {
-            addCriterion("Trailtime <", value, "trailtime");
+        public Criteria andTrailMonthsLessThan(Integer value) {
+            addCriterion("TrailMonths <", value, "trailMonths");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeLessThanOrEqualTo(Integer value) {
-            addCriterion("Trailtime <=", value, "trailtime");
+        public Criteria andTrailMonthsLessThanOrEqualTo(Integer value) {
+            addCriterion("TrailMonths <=", value, "trailMonths");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeIn(List<Integer> values) {
-            addCriterion("Trailtime in", values, "trailtime");
+        public Criteria andTrailMonthsIn(List<Integer> values) {
+            addCriterion("TrailMonths in", values, "trailMonths");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeNotIn(List<Integer> values) {
-            addCriterion("Trailtime not in", values, "trailtime");
+        public Criteria andTrailMonthsNotIn(List<Integer> values) {
+            addCriterion("TrailMonths not in", values, "trailMonths");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeBetween(Integer value1, Integer value2) {
-            addCriterion("Trailtime between", value1, value2, "trailtime");
+        public Criteria andTrailMonthsBetween(Integer value1, Integer value2) {
+            addCriterion("TrailMonths between", value1, value2, "trailMonths");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeNotBetween(Integer value1, Integer value2) {
-            addCriterion("Trailtime not between", value1, value2, "trailtime");
+        public Criteria andTrailMonthsNotBetween(Integer value1, Integer value2) {
+            addCriterion("TrailMonths not between", value1, value2, "trailMonths");
             return (Criteria) this;
         }
 

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

@@ -130,7 +130,7 @@ public class PostServiceImpl implements PostService {
             dbData.setPostEmail(data.getPostEmail());
             dbData.setWorkTime(data.getWorkTime());
             dbData.setIsTrail(data.getIsTrail());
-            dbData.setTrailtime(data.getTrailtime());
+            dbData.setTrailMonths(data.getTrailMonths());
             dbData.setTrailMaxSalary(data.getTrailMaxSalary());
             dbData.setTrailMinSalary(data.getTrailMinSalary());
             dbData.setCreateTime(new Date());
@@ -161,7 +161,7 @@ public class PostServiceImpl implements PostService {
             dbData.setPostEmail(data.getPostEmail());
             dbData.setWorkTime(data.getWorkTime());
             dbData.setIsTrail(data.getIsTrail());
-            dbData.setTrailtime(data.getTrailtime());
+            dbData.setTrailMonths(data.getTrailMonths());
             dbData.setTrailMaxSalary(data.getTrailMaxSalary());
             dbData.setTrailMinSalary(data.getTrailMinSalary());
             dbData.setModifyTime(new Date());

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

@@ -52,7 +52,7 @@ public class PostVo {
 
     public Boolean isTrail;
 
-    public Integer trailtime;
+    public Integer trailMonths;
 
     public BigDecimal trailMaxSalary;
 

src/main/resources/mapping/PcPostMapper.xml

@@ -21,7 +21,7 @@
     <result column="PostEmail" jdbcType="VARCHAR" property="postEmail" />
     <result column="WorkTime" jdbcType="INTEGER" property="workTime" />
     <result column="IsTrail" jdbcType="BIT" property="isTrail" />
-    <result column="Trailtime" jdbcType="INTEGER" property="trailtime" />
+    <result column="TrailMonths" jdbcType="INTEGER" property="trailMonths" />
     <result column="TrailMaxSalary" jdbcType="DECIMAL" property="trailMaxSalary" />
     <result column="TrailMinSalary" jdbcType="DECIMAL" property="trailMinSalary" />
     <result column="CreateUserID" jdbcType="VARCHAR" property="createUserID" />
@@ -97,7 +97,7 @@
   <sql id="Base_Column_List">
     PostID, WorkCode, WorkName, RecruitCount, CompanyID, PostName, RecordStatus, WorkNature, 
     ValidDay, WorkYear, CultureRank, MaxSalary, MinSalary, Welfare, UserName, UserMobile, 
-    PostEmail, WorkTime, IsTrail, Trailtime, TrailMaxSalary, TrailMinSalary, CreateUserID, 
+    PostEmail, WorkTime, IsTrail, TrailMonths, TrailMaxSalary, TrailMinSalary, CreateUserID, 
     CreateTime, ModifyUserID, ModifyTime, ValidTime, StartTime, EndTime, JobPlace
   </sql>
   <sql id="Blob_Column_List">
@@ -158,7 +158,7 @@
       WorkYear, CultureRank, MaxSalary, 
       MinSalary, Welfare, UserName, 
       UserMobile, PostEmail, WorkTime, 
-      IsTrail, Trailtime, TrailMaxSalary, 
+      IsTrail, TrailMonths, TrailMaxSalary, 
       TrailMinSalary, CreateUserID, CreateTime, 
       ModifyUserID, ModifyTime, ValidTime, 
       StartTime, EndTime, JobPlace, 
@@ -169,7 +169,7 @@
       #{workYear,jdbcType=INTEGER}, #{cultureRank,jdbcType=INTEGER}, #{maxSalary,jdbcType=DECIMAL}, 
       #{minSalary,jdbcType=DECIMAL}, #{welfare,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 
       #{userMobile,jdbcType=VARCHAR}, #{postEmail,jdbcType=VARCHAR}, #{workTime,jdbcType=INTEGER}, 
-      #{isTrail,jdbcType=BIT}, #{trailtime,jdbcType=INTEGER}, #{trailMaxSalary,jdbcType=DECIMAL}, 
+      #{isTrail,jdbcType=BIT}, #{trailMonths,jdbcType=INTEGER}, #{trailMaxSalary,jdbcType=DECIMAL}, 
       #{trailMinSalary,jdbcType=DECIMAL}, #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{validTime,jdbcType=TIMESTAMP}, 
       #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{jobPlace,jdbcType=VARCHAR}, 
@@ -235,8 +235,8 @@
       <if test="isTrail != null">
         IsTrail,
       </if>
-      <if test="trailtime != null">
-        Trailtime,
+      <if test="trailMonths != null">
+        TrailMonths,
       </if>
       <if test="trailMaxSalary != null">
         TrailMaxSalary,
@@ -330,8 +330,8 @@
       <if test="isTrail != null">
         #{isTrail,jdbcType=BIT},
       </if>
-      <if test="trailtime != null">
-        #{trailtime,jdbcType=INTEGER},
+      <if test="trailMonths != null">
+        #{trailMonths,jdbcType=INTEGER},
       </if>
       <if test="trailMaxSalary != null">
         #{trailMaxSalary,jdbcType=DECIMAL},
@@ -434,8 +434,8 @@
       <if test="row.isTrail != null">
         IsTrail = #{row.isTrail,jdbcType=BIT},
       </if>
-      <if test="row.trailtime != null">
-        Trailtime = #{row.trailtime,jdbcType=INTEGER},
+      <if test="row.trailMonths != null">
+        TrailMonths = #{row.trailMonths,jdbcType=INTEGER},
       </if>
       <if test="row.trailMaxSalary != null">
         TrailMaxSalary = #{row.trailMaxSalary,jdbcType=DECIMAL},
@@ -496,7 +496,7 @@
       PostEmail = #{row.postEmail,jdbcType=VARCHAR},
       WorkTime = #{row.workTime,jdbcType=INTEGER},
       IsTrail = #{row.isTrail,jdbcType=BIT},
-      Trailtime = #{row.trailtime,jdbcType=INTEGER},
+      TrailMonths = #{row.trailMonths,jdbcType=INTEGER},
       TrailMaxSalary = #{row.trailMaxSalary,jdbcType=DECIMAL},
       TrailMinSalary = #{row.trailMinSalary,jdbcType=DECIMAL},
       CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
@@ -533,7 +533,7 @@
       PostEmail = #{row.postEmail,jdbcType=VARCHAR},
       WorkTime = #{row.workTime,jdbcType=INTEGER},
       IsTrail = #{row.isTrail,jdbcType=BIT},
-      Trailtime = #{row.trailtime,jdbcType=INTEGER},
+      TrailMonths = #{row.trailMonths,jdbcType=INTEGER},
       TrailMaxSalary = #{row.trailMaxSalary,jdbcType=DECIMAL},
       TrailMinSalary = #{row.trailMinSalary,jdbcType=DECIMAL},
       CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
@@ -605,8 +605,8 @@
       <if test="isTrail != null">
         IsTrail = #{isTrail,jdbcType=BIT},
       </if>
-      <if test="trailtime != null">
-        Trailtime = #{trailtime,jdbcType=INTEGER},
+      <if test="trailMonths != null">
+        TrailMonths = #{trailMonths,jdbcType=INTEGER},
       </if>
       <if test="trailMaxSalary != null">
         TrailMaxSalary = #{trailMaxSalary,jdbcType=DECIMAL},
@@ -664,7 +664,7 @@
       PostEmail = #{postEmail,jdbcType=VARCHAR},
       WorkTime = #{workTime,jdbcType=INTEGER},
       IsTrail = #{isTrail,jdbcType=BIT},
-      Trailtime = #{trailtime,jdbcType=INTEGER},
+      TrailMonths = #{trailMonths,jdbcType=INTEGER},
       TrailMaxSalary = #{trailMaxSalary,jdbcType=DECIMAL},
       TrailMinSalary = #{trailMinSalary,jdbcType=DECIMAL},
       CreateUserID = #{createUserID,jdbcType=VARCHAR},
@@ -698,7 +698,7 @@
       PostEmail = #{postEmail,jdbcType=VARCHAR},
       WorkTime = #{workTime,jdbcType=INTEGER},
       IsTrail = #{isTrail,jdbcType=BIT},
-      Trailtime = #{trailtime,jdbcType=INTEGER},
+      TrailMonths = #{trailMonths,jdbcType=INTEGER},
       TrailMaxSalary = #{trailMaxSalary,jdbcType=DECIMAL},
       TrailMinSalary = #{trailMinSalary,jdbcType=DECIMAL},
       CreateUserID = #{createUserID,jdbcType=VARCHAR},

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

@@ -3,9 +3,9 @@
 <mapper namespace="com.hz.employmentsite.mapper.cquery.PostCQuery">
     <select id="selectPostList" resultType="com.hz.employmentsite.vo.companyService.PostVo">
         select post.postID,post.workCode,post.workName,post.recruitCount,post.companyID,post.postName,post.recordStatus,post.workNature,post.validDay,
-               post.workYear,post.cultureRank,post.postDesc,post.maxSalary,post.minSalary,post.welfare,post.postEmail,post.workTime,post.isTrail,post.TrailMaxSalary,
-               post.trailMinSalary,post.createUserID,post.createTime,post.modifyUserID,post.modifyTime,post.validTime,post.startTime,post.endTime,post.jobPlace,
-               company.userName,company.userMobile,company.companyEmail,company.CompanyName,company.insuredCount,item.`Name` as cultureLevelName from pc_post post
+               post.workYear,post.cultureRank,post.postDesc,post.maxSalary,post.minSalary,post.welfare,post.postEmail,post.workTime,post.isTrail,post.trailMonths,
+               post.TrailMaxSalary,post.trailMinSalary,post.createUserID,post.createTime,post.modifyUserID,post.modifyTime,post.validTime,post.startTime,post.endTime,
+               post.jobPlace,company.userName,company.userMobile,company.companyEmail,company.CompanyName,company.insuredCount,item.`Name` as cultureLevelName from pc_post post
         left join pc_company company on post.CompanyID = company.CompanyID
         left join sys_dictionary_item item on item.value=post.CultureRank and item.DictionaryCode='CultureLevel'
         where 1=1

vue/src/views/baseSettings/institution/index.vue

@@ -34,7 +34,7 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit" functioncode="T01010102" @click='onAdd' >新增</a-button>
-          <BExportExcel :title="'导出'"   :filename="'运营机构信息'" :url="'/institution/export'" :params="{...searchParams, rows:100000,institutionIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
+          <BExportExcel :title="'导出'"   :filename="'运营机构信息'" :url="'institution/export'" :params="{...searchParams, rows:100000,institutionIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>

vue/src/views/baseSettings/siteInfo/index.vue

@@ -80,7 +80,7 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit"  functioncode="T01010202" @click='onAdd' >新增</a-button>
-          <BExportExcel :title="'导出'" :filename="'驿站站点信息'" :url="'/siteInfo/export'" :params="{...searchParams, rows:100000,siteIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
+          <BExportExcel :title="'导出'" :filename="'驿站站点信息'" :url="'siteInfo/export'" :params="{...searchParams, rows:100000,siteIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>

vue/src/views/baseSettings/siteUser/index.vue

@@ -39,7 +39,7 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit" functioncode="T01010302" @click='onAdd' >新增</a-button>
-          <BExportExcel :title="'导出'" :filename="'驿站人员信息'" :url="'/userInfo/export'" :params="{...searchParams, rows:100000,siteUserIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
+          <BExportExcel :title="'导出'" :filename="'驿站人员信息'" :url="'userInfo/export'" :params="{...searchParams, rows:100000,siteUserIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>
         </a-col>
       </a-row>
     </a-form>

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

@@ -110,10 +110,10 @@
             <a-form-item
               label="试用期(月)"
               :label-col="{ span: 7 }"
-              name="trailtime"
+              name="trailMonths"
               :rules="[{ required: false, message: '请选择试用期时长!' }]"
             >
-              <a-input v-model:value="item.trailtime" placeholder=""/>
+              <a-input v-model:value="item.trailMonths" placeholder=""/>
             </a-form-item>
           </a-col>
         </a-row>
@@ -223,7 +223,7 @@ interface postModel {
   userMobile: string | null,
   postEmail: string | null,
   isTrail: number | null,
-  trailtime: string | null,
+  trailMonths: string | null,
   trailMaxSalary: number | null,
   trailMinSalary: number | null,
   workYear: number | null,

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

@@ -89,7 +89,7 @@
       <a-divider orientation="left">其他信息</a-divider>
       <a-row>
         <a-textarea name="otherDemand" :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.otherDemand" :disabled="opCategory==3"
-                    placeholder="其他要求"  />
+                    placeholder="其他信息"  />
       </a-row>
       <a-form-item class="buttom-btns">
         <a-button @click="onClose">取消</a-button>