Merge remote-tracking branch 'origin/master'

h5app/src/views/pages/user/myInfo.vue

@@ -9,28 +9,28 @@
       </ion-toolbar>
     </ion-header>
     <ion-content>
-      <form class="form-table">
-        <ion-item>
+      <div class="bw-vue-form">
+        <div class="form-detail">
           <ion-label>登录名</ion-label>
           <ion-text>{{ userInfo.loginID }}</ion-text>
-        </ion-item>
-        <ion-item>
+        </div>
+        <div class="form-detail">
           <ion-label>姓名</ion-label>
           <ion-text>{{ userInfo.siteUserName }}</ion-text>
-        </ion-item>
-        <ion-item>
+        </div>
+        <div class="form-detail">
           <ion-label>性别</ion-label>
           <ion-text>{{ userInfo.genderName }}</ion-text>
-        </ion-item>
-        <ion-item>
+        </div>
+        <div class="form-detail">
           <ion-label>人员类别</ion-label>
           <ion-text>{{ userInfo.userTypeName }}</ion-text>
-        </ion-item>
-        <ion-item>
-        <ion-label>电话号码</ion-label>
+        </div>
+        <div class="form-detail">
+          <ion-label>电话号码</ion-label>
           <ion-text>{{ userInfo.userMobile }}</ion-text>
-        </ion-item>
-      </form>
+        </div>
+      </div>
     </ion-content>
 
   </ion-page>

h5app/src/views/pages/user/updatePassword.vue

@@ -9,27 +9,33 @@
       </ion-toolbar>
     </ion-header>
     <ion-content>
-      <form class="form-table">
-        <ion-item>
+      <div class="bw-vue-form">
+        <div class="form-detail">
           <ion-label>用户名</ion-label>
           <ion-text>{{ dataModel.userName }}</ion-text>
-        </ion-item>
-        <ion-item>
-          <ion-label>帐号</ion-label>
+        </div>
+        <div class="form-detail">
+          <ion-label>姓名</ion-label>
           <ion-text>{{ dataModel.loginID }}</ion-text>
-        </ion-item>
-        <ion-item :class="[v$.pwd_default.$error?'ion-invalid':'ion-valid']">
-          <ion-label>新密码</ion-label>
-          <ion-input v-model="dataModel.pwd_default" name="pwd_default"
-                     placeholder="请填写8到16位新密码" type="password"></ion-input>
-          <ion-note slot="error">密码必须包含字母、数字和特殊字符，且长度要在8到16位。</ion-note>
-        </ion-item>
-        <ion-item :class="[v$.pwd_confirm.$error?'ion-invalid':'ion-valid']">
-          <ion-label>确认新密码</ion-label>
-          <ion-input v-model="dataModel.pwd_confirm" name="pwd_confirm"
-                     placeholder="请填写8到16位新密码" type="password"></ion-input>
-          <ion-note slot="error">密码必须包含字母、数字和特殊字符，且长度要在8到16位。</ion-note>
-        </ion-item>
+        </div>
+      </div>
+      <form class="form-table">
+        <div class="bw-vue-form">
+          <div class="form-input">
+            <ion-label>新密码</ion-label>
+            <ion-input v-model="dataModel.pwd_default" name="pwd_default"
+                       placeholder="请填写8到16位新密码" type="password"></ion-input>
+            <ion-note style="color: #f50909" v-if="v$.pwd_default.$error" slot="error">密码必须包含字母、数字和特殊字符，且长度要在8到16位。
+            </ion-note>
+          </div>
+          <div class="form-input">
+            <ion-label>确认新密码</ion-label>
+            <ion-input v-model="dataModel.pwd_confirm" name="pwd_confirm"
+                       placeholder="请填写8到16位新密码" type="password"></ion-input>
+            <ion-note style="color: #f50909" v-if="v$.pwd_confirm.$error" slot="error">密码必须包含字母、数字和特殊字符，且长度要在8到16位。
+            </ion-note>
+          </div>
+        </div>
       </form>
     </ion-content>
     <ion-footer>
@@ -70,6 +76,8 @@ const v$ = useVuelidate(rules, dataModel);
 const onSave = async () => {
   const isFormCorrect = await v$.value.$validate();
 
+  console.log(isFormCorrect)
+
   if (!isFormCorrect) {
     return null;
   }

h5app/src/views/pages/work/log/list.vue

@@ -13,7 +13,6 @@
     </ion-header>
     <ion-content>
       <ion-item style="font-size: 10px;--border-style: none;">
-        <label>日期：</label>
         <ion-datetime-button datetime="reportDateBegin"></ion-datetime-button>
         <span style="margin:0 5px">至</span>
         <ion-modal :keep-contents-mounted="true">
@@ -36,9 +35,9 @@
         <ion-button slot="end" style="height: 33px;width:70px;margin-left: 10px;--box-shadow: none;--border-radius: 14px;" @click="onSearch">搜索</ion-button>
       </ion-item>
       <!-- 滑动数据列表 -->
-      <div class="panel-content" v-if="!loading">
-        <div v-for="(record,key) in dataList" :key="key" style="border: 1px solid rgb(242, 242, 245); margin: 10px; border-radius: 10px">
-          <ion-item-sliding>
+      <div v-if="!loading" class="bw-vue-list">
+        <div v-for="(record,key) in dataList" :key="key">
+          <ion-item-sliding style="border-bottom: 1px solid #f1f5f7;border-radius: 0px;">
             <ion-item>
               <ion-grid @click="onDetail(record.doWorkID)">
                 <ion-row>
@@ -64,7 +63,6 @@
                 <ion-icon :icon="chevronForwardOutline" slots="end"></ion-icon>
               </span>
             </ion-item>
-
             <ion-item-options>
               <ion-item-option @click="onEdit(record.doWorkID)">
                 <ion-icon :icon="buildOutline"></ion-icon>

h5app/src/views/pages/work/task/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <ion-page class="list-page task-list-page" >
+  <ion-page class="list-page">
     <ion-header class="header-theme2">
       <ion-toolbar>
         <ion-buttons slot="start">
@@ -17,24 +17,29 @@
                    v-model="searchParamsState.taskName" style="border: 1px solid #f2f2f5;border-radius: 14px;--padding-start: 10px;height: 35px;" ></ion-input>
         <ion-button slot="end" style="height: 33px;width: 70px;margin-left: 10px;--box-shadow: none;--border-radius: 14px;" @click="reload">搜索</ion-button>
       </ion-item>
-      <ion-list class="list-content" >
-        <ion-item v-for="(record,key) in dataList" :key="key" detail @click="onDetail(record)">
-          <ion-label>
-            <h3>{{ record.doTaskName}}</h3>
-            <p style="margin-top: 8px">任务类型：{{ record.workTypeName }}</p>
-            <p>
-              要求完成时间：{{ dayjs(record.finishTime).format("YYYY-MM-DD") }}
-            </p>
-            <p v-if="record.taskStatus == 1 && record.completeTime">
-              任务完成时间：{{ dayjs(record.completeTime).format("YYYY-MM-DD") }}
-            </p>
-          </ion-label>
-          <ion-avatar aria-hidden="true" slot="end">
-            <p>{{ record.taskStatusName}}</p>
-
-          </ion-avatar>
-        </ion-item>
-      </ion-list>
+      <div class="bw-vue-list">
+        <div class="list-content">
+          <ion-list>
+            <ion-item v-for="(record,key) in dataList" :key="key" detail @click="onDetail(record)">
+              <ion-label>
+                <div class="multi-title">
+                  <h3>{{ record.doTaskName }}</h3>
+                </div>
+                <p style="margin-top: 8px">任务类型：{{ record.workTypeName }}</p>
+                <p>
+                  要求完成时间：{{ dayjs(record.finishTime).format("YYYY-MM-DD") }}
+                </p>
+                <p v-if="record.taskStatus == 1 && record.completeTime">
+                  任务完成时间：{{ dayjs(record.completeTime).format("YYYY-MM-DD") }}
+                </p>
+              </ion-label>
+              <ion-avatar aria-hidden="true" slot="end">
+                <p style="font-size: 11px; color: #8c8f93">{{ record.taskStatusName }}</p>
+              </ion-avatar>
+            </ion-item>
+          </ion-list>
+        </div>
+      </div>
       <b-empty v-if="dataList.length<=0" :loading="loading"/>
       <ion-infinite-scroll threshold="100px" @ionInfinite="onScroll($event)">
         <ion-infinite-scroll-content

src/main/java/com/hz/employmentsite/AppConfig.java

@@ -79,6 +79,8 @@ public class AppConfig {
     public String wxRedirectURI;
     @Value("${appconfig.wxconfig.accessScope}")
     public String wxAccessScope;
+    @Value("${appconfig.wxconfig.testOpenId}")
+    public String testOpenId;
 
 
 

src/main/java/com/hz/employmentsite/controller/WxController.java

@@ -49,14 +49,14 @@ public class WxController {
     }
 
     @PostMapping("/sentMsg")
-    public BaseResponse<String> sentMsg(){
+    public BaseResponse<String> sentMsg() throws Exception {
         Map<String,String> data = new HashMap<>();
-        data.put("keyword1","巧克力");
-        data.put("keyword2","39.8元");
-        data.put("keyword3","2014年9月22日");
+        data.put("thing28","张三");
+        data.put("phone_number34","134556456456");
+        data.put("thing10","开发");
 
 
-        return RespGenerstor.success(wechatService.sentMsg("admin",data,""));
+        return RespGenerstor.success(wechatService.sentMsg("admin",data,"http://www.bowintek.com/hzyz/mobile/index.html/#/jobUserInfo/index?userId=60ea0d5b-a75c-11ed-a6c5-7085c2a9999e"));
     }
 
 }

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

@@ -6,6 +6,7 @@ import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.jobUserManager.JobHuntService;
+import com.hz.employmentsite.util.DateUtils;
 import com.hz.employmentsite.util.ExcelHelper;
 import com.hz.employmentsite.vo.jobUserManager.JobHuntVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,13 +28,16 @@ public class JobHuntController {
     @Autowired
     private ExcelHelper excelHelper;
 
+    @Autowired
+    private DateUtils dataUtils;
+
     @ResponseBody
     @GetMapping("/getList")
     public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
                                     @RequestParam(required = false) List<String> jobHuntIDList,
                                     @RequestParam(required = false) String jobUserID,
                                     @RequestParam(required = false) String jobUserName,
-                                    @RequestParam(required = false) String workName,
+                                    @RequestParam(required = false) String professionName,
                                     @RequestParam(required = false) Integer minWorkYear,
                                     @RequestParam(required = false) Integer maxWorkYear,
                                     @RequestParam(required = false) Integer jobHuntTypeID,
@@ -42,7 +46,7 @@ public class JobHuntController {
                                     @RequestParam(required = false) BigDecimal maxSalary,
                                     @RequestParam(required = false) Integer isAccomplish) {
 
-        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize,jobHuntIDList,jobUserID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
+        PageInfo<JobHuntVo> result = jobhuntService.getList(pageIndex, pageSize,jobHuntIDList,jobUserID,jobUserName,professionName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
         return RespGenerstor.success(result);
     }
 
@@ -98,7 +102,7 @@ public class JobHuntController {
             row.add(i);
             row.add(item.jobUserName);
             row.add(item.areaWork);
-            row.add(item.inDate);
+            row.add(dataUtils.dateToStrFormat(item.inDate,"yyyy-MM-dd"));
             row.add(item.workYear);
             row.add(item.jobHuntTypeStr);
             row.add(item.jobUserTypeStr);

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

@@ -29,9 +29,9 @@ public class RecommendMgtController {
     public BaseResponse getList(@RequestParam("page") int pageIndex, @RequestParam("limit") int pageSize,
                                 @RequestParam(required = false) String name, @RequestParam(required = false) String companyName,
                                 @RequestParam(required = false) Integer recommendType, @RequestParam(required = false) Integer entryState,
-                                @RequestParam(required = false) String pushName, @RequestParam(required = false) String professionID) {
+                                @RequestParam(required = false) String pushName, @RequestParam(required = false) String professionName) {
 
-        PageInfo<RecommendMgtVo> result = recommendMgtService.getList(pageIndex, pageSize, name, companyName, recommendType, entryState, pushName, professionID);
+        PageInfo<RecommendMgtVo> result = recommendMgtService.getList(pageIndex, pageSize, name, companyName, recommendType, entryState, pushName, professionName);
         return RespGenerstor.success(result);
     }
 

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

@@ -0,0 +1,36 @@
+package com.hz.employmentsite.mapper;
+
+import com.hz.employmentsite.model.WxMessagestatus;
+import com.hz.employmentsite.model.WxMessagestatusExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface WxMessagestatusMapper {
+    long countByExample(WxMessagestatusExample example);
+
+    int deleteByExample(WxMessagestatusExample example);
+
+    int deleteByPrimaryKey(String messageStatus);
+
+    int insert(WxMessagestatus row);
+
+    int insertSelective(WxMessagestatus row);
+
+    List<WxMessagestatus> selectByExampleWithBLOBs(WxMessagestatusExample example);
+
+    List<WxMessagestatus> selectByExample(WxMessagestatusExample example);
+
+    WxMessagestatus selectByPrimaryKey(String messageStatus);
+
+    int updateByExampleSelective(@Param("row") WxMessagestatus row, @Param("example") WxMessagestatusExample example);
+
+    int updateByExampleWithBLOBs(@Param("row") WxMessagestatus row, @Param("example") WxMessagestatusExample example);
+
+    int updateByExample(@Param("row") WxMessagestatus row, @Param("example") WxMessagestatusExample example);
+
+    int updateByPrimaryKeySelective(WxMessagestatus row);
+
+    int updateByPrimaryKeyWithBLOBs(WxMessagestatus row);
+
+    int updateByPrimaryKey(WxMessagestatus row);
+}

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

@@ -7,7 +7,7 @@ import java.util.List;
 
 public interface JobHuntCQuery {
     List<JobHuntVo> getJobHuntList(@Param("jobHuntIDList") String jobHuntIDList,@Param("jobUserID") String jobUserID,
-                                      @Param("jobUserName") String jobUserName,@Param("workName") String workName,
+                                      @Param("jobUserName") String jobUserName,@Param("professionName") String professionName,
                                       @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/mapper/cquery/RecommendMgtCQuery.java

@@ -14,7 +14,7 @@ public interface RecommendMgtCQuery {
                                              @Param("recommendType") Integer recommendType,
                                              @Param("entryState") Integer entryState,
                                              @Param("pushName") String pushName,
-                                             @Param("professionID") String professionID);
+                                             @Param("professionName") String professionName);
 
     /**
      * 获取推荐企业信息

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

@@ -51,6 +51,8 @@ public class PcCompany {
 
     private String latitude;
 
+    private String openId;
+
     public String getCompanyID() {
         return companyID;
     }
@@ -242,4 +244,12 @@ public class PcCompany {
     public void setLatitude(String latitude) {
         this.latitude = latitude == null ? null : latitude.trim();
     }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId == null ? null : openId.trim();
+    }
 }

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

@@ -1714,6 +1714,76 @@ public class PcCompanyExample {
             addCriterion("Latitude not between", value1, value2, "latitude");
             return (Criteria) this;
         }
+
+        public Criteria andOpenIdIsNull() {
+            addCriterion("openId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdIsNotNull() {
+            addCriterion("openId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdEqualTo(String value) {
+            addCriterion("openId =", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdNotEqualTo(String value) {
+            addCriterion("openId <>", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdGreaterThan(String value) {
+            addCriterion("openId >", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdGreaterThanOrEqualTo(String value) {
+            addCriterion("openId >=", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdLessThan(String value) {
+            addCriterion("openId <", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdLessThanOrEqualTo(String value) {
+            addCriterion("openId <=", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdLike(String value) {
+            addCriterion("openId like", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdNotLike(String value) {
+            addCriterion("openId not like", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdIn(List<String> values) {
+            addCriterion("openId in", values, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdNotIn(List<String> values) {
+            addCriterion("openId not in", values, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdBetween(String value1, String value2) {
+            addCriterion("openId between", value1, value2, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdNotBetween(String value1, String value2) {
+            addCriterion("openId not between", value1, value2, "openId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -75,6 +75,8 @@ public class PcJobuser {
 
     private Date modifyTime;
 
+    private String openId;
+
     public String getJobuserID() {
         return jobuserID;
     }
@@ -362,4 +364,12 @@ public class PcJobuser {
     public void setModifyTime(Date modifyTime) {
         this.modifyTime = modifyTime;
     }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId == null ? null : openId.trim();
+    }
 }

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

@@ -2504,6 +2504,76 @@ public class PcJobuserExample {
             addCriterion("ModifyTime not between", value1, value2, "modifyTime");
             return (Criteria) this;
         }
+
+        public Criteria andOpenIdIsNull() {
+            addCriterion("openId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdIsNotNull() {
+            addCriterion("openId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdEqualTo(String value) {
+            addCriterion("openId =", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdNotEqualTo(String value) {
+            addCriterion("openId <>", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdGreaterThan(String value) {
+            addCriterion("openId >", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdGreaterThanOrEqualTo(String value) {
+            addCriterion("openId >=", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdLessThan(String value) {
+            addCriterion("openId <", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdLessThanOrEqualTo(String value) {
+            addCriterion("openId <=", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdLike(String value) {
+            addCriterion("openId like", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdNotLike(String value) {
+            addCriterion("openId not like", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdIn(List<String> values) {
+            addCriterion("openId in", values, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdNotIn(List<String> values) {
+            addCriterion("openId not in", values, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdBetween(String value1, String value2) {
+            addCriterion("openId between", value1, value2, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdNotBetween(String value1, String value2) {
+            addCriterion("openId not between", value1, value2, "openId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -27,6 +27,10 @@ public class PcRecommendMgt {
 
     private Date modifyTime;
 
+    private Boolean isSendCompany;
+
+    private Boolean isSendUser;
+
     public String getRecommendMgtID() {
         return recommendMgtID;
     }
@@ -122,4 +126,20 @@ public class PcRecommendMgt {
     public void setModifyTime(Date modifyTime) {
         this.modifyTime = modifyTime;
     }
+
+    public Boolean getIsSendCompany() {
+        return isSendCompany;
+    }
+
+    public void setIsSendCompany(Boolean isSendCompany) {
+        this.isSendCompany = isSendCompany;
+    }
+
+    public Boolean getIsSendUser() {
+        return isSendUser;
+    }
+
+    public void setIsSendUser(Boolean isSendUser) {
+        this.isSendUser = isSendUser;
+    }
 }

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

@@ -884,6 +884,126 @@ public class PcRecommendMgtExample {
             addCriterion("ModifyTime not between", value1, value2, "modifyTime");
             return (Criteria) this;
         }
+
+        public Criteria andIsSendCompanyIsNull() {
+            addCriterion("isSendCompany is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendCompanyIsNotNull() {
+            addCriterion("isSendCompany is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendCompanyEqualTo(Boolean value) {
+            addCriterion("isSendCompany =", value, "isSendCompany");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendCompanyNotEqualTo(Boolean value) {
+            addCriterion("isSendCompany <>", value, "isSendCompany");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendCompanyGreaterThan(Boolean value) {
+            addCriterion("isSendCompany >", value, "isSendCompany");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendCompanyGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("isSendCompany >=", value, "isSendCompany");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendCompanyLessThan(Boolean value) {
+            addCriterion("isSendCompany <", value, "isSendCompany");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendCompanyLessThanOrEqualTo(Boolean value) {
+            addCriterion("isSendCompany <=", value, "isSendCompany");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendCompanyIn(List<Boolean> values) {
+            addCriterion("isSendCompany in", values, "isSendCompany");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendCompanyNotIn(List<Boolean> values) {
+            addCriterion("isSendCompany not in", values, "isSendCompany");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendCompanyBetween(Boolean value1, Boolean value2) {
+            addCriterion("isSendCompany between", value1, value2, "isSendCompany");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendCompanyNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("isSendCompany not between", value1, value2, "isSendCompany");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendUserIsNull() {
+            addCriterion("isSendUser is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendUserIsNotNull() {
+            addCriterion("isSendUser is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendUserEqualTo(Boolean value) {
+            addCriterion("isSendUser =", value, "isSendUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendUserNotEqualTo(Boolean value) {
+            addCriterion("isSendUser <>", value, "isSendUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendUserGreaterThan(Boolean value) {
+            addCriterion("isSendUser >", value, "isSendUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendUserGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("isSendUser >=", value, "isSendUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendUserLessThan(Boolean value) {
+            addCriterion("isSendUser <", value, "isSendUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendUserLessThanOrEqualTo(Boolean value) {
+            addCriterion("isSendUser <=", value, "isSendUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendUserIn(List<Boolean> values) {
+            addCriterion("isSendUser in", values, "isSendUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendUserNotIn(List<Boolean> values) {
+            addCriterion("isSendUser not in", values, "isSendUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendUserBetween(Boolean value1, Boolean value2) {
+            addCriterion("isSendUser between", value1, value2, "isSendUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsSendUserNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("isSendUser not between", value1, value2, "isSendUser");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -0,0 +1,105 @@
+package com.hz.employmentsite.model;
+
+import java.util.Date;
+
+public class WxMessagestatus {
+    private String messageStatus;
+
+    private String openId;
+
+    private String sourceId;
+
+    private Date sendTime;
+
+    private Integer recordStatus;
+
+    private String createUserID;
+
+    private Date createTime;
+
+    private String modifyUserID;
+
+    private Date modifyTime;
+
+    private String content;
+
+    public String getMessageStatus() {
+        return messageStatus;
+    }
+
+    public void setMessageStatus(String messageStatus) {
+        this.messageStatus = messageStatus == null ? null : messageStatus.trim();
+    }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId == null ? null : openId.trim();
+    }
+
+    public String getSourceId() {
+        return sourceId;
+    }
+
+    public void setSourceId(String sourceId) {
+        this.sourceId = sourceId == null ? null : sourceId.trim();
+    }
+
+    public Date getSendTime() {
+        return sendTime;
+    }
+
+    public void setSendTime(Date sendTime) {
+        this.sendTime = sendTime;
+    }
+
+    public Integer getRecordStatus() {
+        return recordStatus;
+    }
+
+    public void setRecordStatus(Integer recordStatus) {
+        this.recordStatus = recordStatus;
+    }
+
+    public String getCreateUserID() {
+        return createUserID;
+    }
+
+    public void setCreateUserID(String createUserID) {
+        this.createUserID = createUserID == null ? null : createUserID.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifyUserID() {
+        return modifyUserID;
+    }
+
+    public void setModifyUserID(String modifyUserID) {
+        this.modifyUserID = modifyUserID == null ? null : modifyUserID.trim();
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content == null ? null : content.trim();
+    }
+}

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

@@ -0,0 +1,790 @@
+package com.hz.employmentsite.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class WxMessagestatusExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public WxMessagestatusExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andMessageStatusIsNull() {
+            addCriterion("messageStatus is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageStatusIsNotNull() {
+            addCriterion("messageStatus is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageStatusEqualTo(String value) {
+            addCriterion("messageStatus =", value, "messageStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageStatusNotEqualTo(String value) {
+            addCriterion("messageStatus <>", value, "messageStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageStatusGreaterThan(String value) {
+            addCriterion("messageStatus >", value, "messageStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("messageStatus >=", value, "messageStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageStatusLessThan(String value) {
+            addCriterion("messageStatus <", value, "messageStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageStatusLessThanOrEqualTo(String value) {
+            addCriterion("messageStatus <=", value, "messageStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageStatusLike(String value) {
+            addCriterion("messageStatus like", value, "messageStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageStatusNotLike(String value) {
+            addCriterion("messageStatus not like", value, "messageStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageStatusIn(List<String> values) {
+            addCriterion("messageStatus in", values, "messageStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageStatusNotIn(List<String> values) {
+            addCriterion("messageStatus not in", values, "messageStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageStatusBetween(String value1, String value2) {
+            addCriterion("messageStatus between", value1, value2, "messageStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageStatusNotBetween(String value1, String value2) {
+            addCriterion("messageStatus not between", value1, value2, "messageStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdIsNull() {
+            addCriterion("openId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdIsNotNull() {
+            addCriterion("openId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdEqualTo(String value) {
+            addCriterion("openId =", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdNotEqualTo(String value) {
+            addCriterion("openId <>", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdGreaterThan(String value) {
+            addCriterion("openId >", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdGreaterThanOrEqualTo(String value) {
+            addCriterion("openId >=", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdLessThan(String value) {
+            addCriterion("openId <", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdLessThanOrEqualTo(String value) {
+            addCriterion("openId <=", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdLike(String value) {
+            addCriterion("openId like", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdNotLike(String value) {
+            addCriterion("openId not like", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdIn(List<String> values) {
+            addCriterion("openId in", values, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdNotIn(List<String> values) {
+            addCriterion("openId not in", values, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdBetween(String value1, String value2) {
+            addCriterion("openId between", value1, value2, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdNotBetween(String value1, String value2) {
+            addCriterion("openId not between", value1, value2, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdIsNull() {
+            addCriterion("sourceId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdIsNotNull() {
+            addCriterion("sourceId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdEqualTo(String value) {
+            addCriterion("sourceId =", value, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdNotEqualTo(String value) {
+            addCriterion("sourceId <>", value, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdGreaterThan(String value) {
+            addCriterion("sourceId >", value, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdGreaterThanOrEqualTo(String value) {
+            addCriterion("sourceId >=", value, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdLessThan(String value) {
+            addCriterion("sourceId <", value, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdLessThanOrEqualTo(String value) {
+            addCriterion("sourceId <=", value, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdLike(String value) {
+            addCriterion("sourceId like", value, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdNotLike(String value) {
+            addCriterion("sourceId not like", value, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdIn(List<String> values) {
+            addCriterion("sourceId in", values, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdNotIn(List<String> values) {
+            addCriterion("sourceId not in", values, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdBetween(String value1, String value2) {
+            addCriterion("sourceId between", value1, value2, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdNotBetween(String value1, String value2) {
+            addCriterion("sourceId not between", value1, value2, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeIsNull() {
+            addCriterion("sendTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeIsNotNull() {
+            addCriterion("sendTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeEqualTo(Date value) {
+            addCriterion("sendTime =", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeNotEqualTo(Date value) {
+            addCriterion("sendTime <>", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeGreaterThan(Date value) {
+            addCriterion("sendTime >", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("sendTime >=", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeLessThan(Date value) {
+            addCriterion("sendTime <", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeLessThanOrEqualTo(Date value) {
+            addCriterion("sendTime <=", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeIn(List<Date> values) {
+            addCriterion("sendTime in", values, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeNotIn(List<Date> values) {
+            addCriterion("sendTime not in", values, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeBetween(Date value1, Date value2) {
+            addCriterion("sendTime between", value1, value2, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeNotBetween(Date value1, Date value2) {
+            addCriterion("sendTime not between", value1, value2, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordStatusIsNull() {
+            addCriterion("recordStatus is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordStatusIsNotNull() {
+            addCriterion("recordStatus is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordStatusEqualTo(Integer value) {
+            addCriterion("recordStatus =", value, "recordStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordStatusNotEqualTo(Integer value) {
+            addCriterion("recordStatus <>", value, "recordStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordStatusGreaterThan(Integer value) {
+            addCriterion("recordStatus >", value, "recordStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("recordStatus >=", value, "recordStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordStatusLessThan(Integer value) {
+            addCriterion("recordStatus <", value, "recordStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("recordStatus <=", value, "recordStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordStatusIn(List<Integer> values) {
+            addCriterion("recordStatus in", values, "recordStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordStatusNotIn(List<Integer> values) {
+            addCriterion("recordStatus not in", values, "recordStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordStatusBetween(Integer value1, Integer value2) {
+            addCriterion("recordStatus between", value1, value2, "recordStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecordStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("recordStatus not between", value1, value2, "recordStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDIsNull() {
+            addCriterion("createUserID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDIsNotNull() {
+            addCriterion("createUserID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDEqualTo(String value) {
+            addCriterion("createUserID =", value, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDNotEqualTo(String value) {
+            addCriterion("createUserID <>", value, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDGreaterThan(String value) {
+            addCriterion("createUserID >", value, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDGreaterThanOrEqualTo(String value) {
+            addCriterion("createUserID >=", value, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDLessThan(String value) {
+            addCriterion("createUserID <", value, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDLessThanOrEqualTo(String value) {
+            addCriterion("createUserID <=", value, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDLike(String value) {
+            addCriterion("createUserID like", value, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDNotLike(String value) {
+            addCriterion("createUserID not like", value, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDIn(List<String> values) {
+            addCriterion("createUserID in", values, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDNotIn(List<String> values) {
+            addCriterion("createUserID not in", values, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDBetween(String value1, String value2) {
+            addCriterion("createUserID between", value1, value2, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIDNotBetween(String value1, String value2) {
+            addCriterion("createUserID not between", value1, value2, "createUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("createTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("createTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("createTime =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("createTime <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("createTime >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("createTime >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("createTime <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("createTime <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("createTime in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("createTime not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("createTime between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("createTime not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyUserIDIsNull() {
+            addCriterion("modifyUserID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyUserIDIsNotNull() {
+            addCriterion("modifyUserID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyUserIDEqualTo(String value) {
+            addCriterion("modifyUserID =", value, "modifyUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyUserIDNotEqualTo(String value) {
+            addCriterion("modifyUserID <>", value, "modifyUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyUserIDGreaterThan(String value) {
+            addCriterion("modifyUserID >", value, "modifyUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyUserIDGreaterThanOrEqualTo(String value) {
+            addCriterion("modifyUserID >=", value, "modifyUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyUserIDLessThan(String value) {
+            addCriterion("modifyUserID <", value, "modifyUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyUserIDLessThanOrEqualTo(String value) {
+            addCriterion("modifyUserID <=", value, "modifyUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyUserIDLike(String value) {
+            addCriterion("modifyUserID like", value, "modifyUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyUserIDNotLike(String value) {
+            addCriterion("modifyUserID not like", value, "modifyUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyUserIDIn(List<String> values) {
+            addCriterion("modifyUserID in", values, "modifyUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyUserIDNotIn(List<String> values) {
+            addCriterion("modifyUserID not in", values, "modifyUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyUserIDBetween(String value1, String value2) {
+            addCriterion("modifyUserID between", value1, value2, "modifyUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyUserIDNotBetween(String value1, String value2) {
+            addCriterion("modifyUserID not between", value1, value2, "modifyUserID");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeIsNull() {
+            addCriterion("modifyTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeIsNotNull() {
+            addCriterion("modifyTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeEqualTo(Date value) {
+            addCriterion("modifyTime =", value, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeNotEqualTo(Date value) {
+            addCriterion("modifyTime <>", value, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeGreaterThan(Date value) {
+            addCriterion("modifyTime >", value, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("modifyTime >=", value, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeLessThan(Date value) {
+            addCriterion("modifyTime <", value, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeLessThanOrEqualTo(Date value) {
+            addCriterion("modifyTime <=", value, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeIn(List<Date> values) {
+            addCriterion("modifyTime in", values, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeNotIn(List<Date> values) {
+            addCriterion("modifyTime not in", values, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeBetween(Date value1, Date value2) {
+            addCriterion("modifyTime between", value1, value2, "modifyTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifyTimeNotBetween(Date value1, Date value2) {
+            addCriterion("modifyTime not between", value1, value2, "modifyTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/hz/employmentsite/services/impl/WechatServiceImpl.java

@@ -39,12 +39,16 @@ public class WechatServiceImpl implements WechatService {
 
     @Override
     public String getOpenId(String code) throws WxErrorException {
-        return wxMpService.oauth2getAccessToken(code).getOpenId();
+        String openId = wxMpService.oauth2getAccessToken(code).getOpenId();
+
+        log.info("openId："+ openId);
+
+        return openId;
     }
 
     @Override
-    public Integer sentMsg(String toUserId, Map<String,String> sentData,String url){
-        String openId = "";
+    public Integer sentMsg(String toUserId, Map<String,String> sentData,String url) throws Exception {
+        String openId = appConfig.testOpenId;
 
         //数据
         List<WxMpTemplateData> data=new ArrayList<>();
@@ -66,6 +70,7 @@ public class WechatServiceImpl implements WechatService {
         } catch (Exception e) {
             log.info("sentMsg:微信消息推送失败"+ e.getMessage());
             e.printStackTrace();
+            throw new Exception("sentMsg:微信消息推送失败"+ e.getMessage());
         }
 
         return 1;

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

@@ -43,11 +43,11 @@ public class JobHuntServiceImpl implements JobHuntService {
     private StringUtils stringUtils;
 
     @Override
-    public PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize, List<String> jobHuntIDList,String jobUserID, String jobUserName, String workName,
+    public PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize, List<String> jobHuntIDList,String jobUserID, String jobUserName, String professionName,
                                        Integer minWorkYear, Integer maxWorkYear, Integer jobHuntTypeID, Integer jobUserTypeID,
                                        BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<JobHuntVo> list = jobhuntCQuery.getJobHuntList(stringUtils.ListToInSql(jobHuntIDList),jobUserID,jobUserName,workName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
+        List<JobHuntVo> list = jobhuntCQuery.getJobHuntList(stringUtils.ListToInSql(jobHuntIDList),jobUserID,jobUserName,professionName,minWorkYear, maxWorkYear, jobHuntTypeID, jobUserTypeID, minSalary, maxSalary, isAccomplish);
 
         PageInfo<JobHuntVo> result = new PageInfo(list);
 
@@ -149,8 +149,8 @@ public class JobHuntServiceImpl implements JobHuntService {
                 if (item.jobUserID == null)
                     errorInfo += "求职人员不存在！";
             }
-            if (stringUtils.IsNullOrEmpty(item.workName))
-                errorInfo += "请填写工种名称!";
+//            if (stringUtils.IsNullOrEmpty(item.workName))
+//                errorInfo += "请填写工种名称!";
 
             if (stringUtils.IsNullOrEmpty(item.jobHuntTypeStr))
                 errorInfo += "请填写求职类型!";

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

@@ -159,7 +159,29 @@ public class JobUserServiceImpl implements JobUserService {
     @Override
     public int save(JobUserVo data, String userId) {
         int result = 0;
+
         PcJobuser dbData = pcJobuserMapper.selectByPrimaryKey(data.getJobUserID());
+        PcJobuserExample emp = new PcJobuserExample();
+        PcJobuserExample.Criteria cir = emp.or();
+        //验证身份证是否已经录入
+        if (dbData != null){
+            cir.andJobuserIDNotEqualTo(data.getJobUserID());
+        }
+        cir.andIdentityNumberEqualTo(data.getIdentityNumber());
+        if(pcJobuserMapper.selectByExample(emp).size()>0){
+            throw new BaseException("500","该身份证号已绑定其他人员");
+        }
+
+        //验证联系电话是否已经录入
+        cir = emp.or();
+        if (dbData != null){
+            cir.andJobuserIDNotEqualTo(data.getJobUserID());
+        }
+        cir.andUserMobileEqualTo(data.getUserMobile());
+        if(pcJobuserMapper.selectByExample(emp).size()>0){
+            throw new BaseException("500","该联系电话已绑定其他人员");
+        }
+
         if (dbData == null) {
             dbData = new PcJobuser();
             dbData.setJobuserID(data.getJobUserID());

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

@@ -27,10 +27,10 @@ public class RecommendMgtServiceImpl implements RecommendMgtService {
     private StringUtils stringUtils;
 
     @Override
-    public PageInfo<RecommendMgtVo> getList(Integer page, Integer rows, String name, String companyName, Integer recommendType, Integer entryState, String pushName, String professionID) {
+    public PageInfo<RecommendMgtVo> getList(Integer page, Integer rows, String name, String companyName, Integer recommendType, Integer entryState, String pushName, String professionName) {
         PageHelper.startPage(page, rows);
 
-        List<RecommendMgtVo> list = recommendMgtCQuery.getRecommendMgtList(name, companyName, recommendType, entryState, pushName, professionID);
+        List<RecommendMgtVo> list = recommendMgtCQuery.getRecommendMgtList(name, companyName, recommendType, entryState, pushName, professionName);
 
         PageInfo<RecommendMgtVo> result = new PageInfo(list);
 

src/main/java/com/hz/employmentsite/services/service/WechatService.java

@@ -8,7 +8,7 @@ public interface WechatService {
 
     String getOAuthUrl(String redirectUrl);
 
-    Integer sentMsg(String toUserId, Map<String,String> sentData,String url);
+    Integer sentMsg(String toUserId, Map<String,String> sentData,String url) throws Exception;
 
     String getOpenId(String code) throws WxErrorException;
 

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,List<String> jobHuntIDList, String jobUserID, String jobUserName, String workName,
+    PageInfo<JobHuntVo> getList(Integer pageIndex, Integer pageSize,List<String> jobHuntIDList, String jobUserID, String jobUserName, String professionName,
                                 Integer minWorkYear, Integer maxWorkYear, Integer jobHuntTypeID, Integer jobUserTypeID,
                                 BigDecimal minSalary, BigDecimal maxSalary, Integer isAccomplish);
 

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 
 public interface RecommendMgtService {
-    PageInfo<RecommendMgtVo> getList(Integer page, Integer rows, String name, String companyName, Integer recommendType, Integer entryState, String pushName, String professionId);
+    PageInfo<RecommendMgtVo> getList(Integer page, Integer rows, String name, String companyName, Integer recommendType, Integer entryState, String pushName, String professionName);
 
     /**
      * 修改入职状态

src/main/resources/application.yml

@@ -121,8 +121,9 @@ appconfig:
   wxconfig:
     appId: 'wx737c2a7879b897c1'
     appSecret: '0d37c99bf2edd9ef3d839869bfa724ad'
-    messageTemplateId: ''
+    messageTemplateId: '-R2xeAeey7rOKN5VAuUr8cFMsJFlFp7ksN7m6H5_5VU'
     redirectURI: 'http://www.bowintek.com/hzyz/mobile'
     accessScope: 'snsapi_base'
+    testOpenId: ''
 
 

src/main/resources/mapping/PcCompanyMapper.xml

@@ -26,6 +26,7 @@
     <result column="ModifyTime" jdbcType="TIMESTAMP" property="modifyTime" />
     <result column="Longitude" jdbcType="VARCHAR" property="longitude" />
     <result column="Latitude" jdbcType="VARCHAR" property="latitude" />
+    <result column="openId" jdbcType="VARCHAR" property="openId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hz.employmentsite.model.PcCompanyWithBLOBs">
     <result column="BusinScope" jdbcType="LONGVARCHAR" property="businScope" />
@@ -93,7 +94,7 @@
     CompanyID, SiteID, RegionCode, InsuredCount, StreetCode, CompanyName, CompanyCode, 
     CompanyModel, WorkSituation, CompanyType, CompanyAddress, UserName, UserMobile, CompanyEmail, 
     FrName, ValidDate, IsShortage, RecordStatus, CreateUserID, CreateTime, ModifyUserID, 
-    ModifyTime, Longitude, Latitude
+    ModifyTime, Longitude, Latitude, openId
   </sql>
   <sql id="Blob_Column_List">
     BusinScope, CompanyDesc
@@ -155,7 +156,8 @@
       ValidDate, IsShortage, RecordStatus, 
       CreateUserID, CreateTime, ModifyUserID, 
       ModifyTime, Longitude, Latitude, 
-      BusinScope, CompanyDesc)
+      openId, BusinScope, CompanyDesc
+      )
     values (#{companyID,jdbcType=VARCHAR}, #{siteID,jdbcType=VARCHAR}, #{regionCode,jdbcType=VARCHAR}, 
       #{insuredCount,jdbcType=INTEGER}, #{streetCode,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
       #{companyCode,jdbcType=VARCHAR}, #{companyModel,jdbcType=INTEGER}, #{workSituation,jdbcType=VARCHAR}, 
@@ -164,7 +166,8 @@
       #{validDate,jdbcType=TIMESTAMP}, #{isShortage,jdbcType=INTEGER}, #{recordStatus,jdbcType=INTEGER}, 
       #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, 
       #{modifyTime,jdbcType=TIMESTAMP}, #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, 
-      #{businScope,jdbcType=LONGVARCHAR}, #{companyDesc,jdbcType=LONGVARCHAR})
+      #{openId,jdbcType=VARCHAR}, #{businScope,jdbcType=LONGVARCHAR}, #{companyDesc,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcCompanyWithBLOBs">
     insert into pc_company
@@ -241,6 +244,9 @@
       <if test="latitude != null">
         Latitude,
       </if>
+      <if test="openId != null">
+        openId,
+      </if>
       <if test="businScope != null">
         BusinScope,
       </if>
@@ -321,6 +327,9 @@
       <if test="latitude != null">
         #{latitude,jdbcType=VARCHAR},
       </if>
+      <if test="openId != null">
+        #{openId,jdbcType=VARCHAR},
+      </if>
       <if test="businScope != null">
         #{businScope,jdbcType=LONGVARCHAR},
       </if>
@@ -410,6 +419,9 @@
       <if test="row.latitude != null">
         Latitude = #{row.latitude,jdbcType=VARCHAR},
       </if>
+      <if test="row.openId != null">
+        openId = #{row.openId,jdbcType=VARCHAR},
+      </if>
       <if test="row.businScope != null">
         BusinScope = #{row.businScope,jdbcType=LONGVARCHAR},
       </if>
@@ -447,6 +459,7 @@
       ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
       Longitude = #{row.longitude,jdbcType=VARCHAR},
       Latitude = #{row.latitude,jdbcType=VARCHAR},
+      openId = #{row.openId,jdbcType=VARCHAR},
       BusinScope = #{row.businScope,jdbcType=LONGVARCHAR},
       CompanyDesc = #{row.companyDesc,jdbcType=LONGVARCHAR}
     <if test="example != null">
@@ -478,7 +491,8 @@
       ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
       ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
       Longitude = #{row.longitude,jdbcType=VARCHAR},
-      Latitude = #{row.latitude,jdbcType=VARCHAR}
+      Latitude = #{row.latitude,jdbcType=VARCHAR},
+      openId = #{row.openId,jdbcType=VARCHAR}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -555,6 +569,9 @@
       <if test="latitude != null">
         Latitude = #{latitude,jdbcType=VARCHAR},
       </if>
+      <if test="openId != null">
+        openId = #{openId,jdbcType=VARCHAR},
+      </if>
       <if test="businScope != null">
         BusinScope = #{businScope,jdbcType=LONGVARCHAR},
       </if>
@@ -589,6 +606,7 @@
       ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
       Longitude = #{longitude,jdbcType=VARCHAR},
       Latitude = #{latitude,jdbcType=VARCHAR},
+      openId = #{openId,jdbcType=VARCHAR},
       BusinScope = #{businScope,jdbcType=LONGVARCHAR},
       CompanyDesc = #{companyDesc,jdbcType=LONGVARCHAR}
     where CompanyID = #{companyID,jdbcType=VARCHAR}
@@ -617,7 +635,8 @@
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
       ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
       Longitude = #{longitude,jdbcType=VARCHAR},
-      Latitude = #{latitude,jdbcType=VARCHAR}
+      Latitude = #{latitude,jdbcType=VARCHAR},
+      openId = #{openId,jdbcType=VARCHAR}
     where CompanyID = #{companyID,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/resources/mapping/PcJobuserMapper.xml

@@ -38,6 +38,7 @@
     <result column="CreateTime" jdbcType="TIMESTAMP" property="createTime" />
     <result column="ModifyUserID" jdbcType="VARCHAR" property="modifyUserID" />
     <result column="ModifyTime" jdbcType="TIMESTAMP" property="modifyTime" />
+    <result column="openId" jdbcType="VARCHAR" property="openId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -102,7 +103,7 @@
     Birthplace, BirthDay, FamilyNatureID, CultureRank, HealthID, BloodTypeID, Height, 
     Vision, Weight, MaritalStatusID, ProvinceCode, RegionCode, StreetCode, UserName, 
     UserMobile, Address, FamilyAddress, PostalCode, Email, Hobby, JobStatusID, KeyPersonTypeID, 
-    PersonalSkills, CreateUserID, CreateTime, ModifyUserID, ModifyTime
+    PersonalSkills, CreateUserID, CreateTime, ModifyUserID, ModifyTime, openId
   </sql>
   <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcJobuserExample" resultMap="BaseResultMap">
     select
@@ -146,8 +147,8 @@
       Address, FamilyAddress, PostalCode, 
       Email, Hobby, JobStatusID, 
       KeyPersonTypeID, PersonalSkills, CreateUserID, 
-      CreateTime, ModifyUserID, ModifyTime
-      )
+      CreateTime, ModifyUserID, ModifyTime, 
+      openId)
     values (#{jobuserID,jdbcType=VARCHAR}, #{siteID,jdbcType=VARCHAR}, #{identityNumber,jdbcType=VARCHAR}, 
       #{name,jdbcType=VARCHAR}, #{pyName,jdbcType=VARCHAR}, #{engName,jdbcType=VARCHAR}, 
       #{sex,jdbcType=INTEGER}, #{nation,jdbcType=VARCHAR}, #{politicsStatusID,jdbcType=INTEGER}, 
@@ -159,8 +160,8 @@
       #{address,jdbcType=VARCHAR}, #{familyAddress,jdbcType=VARCHAR}, #{postalCode,jdbcType=VARCHAR}, 
       #{email,jdbcType=VARCHAR}, #{hobby,jdbcType=VARCHAR}, #{jobStatusID,jdbcType=INTEGER}, 
       #{keyPersonTypeID,jdbcType=INTEGER}, #{personalSkills,jdbcType=VARCHAR}, #{createUserID,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}
-      )
+      #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 
+      #{openId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcJobuser">
     insert into pc_jobuser
@@ -273,6 +274,9 @@
       <if test="modifyTime != null">
         ModifyTime,
       </if>
+      <if test="openId != null">
+        openId,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="jobuserID != null">
@@ -383,6 +387,9 @@
       <if test="modifyTime != null">
         #{modifyTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="openId != null">
+        #{openId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hz.employmentsite.model.PcJobuserExample" resultType="java.lang.Long">
@@ -502,6 +509,9 @@
       <if test="row.modifyTime != null">
         ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="row.openId != null">
+        openId = #{row.openId,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -544,7 +554,8 @@
       CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP}
+      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
+      openId = #{row.openId,jdbcType=VARCHAR}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -657,6 +668,9 @@
       <if test="modifyTime != null">
         ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="openId != null">
+        openId = #{openId,jdbcType=VARCHAR},
+      </if>
     </set>
     where JobuserID = #{jobuserID,jdbcType=VARCHAR}
   </update>
@@ -696,7 +710,8 @@
       CreateUserID = #{createUserID,jdbcType=VARCHAR},
       CreateTime = #{createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP}
+      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
+      openId = #{openId,jdbcType=VARCHAR}
     where JobuserID = #{jobuserID,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/resources/mapping/PcRecommendMgtMapper.xml

@@ -14,6 +14,8 @@
     <result column="CreateTime" jdbcType="TIMESTAMP" property="createTime" />
     <result column="ModifyUserID" jdbcType="VARCHAR" property="modifyUserID" />
     <result column="ModifyTime" jdbcType="TIMESTAMP" property="modifyTime" />
+    <result column="isSendCompany" jdbcType="BIT" property="isSendCompany" />
+    <result column="isSendUser" jdbcType="BIT" property="isSendUser" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -75,7 +77,8 @@
   </sql>
   <sql id="Base_Column_List">
     RecommendMgtID, PostID, JobHuntID, RecommendType, EntryState, OfficialAccountsID, 
-    PostIsRead, JobPeopleIsRead, CreateUserID, CreateTime, ModifyUserID, ModifyTime
+    PostIsRead, JobPeopleIsRead, CreateUserID, CreateTime, ModifyUserID, ModifyTime, 
+    isSendCompany, isSendUser
   </sql>
   <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcRecommendMgtExample" resultMap="BaseResultMap">
     select
@@ -111,13 +114,13 @@
     insert into pc_recommend_mgt (RecommendMgtID, PostID, JobHuntID, 
       RecommendType, EntryState, OfficialAccountsID, 
       PostIsRead, JobPeopleIsRead, CreateUserID, 
-      CreateTime, ModifyUserID, ModifyTime
-      )
+      CreateTime, ModifyUserID, ModifyTime, 
+      isSendCompany, isSendUser)
     values (#{recommendMgtID,jdbcType=VARCHAR}, #{postID,jdbcType=VARCHAR}, #{jobHuntID,jdbcType=VARCHAR}, 
       #{recommendType,jdbcType=INTEGER}, #{entryState,jdbcType=INTEGER}, #{officialAccountsID,jdbcType=VARCHAR}, 
       #{postIsRead,jdbcType=INTEGER}, #{jobPeopleIsRead,jdbcType=INTEGER}, #{createUserID,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}
-      )
+      #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 
+      #{isSendCompany,jdbcType=BIT}, #{isSendUser,jdbcType=BIT})
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcRecommendMgt">
     insert into pc_recommend_mgt
@@ -158,6 +161,12 @@
       <if test="modifyTime != null">
         ModifyTime,
       </if>
+      <if test="isSendCompany != null">
+        isSendCompany,
+      </if>
+      <if test="isSendUser != null">
+        isSendUser,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="recommendMgtID != null">
@@ -196,6 +205,12 @@
       <if test="modifyTime != null">
         #{modifyTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="isSendCompany != null">
+        #{isSendCompany,jdbcType=BIT},
+      </if>
+      <if test="isSendUser != null">
+        #{isSendUser,jdbcType=BIT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hz.employmentsite.model.PcRecommendMgtExample" resultType="java.lang.Long">
@@ -243,6 +258,12 @@
       <if test="row.modifyTime != null">
         ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="row.isSendCompany != null">
+        isSendCompany = #{row.isSendCompany,jdbcType=BIT},
+      </if>
+      <if test="row.isSendUser != null">
+        isSendUser = #{row.isSendUser,jdbcType=BIT},
+      </if>
     </set>
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -261,7 +282,9 @@
       CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP}
+      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
+      isSendCompany = #{row.isSendCompany,jdbcType=BIT},
+      isSendUser = #{row.isSendUser,jdbcType=BIT}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -302,6 +325,12 @@
       <if test="modifyTime != null">
         ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="isSendCompany != null">
+        isSendCompany = #{isSendCompany,jdbcType=BIT},
+      </if>
+      <if test="isSendUser != null">
+        isSendUser = #{isSendUser,jdbcType=BIT},
+      </if>
     </set>
     where RecommendMgtID = #{recommendMgtID,jdbcType=VARCHAR}
   </update>
@@ -317,7 +346,9 @@
       CreateUserID = #{createUserID,jdbcType=VARCHAR},
       CreateTime = #{createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP}
+      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
+      isSendCompany = #{isSendCompany,jdbcType=BIT},
+      isSendUser = #{isSendUser,jdbcType=BIT}
     where RecommendMgtID = #{recommendMgtID,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/resources/mapping/WxMessagestatusMapper.xml

@@ -0,0 +1,341 @@
+<?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.WxMessagestatusMapper">
+  <resultMap id="BaseResultMap" type="com.hz.employmentsite.model.WxMessagestatus">
+    <id column="messageStatus" jdbcType="VARCHAR" property="messageStatus" />
+    <result column="openId" jdbcType="VARCHAR" property="openId" />
+    <result column="sourceId" jdbcType="VARCHAR" property="sourceId" />
+    <result column="sendTime" jdbcType="TIMESTAMP" property="sendTime" />
+    <result column="recordStatus" jdbcType="INTEGER" property="recordStatus" />
+    <result column="createUserID" jdbcType="VARCHAR" property="createUserID" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="modifyUserID" jdbcType="VARCHAR" property="modifyUserID" />
+    <result column="modifyTime" jdbcType="TIMESTAMP" property="modifyTime" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hz.employmentsite.model.WxMessagestatus">
+    <result column="content" jdbcType="LONGVARCHAR" property="content" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    messageStatus, openId, sourceId, sendTime, recordStatus, createUserID, createTime, 
+    modifyUserID, modifyTime
+  </sql>
+  <sql id="Blob_Column_List">
+    content
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.hz.employmentsite.model.WxMessagestatusExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from wx_messagestatus
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.hz.employmentsite.model.WxMessagestatusExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from wx_messagestatus
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from wx_messagestatus
+    where messageStatus = #{messageStatus,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from wx_messagestatus
+    where messageStatus = #{messageStatus,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hz.employmentsite.model.WxMessagestatusExample">
+    delete from wx_messagestatus
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hz.employmentsite.model.WxMessagestatus">
+    insert into wx_messagestatus (messageStatus, openId, sourceId, 
+      sendTime, recordStatus, createUserID, 
+      createTime, modifyUserID, modifyTime, 
+      content)
+    values (#{messageStatus,jdbcType=VARCHAR}, #{openId,jdbcType=VARCHAR}, #{sourceId,jdbcType=VARCHAR}, 
+      #{sendTime,jdbcType=TIMESTAMP}, #{recordStatus,jdbcType=INTEGER}, #{createUserID,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 
+      #{content,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hz.employmentsite.model.WxMessagestatus">
+    insert into wx_messagestatus
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="messageStatus != null">
+        messageStatus,
+      </if>
+      <if test="openId != null">
+        openId,
+      </if>
+      <if test="sourceId != null">
+        sourceId,
+      </if>
+      <if test="sendTime != null">
+        sendTime,
+      </if>
+      <if test="recordStatus != null">
+        recordStatus,
+      </if>
+      <if test="createUserID != null">
+        createUserID,
+      </if>
+      <if test="createTime != null">
+        createTime,
+      </if>
+      <if test="modifyUserID != null">
+        modifyUserID,
+      </if>
+      <if test="modifyTime != null">
+        modifyTime,
+      </if>
+      <if test="content != null">
+        content,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="messageStatus != null">
+        #{messageStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="openId != null">
+        #{openId,jdbcType=VARCHAR},
+      </if>
+      <if test="sourceId != null">
+        #{sourceId,jdbcType=VARCHAR},
+      </if>
+      <if test="sendTime != null">
+        #{sendTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recordStatus != null">
+        #{recordStatus,jdbcType=INTEGER},
+      </if>
+      <if test="createUserID != null">
+        #{createUserID,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifyUserID != null">
+        #{modifyUserID,jdbcType=VARCHAR},
+      </if>
+      <if test="modifyTime != null">
+        #{modifyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="content != null">
+        #{content,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hz.employmentsite.model.WxMessagestatusExample" resultType="java.lang.Long">
+    select count(*) from wx_messagestatus
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update wx_messagestatus
+    <set>
+      <if test="row.messageStatus != null">
+        messageStatus = #{row.messageStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="row.openId != null">
+        openId = #{row.openId,jdbcType=VARCHAR},
+      </if>
+      <if test="row.sourceId != null">
+        sourceId = #{row.sourceId,jdbcType=VARCHAR},
+      </if>
+      <if test="row.sendTime != null">
+        sendTime = #{row.sendTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="row.recordStatus != null">
+        recordStatus = #{row.recordStatus,jdbcType=INTEGER},
+      </if>
+      <if test="row.createUserID != null">
+        createUserID = #{row.createUserID,jdbcType=VARCHAR},
+      </if>
+      <if test="row.createTime != null">
+        createTime = #{row.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="row.modifyUserID != null">
+        modifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
+      </if>
+      <if test="row.modifyTime != null">
+        modifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="row.content != null">
+        content = #{row.content,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="example != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update wx_messagestatus
+    set messageStatus = #{row.messageStatus,jdbcType=VARCHAR},
+      openId = #{row.openId,jdbcType=VARCHAR},
+      sourceId = #{row.sourceId,jdbcType=VARCHAR},
+      sendTime = #{row.sendTime,jdbcType=TIMESTAMP},
+      recordStatus = #{row.recordStatus,jdbcType=INTEGER},
+      createUserID = #{row.createUserID,jdbcType=VARCHAR},
+      createTime = #{row.createTime,jdbcType=TIMESTAMP},
+      modifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
+      modifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
+      content = #{row.content,jdbcType=LONGVARCHAR}
+    <if test="example != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update wx_messagestatus
+    set messageStatus = #{row.messageStatus,jdbcType=VARCHAR},
+      openId = #{row.openId,jdbcType=VARCHAR},
+      sourceId = #{row.sourceId,jdbcType=VARCHAR},
+      sendTime = #{row.sendTime,jdbcType=TIMESTAMP},
+      recordStatus = #{row.recordStatus,jdbcType=INTEGER},
+      createUserID = #{row.createUserID,jdbcType=VARCHAR},
+      createTime = #{row.createTime,jdbcType=TIMESTAMP},
+      modifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
+      modifyTime = #{row.modifyTime,jdbcType=TIMESTAMP}
+    <if test="example != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hz.employmentsite.model.WxMessagestatus">
+    update wx_messagestatus
+    <set>
+      <if test="openId != null">
+        openId = #{openId,jdbcType=VARCHAR},
+      </if>
+      <if test="sourceId != null">
+        sourceId = #{sourceId,jdbcType=VARCHAR},
+      </if>
+      <if test="sendTime != null">
+        sendTime = #{sendTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recordStatus != null">
+        recordStatus = #{recordStatus,jdbcType=INTEGER},
+      </if>
+      <if test="createUserID != null">
+        createUserID = #{createUserID,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        createTime = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifyUserID != null">
+        modifyUserID = #{modifyUserID,jdbcType=VARCHAR},
+      </if>
+      <if test="modifyTime != null">
+        modifyTime = #{modifyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="content != null">
+        content = #{content,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where messageStatus = #{messageStatus,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hz.employmentsite.model.WxMessagestatus">
+    update wx_messagestatus
+    set openId = #{openId,jdbcType=VARCHAR},
+      sourceId = #{sourceId,jdbcType=VARCHAR},
+      sendTime = #{sendTime,jdbcType=TIMESTAMP},
+      recordStatus = #{recordStatus,jdbcType=INTEGER},
+      createUserID = #{createUserID,jdbcType=VARCHAR},
+      createTime = #{createTime,jdbcType=TIMESTAMP},
+      modifyUserID = #{modifyUserID,jdbcType=VARCHAR},
+      modifyTime = #{modifyTime,jdbcType=TIMESTAMP},
+      content = #{content,jdbcType=LONGVARCHAR}
+    where messageStatus = #{messageStatus,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hz.employmentsite.model.WxMessagestatus">
+    update wx_messagestatus
+    set openId = #{openId,jdbcType=VARCHAR},
+      sourceId = #{sourceId,jdbcType=VARCHAR},
+      sendTime = #{sendTime,jdbcType=TIMESTAMP},
+      recordStatus = #{recordStatus,jdbcType=INTEGER},
+      createUserID = #{createUserID,jdbcType=VARCHAR},
+      createTime = #{createTime,jdbcType=TIMESTAMP},
+      modifyUserID = #{modifyUserID,jdbcType=VARCHAR},
+      modifyTime = #{modifyTime,jdbcType=TIMESTAMP}
+    where messageStatus = #{messageStatus,jdbcType=VARCHAR}
+  </update>
+</mapper>

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

@@ -21,8 +21,8 @@
         <if test="jobUserName != '' and jobUserName != null">
             and jobUser.name like Concat('%',#{jobUserName},'%')
         </if>
-        <if test="workName != '' and workName != null">
-            and jobHunt.workName like Concat('%',#{workName},'%')
+        <if test="professionName != '' and professionName != null">
+            and profession.ProfessionName like Concat('%',#{professionName},'%')
         </if>
         <if test="minWorkYear != '' and minWorkYear != null">
             and jobHunt.workYear <![CDATA[ >= ]]> #{minWorkYear}

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

@@ -35,8 +35,8 @@
             <if test="pushName != '' and pushName != null">
                 and g.Name like Concat('%',#{pushName},'%')
             </if>
-            <if test="professionID != '' and professionID != null">
-                and b.ProfessionID = #{professionID}
+            <if test="professionName != '' and professionName != null">
+                and f.ProfessionName like Concat('%',#{professionName},'%')
             </if>
         </where>
         order by a.createtime desc

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

@@ -13,8 +13,8 @@
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="工种名称" :label-col="{ span: 8 }" name="workName">
-            <a-input v-model:value="searchParamsState.workName" placeholder="" />
+          <a-form-item label="求职岗位" :label-col="{ span: 8 }" name="professionName">
+            <a-input v-model:value="searchParamsState.professionName" placeholder="" />
           </a-form-item>
         </a-col>
         <a-col :span="8">
@@ -161,7 +161,7 @@ import Recommend from "@/views/jobUserManager/jobhunt/recommend.vue";
         pageIndex: 1,
         pageSize: 20,
         jobUserName: null,
-        workName:null,
+        professionName:null,
         minWorkYear: null,
         maxWorkYear: null,
         jobHuntTypeID: null,
@@ -185,7 +185,7 @@ import Recommend from "@/views/jobUserManager/jobhunt/recommend.vue";
             `${searchParamsState.pageSize * (searchParamsState.pageIndex - 1) + item.index + 1}`,
         },
         { title: '姓名', dataIndex: 'jobUserName', key: 'jobUserName', width: 100,align: "center", },
-        { title: '工种名称', dataIndex: 'workName', key: 'workName', width: 150, align: "center", },
+        // { title: '工种名称', dataIndex: 'workName', key: 'workName', width: 150, align: "center", },
         { title: '希望工作地区', dataIndex: 'areaWork', key: 'areaWork', width: 150, align: "center", },
         { title: '可到职日期', dataIndex: 'inDate', key: 'inDate', width: 100, align: "center",
           customRender: ({ record }) => record.inDate == null?"":dayjs(record.inDate).format('YYYY-MM-DD'), },
@@ -214,7 +214,7 @@ import Recommend from "@/views/jobUserManager/jobhunt/recommend.vue";
         url: '/jobUserService/jobHunt/importJobHunt',
         columns: [
           {cnName: '姓名', enName: 'jobUserName', width: 100},
-          {cnName: '工种名称', enName: 'workName', width: 100},
+          // {cnName: '工种名称', enName: 'workName', width: 100},
           {cnName: '求职类型', enName: 'jobHuntType', width: 100},
           {cnName: '人才类型', enName: 'jobUserType', width: 100},
           {cnName: '最低月薪(元)', enName: 'minSalary', width: 100},

vue/src/views/jobUserManager/recommendMgt/index.vue

@@ -73,8 +73,8 @@
           </a-form-item>
         </a-col>
         <a-col :span="6">
-          <a-form-item label="岗位" :label-col="{ span: 8 }" name="professionId">
-            <a-input v-model:value="searchParamsState.professionId" placeholder=""/>
+          <a-form-item label="岗位" :label-col="{ span: 8 }" name="professionName">
+            <a-input v-model:value="searchParamsState.professionName" placeholder=""/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -135,7 +135,7 @@ export default defineComponent({
       recommendType: null,
       entryState: null,
       pushName: '',
-      professionId: null
+      professionName: ''
     });
     const formState = reactive({
       total: 0,