Browse Source

岗位-新增页面功能实现

Liudijing 1 year ago
parent
commit
a5c642e62e

+ 5 - 2
src/main/java/com/hz/employmentsite/controller/companyService/PostController.java

@@ -40,8 +40,11 @@ public class PostController {
 
     @GetMapping("/getPostByID")
     public BaseResponse<PostVo> getPostByID(@RequestParam(required = false) String id) {
-        var result = postService.getDataById(id);
-        return RespGenerstor.success(result);
+        var data = postService.getDataById(id);
+        if (data == null) {
+            data = new PostVo();
+        }
+        return RespGenerstor.success(data);
     }
 
 }

+ 0 - 1
src/main/java/com/hz/employmentsite/mapper/cquery/PostCQuery.java

@@ -2,7 +2,6 @@ package com.hz.employmentsite.mapper.cquery;
 
 import com.hz.employmentsite.model.PcPost;
 import com.hz.employmentsite.vo.companyService.PostVo;
-import com.hz.employmentsite.vo.jobUserManager.JobhuntVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

+ 24 - 14
src/main/java/com/hz/employmentsite/model/PcPost.java

@@ -8,7 +8,7 @@ public class PcPost {
 
     private String workCode;
 
-    private String workNmae;
+    private String workName;
 
     private Integer recruitCount;
 
@@ -24,7 +24,7 @@ public class PcPost {
 
     private Integer workYear;
 
-    private String cultureRank;
+    private Integer cultureRank;
 
     private BigDecimal maxSalary;
 
@@ -36,7 +36,7 @@ public class PcPost {
 
     private String userMobile;
 
-    private String postEmial;
+    private String postEmail;
 
     private Integer workTime;
 
@@ -56,6 +56,8 @@ public class PcPost {
 
     private Date modifyTime;
 
+    private Date validTime;
+
     private String postDesc;
 
     public String getPostID() {
@@ -74,12 +76,12 @@ public class PcPost {
         this.workCode = workCode == null ? null : workCode.trim();
     }
 
-    public String getWorkNmae() {
-        return workNmae;
+    public String getWorkName() {
+        return workName;
     }
 
-    public void setWorkNmae(String workNmae) {
-        this.workNmae = workNmae == null ? null : workNmae.trim();
+    public void setWorkName(String workName) {
+        this.workName = workName == null ? null : workName.trim();
     }
 
     public Integer getRecruitCount() {
@@ -138,12 +140,12 @@ public class PcPost {
         this.workYear = workYear;
     }
 
-    public String getCultureRank() {
+    public Integer getCultureRank() {
         return cultureRank;
     }
 
-    public void setCultureRank(String cultureRank) {
-        this.cultureRank = cultureRank == null ? null : cultureRank.trim();
+    public void setCultureRank(Integer cultureRank) {
+        this.cultureRank = cultureRank;
     }
 
     public BigDecimal getMaxSalary() {
@@ -186,12 +188,12 @@ public class PcPost {
         this.userMobile = userMobile == null ? null : userMobile.trim();
     }
 
-    public String getPostEmial() {
-        return postEmial;
+    public String getPostEmail() {
+        return postEmail;
     }
 
-    public void setPostEmial(String postEmial) {
-        this.postEmial = postEmial == null ? null : postEmial.trim();
+    public void setPostEmail(String postEmail) {
+        this.postEmail = postEmail == null ? null : postEmail.trim();
     }
 
     public Integer getWorkTime() {
@@ -266,6 +268,14 @@ public class PcPost {
         this.modifyTime = modifyTime;
     }
 
+    public Date getValidTime() {
+        return validTime;
+    }
+
+    public void setValidTime(Date validTime) {
+        this.validTime = validTime;
+    }
+
     public String getPostDesc() {
         return postDesc;
     }

+ 136 - 86
src/main/java/com/hz/employmentsite/model/PcPostExample.java

@@ -246,73 +246,73 @@ public class PcPostExample {
             return (Criteria) this;
         }
 
-        public Criteria andWorkNmaeIsNull() {
-            addCriterion("WorkNmae is null");
+        public Criteria andWorkNameIsNull() {
+            addCriterion("WorkName is null");
             return (Criteria) this;
         }
 
-        public Criteria andWorkNmaeIsNotNull() {
-            addCriterion("WorkNmae is not null");
+        public Criteria andWorkNameIsNotNull() {
+            addCriterion("WorkName is not null");
             return (Criteria) this;
         }
 
-        public Criteria andWorkNmaeEqualTo(String value) {
-            addCriterion("WorkNmae =", value, "workNmae");
+        public Criteria andWorkNameEqualTo(String value) {
+            addCriterion("WorkName =", value, "workName");
             return (Criteria) this;
         }
 
-        public Criteria andWorkNmaeNotEqualTo(String value) {
-            addCriterion("WorkNmae <>", value, "workNmae");
+        public Criteria andWorkNameNotEqualTo(String value) {
+            addCriterion("WorkName <>", value, "workName");
             return (Criteria) this;
         }
 
-        public Criteria andWorkNmaeGreaterThan(String value) {
-            addCriterion("WorkNmae >", value, "workNmae");
+        public Criteria andWorkNameGreaterThan(String value) {
+            addCriterion("WorkName >", value, "workName");
             return (Criteria) this;
         }
 
-        public Criteria andWorkNmaeGreaterThanOrEqualTo(String value) {
-            addCriterion("WorkNmae >=", value, "workNmae");
+        public Criteria andWorkNameGreaterThanOrEqualTo(String value) {
+            addCriterion("WorkName >=", value, "workName");
             return (Criteria) this;
         }
 
-        public Criteria andWorkNmaeLessThan(String value) {
-            addCriterion("WorkNmae <", value, "workNmae");
+        public Criteria andWorkNameLessThan(String value) {
+            addCriterion("WorkName <", value, "workName");
             return (Criteria) this;
         }
 
-        public Criteria andWorkNmaeLessThanOrEqualTo(String value) {
-            addCriterion("WorkNmae <=", value, "workNmae");
+        public Criteria andWorkNameLessThanOrEqualTo(String value) {
+            addCriterion("WorkName <=", value, "workName");
             return (Criteria) this;
         }
 
-        public Criteria andWorkNmaeLike(String value) {
-            addCriterion("WorkNmae like", value, "workNmae");
+        public Criteria andWorkNameLike(String value) {
+            addCriterion("WorkName like", value, "workName");
             return (Criteria) this;
         }
 
-        public Criteria andWorkNmaeNotLike(String value) {
-            addCriterion("WorkNmae not like", value, "workNmae");
+        public Criteria andWorkNameNotLike(String value) {
+            addCriterion("WorkName not like", value, "workName");
             return (Criteria) this;
         }
 
-        public Criteria andWorkNmaeIn(List<String> values) {
-            addCriterion("WorkNmae in", values, "workNmae");
+        public Criteria andWorkNameIn(List<String> values) {
+            addCriterion("WorkName in", values, "workName");
             return (Criteria) this;
         }
 
-        public Criteria andWorkNmaeNotIn(List<String> values) {
-            addCriterion("WorkNmae not in", values, "workNmae");
+        public Criteria andWorkNameNotIn(List<String> values) {
+            addCriterion("WorkName not in", values, "workName");
             return (Criteria) this;
         }
 
-        public Criteria andWorkNmaeBetween(String value1, String value2) {
-            addCriterion("WorkNmae between", value1, value2, "workNmae");
+        public Criteria andWorkNameBetween(String value1, String value2) {
+            addCriterion("WorkName between", value1, value2, "workName");
             return (Criteria) this;
         }
 
-        public Criteria andWorkNmaeNotBetween(String value1, String value2) {
-            addCriterion("WorkNmae not between", value1, value2, "workNmae");
+        public Criteria andWorkNameNotBetween(String value1, String value2) {
+            addCriterion("WorkName not between", value1, value2, "workName");
             return (Criteria) this;
         }
 
@@ -776,62 +776,52 @@ public class PcPostExample {
             return (Criteria) this;
         }
 
-        public Criteria andCultureRankEqualTo(String value) {
+        public Criteria andCultureRankEqualTo(Integer value) {
             addCriterion("CultureRank =", value, "cultureRank");
             return (Criteria) this;
         }
 
-        public Criteria andCultureRankNotEqualTo(String value) {
+        public Criteria andCultureRankNotEqualTo(Integer value) {
             addCriterion("CultureRank <>", value, "cultureRank");
             return (Criteria) this;
         }
 
-        public Criteria andCultureRankGreaterThan(String value) {
+        public Criteria andCultureRankGreaterThan(Integer value) {
             addCriterion("CultureRank >", value, "cultureRank");
             return (Criteria) this;
         }
 
-        public Criteria andCultureRankGreaterThanOrEqualTo(String value) {
+        public Criteria andCultureRankGreaterThanOrEqualTo(Integer value) {
             addCriterion("CultureRank >=", value, "cultureRank");
             return (Criteria) this;
         }
 
-        public Criteria andCultureRankLessThan(String value) {
+        public Criteria andCultureRankLessThan(Integer value) {
             addCriterion("CultureRank <", value, "cultureRank");
             return (Criteria) this;
         }
 
-        public Criteria andCultureRankLessThanOrEqualTo(String value) {
+        public Criteria andCultureRankLessThanOrEqualTo(Integer value) {
             addCriterion("CultureRank <=", value, "cultureRank");
             return (Criteria) this;
         }
 
-        public Criteria andCultureRankLike(String value) {
-            addCriterion("CultureRank like", value, "cultureRank");
-            return (Criteria) this;
-        }
-
-        public Criteria andCultureRankNotLike(String value) {
-            addCriterion("CultureRank not like", value, "cultureRank");
-            return (Criteria) this;
-        }
-
-        public Criteria andCultureRankIn(List<String> values) {
+        public Criteria andCultureRankIn(List<Integer> values) {
             addCriterion("CultureRank in", values, "cultureRank");
             return (Criteria) this;
         }
 
-        public Criteria andCultureRankNotIn(List<String> values) {
+        public Criteria andCultureRankNotIn(List<Integer> values) {
             addCriterion("CultureRank not in", values, "cultureRank");
             return (Criteria) this;
         }
 
-        public Criteria andCultureRankBetween(String value1, String value2) {
+        public Criteria andCultureRankBetween(Integer value1, Integer value2) {
             addCriterion("CultureRank between", value1, value2, "cultureRank");
             return (Criteria) this;
         }
 
-        public Criteria andCultureRankNotBetween(String value1, String value2) {
+        public Criteria andCultureRankNotBetween(Integer value1, Integer value2) {
             addCriterion("CultureRank not between", value1, value2, "cultureRank");
             return (Criteria) this;
         }
@@ -1166,73 +1156,73 @@ public class PcPostExample {
             return (Criteria) this;
         }
 
-        public Criteria andPostEmialIsNull() {
-            addCriterion("PostEmial is null");
+        public Criteria andPostEmailIsNull() {
+            addCriterion("PostEmail is null");
             return (Criteria) this;
         }
 
-        public Criteria andPostEmialIsNotNull() {
-            addCriterion("PostEmial is not null");
+        public Criteria andPostEmailIsNotNull() {
+            addCriterion("PostEmail is not null");
             return (Criteria) this;
         }
 
-        public Criteria andPostEmialEqualTo(String value) {
-            addCriterion("PostEmial =", value, "postEmial");
+        public Criteria andPostEmailEqualTo(String value) {
+            addCriterion("PostEmail =", value, "postEmail");
             return (Criteria) this;
         }
 
-        public Criteria andPostEmialNotEqualTo(String value) {
-            addCriterion("PostEmial <>", value, "postEmial");
+        public Criteria andPostEmailNotEqualTo(String value) {
+            addCriterion("PostEmail <>", value, "postEmail");
             return (Criteria) this;
         }
 
-        public Criteria andPostEmialGreaterThan(String value) {
-            addCriterion("PostEmial >", value, "postEmial");
+        public Criteria andPostEmailGreaterThan(String value) {
+            addCriterion("PostEmail >", value, "postEmail");
             return (Criteria) this;
         }
 
-        public Criteria andPostEmialGreaterThanOrEqualTo(String value) {
-            addCriterion("PostEmial >=", value, "postEmial");
+        public Criteria andPostEmailGreaterThanOrEqualTo(String value) {
+            addCriterion("PostEmail >=", value, "postEmail");
             return (Criteria) this;
         }
 
-        public Criteria andPostEmialLessThan(String value) {
-            addCriterion("PostEmial <", value, "postEmial");
+        public Criteria andPostEmailLessThan(String value) {
+            addCriterion("PostEmail <", value, "postEmail");
             return (Criteria) this;
         }
 
-        public Criteria andPostEmialLessThanOrEqualTo(String value) {
-            addCriterion("PostEmial <=", value, "postEmial");
+        public Criteria andPostEmailLessThanOrEqualTo(String value) {
+            addCriterion("PostEmail <=", value, "postEmail");
             return (Criteria) this;
         }
 
-        public Criteria andPostEmialLike(String value) {
-            addCriterion("PostEmial like", value, "postEmial");
+        public Criteria andPostEmailLike(String value) {
+            addCriterion("PostEmail like", value, "postEmail");
             return (Criteria) this;
         }
 
-        public Criteria andPostEmialNotLike(String value) {
-            addCriterion("PostEmial not like", value, "postEmial");
+        public Criteria andPostEmailNotLike(String value) {
+            addCriterion("PostEmail not like", value, "postEmail");
             return (Criteria) this;
         }
 
-        public Criteria andPostEmialIn(List<String> values) {
-            addCriterion("PostEmial in", values, "postEmial");
+        public Criteria andPostEmailIn(List<String> values) {
+            addCriterion("PostEmail in", values, "postEmail");
             return (Criteria) this;
         }
 
-        public Criteria andPostEmialNotIn(List<String> values) {
-            addCriterion("PostEmial not in", values, "postEmial");
+        public Criteria andPostEmailNotIn(List<String> values) {
+            addCriterion("PostEmail not in", values, "postEmail");
             return (Criteria) this;
         }
 
-        public Criteria andPostEmialBetween(String value1, String value2) {
-            addCriterion("PostEmial between", value1, value2, "postEmial");
+        public Criteria andPostEmailBetween(String value1, String value2) {
+            addCriterion("PostEmail between", value1, value2, "postEmail");
             return (Criteria) this;
         }
 
-        public Criteria andPostEmialNotBetween(String value1, String value2) {
-            addCriterion("PostEmial not between", value1, value2, "postEmial");
+        public Criteria andPostEmailNotBetween(String value1, String value2) {
+            addCriterion("PostEmail not between", value1, value2, "postEmail");
             return (Criteria) this;
         }
 
@@ -1366,52 +1356,52 @@ public class PcPostExample {
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeEqualTo(Date value) {
+        public Criteria andTrailtimeEqualTo(Integer value) {
             addCriterion("Trailtime =", value, "trailtime");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeNotEqualTo(Date value) {
+        public Criteria andTrailtimeNotEqualTo(Integer value) {
             addCriterion("Trailtime <>", value, "trailtime");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeGreaterThan(Date value) {
+        public Criteria andTrailtimeGreaterThan(Integer value) {
             addCriterion("Trailtime >", value, "trailtime");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeGreaterThanOrEqualTo(Date value) {
+        public Criteria andTrailtimeGreaterThanOrEqualTo(Integer value) {
             addCriterion("Trailtime >=", value, "trailtime");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeLessThan(Date value) {
+        public Criteria andTrailtimeLessThan(Integer value) {
             addCriterion("Trailtime <", value, "trailtime");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeLessThanOrEqualTo(Date value) {
+        public Criteria andTrailtimeLessThanOrEqualTo(Integer value) {
             addCriterion("Trailtime <=", value, "trailtime");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeIn(List<Date> values) {
+        public Criteria andTrailtimeIn(List<Integer> values) {
             addCriterion("Trailtime in", values, "trailtime");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeNotIn(List<Date> values) {
+        public Criteria andTrailtimeNotIn(List<Integer> values) {
             addCriterion("Trailtime not in", values, "trailtime");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeBetween(Date value1, Date value2) {
+        public Criteria andTrailtimeBetween(Integer value1, Integer value2) {
             addCriterion("Trailtime between", value1, value2, "trailtime");
             return (Criteria) this;
         }
 
-        public Criteria andTrailtimeNotBetween(Date value1, Date value2) {
+        public Criteria andTrailtimeNotBetween(Integer value1, Integer value2) {
             addCriterion("Trailtime not between", value1, value2, "trailtime");
             return (Criteria) this;
         }
@@ -1795,6 +1785,66 @@ public class PcPostExample {
             addCriterion("ModifyTime not between", value1, value2, "modifyTime");
             return (Criteria) this;
         }
+
+        public Criteria andValidTimeIsNull() {
+            addCriterion("ValidTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidTimeIsNotNull() {
+            addCriterion("ValidTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidTimeEqualTo(Date value) {
+            addCriterion("ValidTime =", value, "validTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidTimeNotEqualTo(Date value) {
+            addCriterion("ValidTime <>", value, "validTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidTimeGreaterThan(Date value) {
+            addCriterion("ValidTime >", value, "validTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("ValidTime >=", value, "validTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidTimeLessThan(Date value) {
+            addCriterion("ValidTime <", value, "validTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidTimeLessThanOrEqualTo(Date value) {
+            addCriterion("ValidTime <=", value, "validTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidTimeIn(List<Date> values) {
+            addCriterion("ValidTime in", values, "validTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidTimeNotIn(List<Date> values) {
+            addCriterion("ValidTime not in", values, "validTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidTimeBetween(Date value1, Date value2) {
+            addCriterion("ValidTime between", value1, value2, "validTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidTimeNotBetween(Date value1, Date value2) {
+            addCriterion("ValidTime not between", value1, value2, "validTime");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 5 - 9
src/main/java/com/hz/employmentsite/services/impl/companyService/PostServiceImpl.java

@@ -1,16 +1,13 @@
 package com.hz.employmentsite.services.impl.companyService;
 
 import com.github.pagehelper.PageInfo;
-import com.hz.employmentsite.filter.exception.BaseException;
 import com.hz.employmentsite.mapper.PcPostMapper;
-import com.hz.employmentsite.mapper.cquery.JobhuntCQuery;
 import com.hz.employmentsite.mapper.cquery.PostCQuery;
 import com.hz.employmentsite.model.PcPost;
 import com.hz.employmentsite.model.PcPostExample;
 import com.hz.employmentsite.services.service.companyService.PostService;
 import com.hz.employmentsite.util.StringUtils;
 import com.hz.employmentsite.vo.companyService.PostVo;
-import com.hz.employmentsite.vo.jobUserManager.JobhuntVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -52,7 +49,7 @@ public class PostServiceImpl implements PostService {
             dbData = new PcPost();
             dbData.setPostID(UUID.randomUUID().toString());
             dbData.setWorkCode(data.getWorkCode());
-            dbData.setWorkNmae(data.getWorkNmae());
+            dbData.setWorkName(data.getWorkName());
             dbData.setRecruitCount(data.getRecruitCount());
             dbData.setCompanyID(data.getCompanyID());
             dbData.setPostName(data.getPostName());
@@ -68,7 +65,7 @@ public class PostServiceImpl implements PostService {
             dbData.setWelfare(data.getWelfare());
             dbData.setUserName(data.getUserName());
             dbData.setUserMobile(data.getUserMobile());
-            dbData.setPostEmial(data.getPostEmial());
+            dbData.setPostEmail(data.getPostEmial());
             dbData.setWorkTime(data.getWorkTime());
             dbData.setIsTrail(data.getIsTrail());
             dbData.setTrailtime(data.getTrailtime());
@@ -78,9 +75,8 @@ public class PostServiceImpl implements PostService {
             dbData.setCreateUserID(userId);
             result = pcPostMapper.insert(dbData);
         } else {
-            dbData.setPostID(UUID.randomUUID().toString());
             dbData.setWorkCode(data.getWorkCode());
-            dbData.setWorkNmae(data.getWorkNmae());
+            dbData.setWorkName(data.getWorkName());
             dbData.setRecruitCount(data.getRecruitCount());
             dbData.setCompanyID(data.getCompanyID());
             dbData.setPostName(data.getPostName());
@@ -96,7 +92,7 @@ public class PostServiceImpl implements PostService {
             dbData.setWelfare(data.getWelfare());
             dbData.setUserName(data.getUserName());
             dbData.setUserMobile(data.getUserMobile());
-            dbData.setPostEmial(data.getPostEmial());
+            dbData.setPostEmail(data.getPostEmial());
             dbData.setWorkTime(data.getWorkTime());
             dbData.setIsTrail(data.getIsTrail());
             dbData.setTrailtime(data.getTrailtime());
@@ -104,7 +100,7 @@ public class PostServiceImpl implements PostService {
             dbData.setTrailMinSalary(data.getTrailMinSalary());
             dbData.setModifyTime(new Date());
             dbData.setModifyUserID(userId);
-            result = pcPostMapper.updateByPrimaryKey(dbData);
+            result = pcPostMapper.updateByPrimaryKeySelective(dbData);
         }
         return result;
     }

+ 4 - 2
src/main/java/com/hz/employmentsite/vo/companyService/PostVo.java

@@ -10,7 +10,7 @@ public class PostVo {
 
     public String workCode;
 
-    public String workNmae;
+    public String workName;
 
     public Integer recruitCount;
 
@@ -26,7 +26,7 @@ public class PostVo {
 
     public Integer workYear;
 
-    public String cultureRank;
+    public Integer cultureRank;
 
     public BigDecimal maxSalary;
 
@@ -61,4 +61,6 @@ public class PostVo {
     public String postDesc;
 
     public String companyName;
+
+    public String validTime;
 }

+ 2 - 2
src/main/resources/generatorConfig.xml

@@ -97,9 +97,9 @@
         <table schema="" tableName="pc_dotask_user"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_site_user"><property name="useActualColumnNames" value="true"/></table>
 
-        <table schema="" tableName="pc_dotask"><property name="useActualColumnNames" value="true"/></table>
+        <table schema="" tableName="pc_post"><property name="useActualColumnNames" value="true"/></table>
+        <table schema="" tableName="pc_post"><property name="useActualColumnNames" value="true"/></table>
         -->
 
-
     </context>
 </generatorConfiguration>

+ 74 - 57
src/main/resources/mapping/PcPostMapper.xml

@@ -4,7 +4,7 @@
   <resultMap id="BaseResultMap" type="com.hz.employmentsite.model.PcPost">
     <id column="PostID" jdbcType="VARCHAR" property="postID" />
     <result column="WorkCode" jdbcType="VARCHAR" property="workCode" />
-    <result column="WorkNmae" jdbcType="VARCHAR" property="workNmae" />
+    <result column="WorkName" jdbcType="VARCHAR" property="workName" />
     <result column="RecruitCount" jdbcType="INTEGER" property="recruitCount" />
     <result column="CompanyID" jdbcType="VARCHAR" property="companyID" />
     <result column="PostName" jdbcType="VARCHAR" property="postName" />
@@ -12,22 +12,23 @@
     <result column="WorkNature" jdbcType="VARCHAR" property="workNature" />
     <result column="ValidDay" jdbcType="INTEGER" property="validDay" />
     <result column="WorkYear" jdbcType="INTEGER" property="workYear" />
-    <result column="CultureRank" jdbcType="VARCHAR" property="cultureRank" />
+    <result column="CultureRank" jdbcType="INTEGER" property="cultureRank" />
     <result column="MaxSalary" jdbcType="DECIMAL" property="maxSalary" />
     <result column="MinSalary" jdbcType="DECIMAL" property="minSalary" />
     <result column="Welfare" jdbcType="VARCHAR" property="welfare" />
     <result column="UserName" jdbcType="VARCHAR" property="userName" />
     <result column="UserMobile" jdbcType="VARCHAR" property="userMobile" />
-    <result column="PostEmial" jdbcType="VARCHAR" property="postEmial" />
+    <result column="PostEmail" jdbcType="VARCHAR" property="postEmail" />
     <result column="WorkTime" jdbcType="INTEGER" property="workTime" />
     <result column="IsTrail" jdbcType="BIT" property="isTrail" />
-    <result column="Trailtime" jdbcType="TIMESTAMP" property="trailtime" />
+    <result column="Trailtime" jdbcType="INTEGER" property="trailtime" />
     <result column="TrailMaxSalary" jdbcType="DECIMAL" property="trailMaxSalary" />
     <result column="TrailMinSalary" jdbcType="DECIMAL" property="trailMinSalary" />
     <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" />
+    <result column="ValidTime" jdbcType="TIMESTAMP" property="validTime" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hz.employmentsite.model.PcPost">
     <result column="PostDesc" jdbcType="LONGVARCHAR" property="postDesc" />
@@ -91,10 +92,10 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    PostID, WorkCode, WorkNmae, RecruitCount, CompanyID, PostName, RecordStatus, WorkNature, 
+    PostID, WorkCode, WorkName, RecruitCount, CompanyID, PostName, RecordStatus, WorkNature, 
     ValidDay, WorkYear, CultureRank, MaxSalary, MinSalary, Welfare, UserName, UserMobile, 
-    PostEmial, WorkTime, IsTrail, Trailtime, TrailMaxSalary, TrailMinSalary, CreateUserID, 
-    CreateTime, ModifyUserID, ModifyTime
+    PostEmail, WorkTime, IsTrail, Trailtime, TrailMaxSalary, TrailMinSalary, CreateUserID, 
+    CreateTime, ModifyUserID, ModifyTime, ValidTime
   </sql>
   <sql id="Blob_Column_List">
     PostDesc
@@ -148,26 +149,26 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.hz.employmentsite.model.PcPost">
-    insert into pc_post (PostID, WorkCode, WorkNmae, 
+    insert into pc_post (PostID, WorkCode, WorkName, 
       RecruitCount, CompanyID, PostName, 
       RecordStatus, WorkNature, ValidDay, 
       WorkYear, CultureRank, MaxSalary, 
       MinSalary, Welfare, UserName, 
-      UserMobile, PostEmial, WorkTime, 
+      UserMobile, PostEmail, WorkTime, 
       IsTrail, Trailtime, TrailMaxSalary, 
       TrailMinSalary, CreateUserID, CreateTime, 
-      ModifyUserID, ModifyTime, PostDesc
-      )
-    values (#{postID,jdbcType=VARCHAR}, #{workCode,jdbcType=VARCHAR}, #{workNmae,jdbcType=VARCHAR}, 
+      ModifyUserID, ModifyTime, ValidTime, 
+      PostDesc)
+    values (#{postID,jdbcType=VARCHAR}, #{workCode,jdbcType=VARCHAR}, #{workName,jdbcType=VARCHAR}, 
       #{recruitCount,jdbcType=INTEGER}, #{companyID,jdbcType=VARCHAR}, #{postName,jdbcType=VARCHAR}, 
       #{recordStatus,jdbcType=INTEGER}, #{workNature,jdbcType=VARCHAR}, #{validDay,jdbcType=INTEGER}, 
-      #{workYear,jdbcType=INTEGER}, #{cultureRank,jdbcType=VARCHAR}, #{maxSalary,jdbcType=DECIMAL}, 
+      #{workYear,jdbcType=INTEGER}, #{cultureRank,jdbcType=INTEGER}, #{maxSalary,jdbcType=DECIMAL}, 
       #{minSalary,jdbcType=DECIMAL}, #{welfare,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 
-      #{userMobile,jdbcType=VARCHAR}, #{postEmial,jdbcType=VARCHAR}, #{workTime,jdbcType=INTEGER}, 
-      #{isTrail,jdbcType=BIT}, #{trailtime,jdbcType=TIMESTAMP}, #{trailMaxSalary,jdbcType=DECIMAL}, 
+      #{userMobile,jdbcType=VARCHAR}, #{postEmail,jdbcType=VARCHAR}, #{workTime,jdbcType=INTEGER}, 
+      #{isTrail,jdbcType=BIT}, #{trailtime,jdbcType=INTEGER}, #{trailMaxSalary,jdbcType=DECIMAL}, 
       #{trailMinSalary,jdbcType=DECIMAL}, #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{postDesc,jdbcType=LONGVARCHAR}
-      )
+      #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{validTime,jdbcType=TIMESTAMP}, 
+      #{postDesc,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcPost">
     insert into pc_post
@@ -178,8 +179,8 @@
       <if test="workCode != null">
         WorkCode,
       </if>
-      <if test="workNmae != null">
-        WorkNmae,
+      <if test="workName != null">
+        WorkName,
       </if>
       <if test="recruitCount != null">
         RecruitCount,
@@ -220,8 +221,8 @@
       <if test="userMobile != null">
         UserMobile,
       </if>
-      <if test="postEmial != null">
-        PostEmial,
+      <if test="postEmail != null">
+        PostEmail,
       </if>
       <if test="workTime != null">
         WorkTime,
@@ -250,6 +251,9 @@
       <if test="modifyTime != null">
         ModifyTime,
       </if>
+      <if test="validTime != null">
+        ValidTime,
+      </if>
       <if test="postDesc != null">
         PostDesc,
       </if>
@@ -261,8 +265,8 @@
       <if test="workCode != null">
         #{workCode,jdbcType=VARCHAR},
       </if>
-      <if test="workNmae != null">
-        #{workNmae,jdbcType=VARCHAR},
+      <if test="workName != null">
+        #{workName,jdbcType=VARCHAR},
       </if>
       <if test="recruitCount != null">
         #{recruitCount,jdbcType=INTEGER},
@@ -286,7 +290,7 @@
         #{workYear,jdbcType=INTEGER},
       </if>
       <if test="cultureRank != null">
-        #{cultureRank,jdbcType=VARCHAR},
+        #{cultureRank,jdbcType=INTEGER},
       </if>
       <if test="maxSalary != null">
         #{maxSalary,jdbcType=DECIMAL},
@@ -303,8 +307,8 @@
       <if test="userMobile != null">
         #{userMobile,jdbcType=VARCHAR},
       </if>
-      <if test="postEmial != null">
-        #{postEmial,jdbcType=VARCHAR},
+      <if test="postEmail != null">
+        #{postEmail,jdbcType=VARCHAR},
       </if>
       <if test="workTime != null">
         #{workTime,jdbcType=INTEGER},
@@ -313,7 +317,7 @@
         #{isTrail,jdbcType=BIT},
       </if>
       <if test="trailtime != null">
-        #{trailtime,jdbcType=TIMESTAMP},
+        #{trailtime,jdbcType=INTEGER},
       </if>
       <if test="trailMaxSalary != null">
         #{trailMaxSalary,jdbcType=DECIMAL},
@@ -333,6 +337,9 @@
       <if test="modifyTime != null">
         #{modifyTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="validTime != null">
+        #{validTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="postDesc != null">
         #{postDesc,jdbcType=LONGVARCHAR},
       </if>
@@ -353,8 +360,8 @@
       <if test="row.workCode != null">
         WorkCode = #{row.workCode,jdbcType=VARCHAR},
       </if>
-      <if test="row.workNmae != null">
-        WorkNmae = #{row.workNmae,jdbcType=VARCHAR},
+      <if test="row.workName != null">
+        WorkName = #{row.workName,jdbcType=VARCHAR},
       </if>
       <if test="row.recruitCount != null">
         RecruitCount = #{row.recruitCount,jdbcType=INTEGER},
@@ -378,7 +385,7 @@
         WorkYear = #{row.workYear,jdbcType=INTEGER},
       </if>
       <if test="row.cultureRank != null">
-        CultureRank = #{row.cultureRank,jdbcType=VARCHAR},
+        CultureRank = #{row.cultureRank,jdbcType=INTEGER},
       </if>
       <if test="row.maxSalary != null">
         MaxSalary = #{row.maxSalary,jdbcType=DECIMAL},
@@ -395,8 +402,8 @@
       <if test="row.userMobile != null">
         UserMobile = #{row.userMobile,jdbcType=VARCHAR},
       </if>
-      <if test="row.postEmial != null">
-        PostEmial = #{row.postEmial,jdbcType=VARCHAR},
+      <if test="row.postEmail != null">
+        PostEmail = #{row.postEmail,jdbcType=VARCHAR},
       </if>
       <if test="row.workTime != null">
         WorkTime = #{row.workTime,jdbcType=INTEGER},
@@ -405,7 +412,7 @@
         IsTrail = #{row.isTrail,jdbcType=BIT},
       </if>
       <if test="row.trailtime != null">
-        Trailtime = #{row.trailtime,jdbcType=TIMESTAMP},
+        Trailtime = #{row.trailtime,jdbcType=INTEGER},
       </if>
       <if test="row.trailMaxSalary != null">
         TrailMaxSalary = #{row.trailMaxSalary,jdbcType=DECIMAL},
@@ -425,6 +432,9 @@
       <if test="row.modifyTime != null">
         ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="row.validTime != null">
+        ValidTime = #{row.validTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="row.postDesc != null">
         PostDesc = #{row.postDesc,jdbcType=LONGVARCHAR},
       </if>
@@ -437,7 +447,7 @@
     update pc_post
     set PostID = #{row.postID,jdbcType=VARCHAR},
       WorkCode = #{row.workCode,jdbcType=VARCHAR},
-      WorkNmae = #{row.workNmae,jdbcType=VARCHAR},
+      WorkName = #{row.workName,jdbcType=VARCHAR},
       RecruitCount = #{row.recruitCount,jdbcType=INTEGER},
       CompanyID = #{row.companyID,jdbcType=VARCHAR},
       PostName = #{row.postName,jdbcType=VARCHAR},
@@ -445,22 +455,23 @@
       WorkNature = #{row.workNature,jdbcType=VARCHAR},
       ValidDay = #{row.validDay,jdbcType=INTEGER},
       WorkYear = #{row.workYear,jdbcType=INTEGER},
-      CultureRank = #{row.cultureRank,jdbcType=VARCHAR},
+      CultureRank = #{row.cultureRank,jdbcType=INTEGER},
       MaxSalary = #{row.maxSalary,jdbcType=DECIMAL},
       MinSalary = #{row.minSalary,jdbcType=DECIMAL},
       Welfare = #{row.welfare,jdbcType=VARCHAR},
       UserName = #{row.userName,jdbcType=VARCHAR},
       UserMobile = #{row.userMobile,jdbcType=VARCHAR},
-      PostEmial = #{row.postEmial,jdbcType=VARCHAR},
+      PostEmail = #{row.postEmail,jdbcType=VARCHAR},
       WorkTime = #{row.workTime,jdbcType=INTEGER},
       IsTrail = #{row.isTrail,jdbcType=BIT},
-      Trailtime = #{row.trailtime,jdbcType=TIMESTAMP},
+      Trailtime = #{row.trailtime,jdbcType=INTEGER},
       TrailMaxSalary = #{row.trailMaxSalary,jdbcType=DECIMAL},
       TrailMinSalary = #{row.trailMinSalary,jdbcType=DECIMAL},
       CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
       ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
+      ValidTime = #{row.validTime,jdbcType=TIMESTAMP},
       PostDesc = #{row.postDesc,jdbcType=LONGVARCHAR}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -470,7 +481,7 @@
     update pc_post
     set PostID = #{row.postID,jdbcType=VARCHAR},
       WorkCode = #{row.workCode,jdbcType=VARCHAR},
-      WorkNmae = #{row.workNmae,jdbcType=VARCHAR},
+      WorkName = #{row.workName,jdbcType=VARCHAR},
       RecruitCount = #{row.recruitCount,jdbcType=INTEGER},
       CompanyID = #{row.companyID,jdbcType=VARCHAR},
       PostName = #{row.postName,jdbcType=VARCHAR},
@@ -478,22 +489,23 @@
       WorkNature = #{row.workNature,jdbcType=VARCHAR},
       ValidDay = #{row.validDay,jdbcType=INTEGER},
       WorkYear = #{row.workYear,jdbcType=INTEGER},
-      CultureRank = #{row.cultureRank,jdbcType=VARCHAR},
+      CultureRank = #{row.cultureRank,jdbcType=INTEGER},
       MaxSalary = #{row.maxSalary,jdbcType=DECIMAL},
       MinSalary = #{row.minSalary,jdbcType=DECIMAL},
       Welfare = #{row.welfare,jdbcType=VARCHAR},
       UserName = #{row.userName,jdbcType=VARCHAR},
       UserMobile = #{row.userMobile,jdbcType=VARCHAR},
-      PostEmial = #{row.postEmial,jdbcType=VARCHAR},
+      PostEmail = #{row.postEmail,jdbcType=VARCHAR},
       WorkTime = #{row.workTime,jdbcType=INTEGER},
       IsTrail = #{row.isTrail,jdbcType=BIT},
-      Trailtime = #{row.trailtime,jdbcType=TIMESTAMP},
+      Trailtime = #{row.trailtime,jdbcType=INTEGER},
       TrailMaxSalary = #{row.trailMaxSalary,jdbcType=DECIMAL},
       TrailMinSalary = #{row.trailMinSalary,jdbcType=DECIMAL},
       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},
+      ValidTime = #{row.validTime,jdbcType=TIMESTAMP}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -504,8 +516,8 @@
       <if test="workCode != null">
         WorkCode = #{workCode,jdbcType=VARCHAR},
       </if>
-      <if test="workNmae != null">
-        WorkNmae = #{workNmae,jdbcType=VARCHAR},
+      <if test="workName != null">
+        WorkName = #{workName,jdbcType=VARCHAR},
       </if>
       <if test="recruitCount != null">
         RecruitCount = #{recruitCount,jdbcType=INTEGER},
@@ -529,7 +541,7 @@
         WorkYear = #{workYear,jdbcType=INTEGER},
       </if>
       <if test="cultureRank != null">
-        CultureRank = #{cultureRank,jdbcType=VARCHAR},
+        CultureRank = #{cultureRank,jdbcType=INTEGER},
       </if>
       <if test="maxSalary != null">
         MaxSalary = #{maxSalary,jdbcType=DECIMAL},
@@ -546,8 +558,8 @@
       <if test="userMobile != null">
         UserMobile = #{userMobile,jdbcType=VARCHAR},
       </if>
-      <if test="postEmial != null">
-        PostEmial = #{postEmial,jdbcType=VARCHAR},
+      <if test="postEmail != null">
+        PostEmail = #{postEmail,jdbcType=VARCHAR},
       </if>
       <if test="workTime != null">
         WorkTime = #{workTime,jdbcType=INTEGER},
@@ -556,7 +568,7 @@
         IsTrail = #{isTrail,jdbcType=BIT},
       </if>
       <if test="trailtime != null">
-        Trailtime = #{trailtime,jdbcType=TIMESTAMP},
+        Trailtime = #{trailtime,jdbcType=INTEGER},
       </if>
       <if test="trailMaxSalary != null">
         TrailMaxSalary = #{trailMaxSalary,jdbcType=DECIMAL},
@@ -576,6 +588,9 @@
       <if test="modifyTime != null">
         ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="validTime != null">
+        ValidTime = #{validTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="postDesc != null">
         PostDesc = #{postDesc,jdbcType=LONGVARCHAR},
       </if>
@@ -585,7 +600,7 @@
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hz.employmentsite.model.PcPost">
     update pc_post
     set WorkCode = #{workCode,jdbcType=VARCHAR},
-      WorkNmae = #{workNmae,jdbcType=VARCHAR},
+      WorkName = #{workName,jdbcType=VARCHAR},
       RecruitCount = #{recruitCount,jdbcType=INTEGER},
       CompanyID = #{companyID,jdbcType=VARCHAR},
       PostName = #{postName,jdbcType=VARCHAR},
@@ -593,29 +608,30 @@
       WorkNature = #{workNature,jdbcType=VARCHAR},
       ValidDay = #{validDay,jdbcType=INTEGER},
       WorkYear = #{workYear,jdbcType=INTEGER},
-      CultureRank = #{cultureRank,jdbcType=VARCHAR},
+      CultureRank = #{cultureRank,jdbcType=INTEGER},
       MaxSalary = #{maxSalary,jdbcType=DECIMAL},
       MinSalary = #{minSalary,jdbcType=DECIMAL},
       Welfare = #{welfare,jdbcType=VARCHAR},
       UserName = #{userName,jdbcType=VARCHAR},
       UserMobile = #{userMobile,jdbcType=VARCHAR},
-      PostEmial = #{postEmial,jdbcType=VARCHAR},
+      PostEmail = #{postEmail,jdbcType=VARCHAR},
       WorkTime = #{workTime,jdbcType=INTEGER},
       IsTrail = #{isTrail,jdbcType=BIT},
-      Trailtime = #{trailtime,jdbcType=TIMESTAMP},
+      Trailtime = #{trailtime,jdbcType=INTEGER},
       TrailMaxSalary = #{trailMaxSalary,jdbcType=DECIMAL},
       TrailMinSalary = #{trailMinSalary,jdbcType=DECIMAL},
       CreateUserID = #{createUserID,jdbcType=VARCHAR},
       CreateTime = #{createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
       ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
+      ValidTime = #{validTime,jdbcType=TIMESTAMP},
       PostDesc = #{postDesc,jdbcType=LONGVARCHAR}
     where PostID = #{postID,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.hz.employmentsite.model.PcPost">
     update pc_post
     set WorkCode = #{workCode,jdbcType=VARCHAR},
-      WorkNmae = #{workNmae,jdbcType=VARCHAR},
+      WorkName = #{workName,jdbcType=VARCHAR},
       RecruitCount = #{recruitCount,jdbcType=INTEGER},
       CompanyID = #{companyID,jdbcType=VARCHAR},
       PostName = #{postName,jdbcType=VARCHAR},
@@ -623,22 +639,23 @@
       WorkNature = #{workNature,jdbcType=VARCHAR},
       ValidDay = #{validDay,jdbcType=INTEGER},
       WorkYear = #{workYear,jdbcType=INTEGER},
-      CultureRank = #{cultureRank,jdbcType=VARCHAR},
+      CultureRank = #{cultureRank,jdbcType=INTEGER},
       MaxSalary = #{maxSalary,jdbcType=DECIMAL},
       MinSalary = #{minSalary,jdbcType=DECIMAL},
       Welfare = #{welfare,jdbcType=VARCHAR},
       UserName = #{userName,jdbcType=VARCHAR},
       UserMobile = #{userMobile,jdbcType=VARCHAR},
-      PostEmial = #{postEmial,jdbcType=VARCHAR},
+      PostEmail = #{postEmail,jdbcType=VARCHAR},
       WorkTime = #{workTime,jdbcType=INTEGER},
       IsTrail = #{isTrail,jdbcType=BIT},
-      Trailtime = #{trailtime,jdbcType=TIMESTAMP},
+      Trailtime = #{trailtime,jdbcType=INTEGER},
       TrailMaxSalary = #{trailMaxSalary,jdbcType=DECIMAL},
       TrailMinSalary = #{trailMinSalary,jdbcType=DECIMAL},
       CreateUserID = #{createUserID,jdbcType=VARCHAR},
       CreateTime = #{createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP}
+      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
+      ValidTime = #{validTime,jdbcType=TIMESTAMP}
     where PostID = #{postID,jdbcType=VARCHAR}
   </update>
 </mapper>

+ 3 - 0
src/main/resources/mapping/cquery/PostCQuery.xml

@@ -6,6 +6,9 @@
         left join pc_company company
         on post.CompanyID = company.CompanyID
         <where>
+            <if test="postID != '' and postID != null">
+                and post.postID like Concat('%',#{postID},'%')
+            </if>
             <if test="postName != '' and postName != null">
                 and post.postName like Concat('%',#{postName},'%')
             </if>

+ 1 - 1
vue/src/api/companyService/company.ts

@@ -4,7 +4,7 @@ import {request} from "@/utils/request";
 export function getList(params: any) {
   return request<object>(
     {
-      url: "company/companyService/getList",
+      url: "companyService/company/getList",
       method: 'get',
       params: params,
     },

+ 1 - 2
vue/src/views/companyService/post/edit.vue

@@ -292,7 +292,7 @@ export default defineComponent(
       const cultureLevelList = ref<SelectProps['options']>();
       const companyList = ref<SelectProps['options']>();
       const postStatusList = [{name: '启用', value: 1}, {name: '禁用', value: 0}];
-      const trialStatusList = [{name: '是', value: 1}, {name: '否', value: 0}];
+      const trialStatusList = [{name: '是', value: true}, {name: '否', value: false}];
 
       get('system/dictionary/getDictionaryItemByCodeList', {code: 'CultureLevel'}).then(result => {
         cultureLevelList.value = result;
@@ -336,7 +336,6 @@ export default defineComponent(
     },
     created() {
       const id = history.state.params?.id;
-      console.log(id);
       this.loadData(id);
     }
   })

+ 7 - 32
vue/src/views/companyService/post/index.vue

@@ -72,15 +72,15 @@
 </template>
 
 <script lang="ts">
-import {reactive, ref, computed, defineComponent, createVNode} from 'vue';
-import {DownOutlined, ExclamationCircleOutlined, UpOutlined} from '@ant-design/icons-vue';
+import {reactive, ref, computed, defineComponent} from 'vue';
+import {DownOutlined, UpOutlined} from '@ant-design/icons-vue';
 import type {FormInstance} from 'ant-design-vue';
 import type {TableColumnsType, TableProps} from 'ant-design-vue';
-import {getList, del} from '@/api/companyService/post';
+import {getList} from '@/api/companyService/post';
 import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
 import {getPaginationTotalTitle} from "@/utils/common";
-import {message, Modal} from "ant-design-vue";
 import dayjs from 'dayjs';
+import { useRoute } from 'vue-router';
 import {useTabsViewStore} from "@/store/modules/tabsView";
 export default defineComponent({
   components: { DownOutlined, UpOutlined, BExportExcel},
@@ -171,32 +171,7 @@ export default defineComponent({
     }
 
     const onDel = (item: any) => {
-      if (item) {
-        formState.selectedRowKeys.push(item.InstitutionID as never)
-      }
-
-      if (formState.selectedRowKeys.length <= 0) {
-        message.warning('请选择需要删除的数据!');
-        return false;
-      }
-
-      Modal.confirm({
-        title: '确认删除选中的运营机构?',
-        icon: createVNode(ExclamationCircleOutlined),
-        content: '',
-        okText: '确认删除',
-        okType: 'danger',
-        okButtonProps: {},
-        cancelText: '取消',
-        onOk() {
-          del(formState.selectedRowKeys).then(() => {
-            loadData();
-          });
-        },
-        onCancel() {
-
-        },
-      });
+      console.log(item);
     };
 
     const importPost = () => {
@@ -232,8 +207,8 @@ export default defineComponent({
     this.loadData();
   },
   activated() {
-    if (history.state.params?.reload)
-      this.loadData();
+    const route = useRoute();
+    if (route.params.reload) this.loadData();
   }
 });
 </script>