Merge remote-tracking branch 'origin/master'

src/main/java/com/hz/employmentsite/controller/companyService/PostController.java

@@ -163,7 +163,7 @@ public class PostController {
         } else {
             ExcelHelper excelHelper = new ExcelHelper();
             ExcelHelper.ExcelData data = excelHelper.new ExcelData();
-            data.setTitles(Arrays.asList(new String[]{"序号", "岗位名称", "招聘人数", "开始日期", "结束日期", "招聘企业", "所属驿站", "岗位状态", "工种名称", "文化程度", "薪酬", "联系人", "联系电话"}));
+            data.setTitles(Arrays.asList(new String[]{"序号", "岗位名称", "工种名称", "招聘人数", "开始日期", "结束日期", "招聘企业", "所属驿站", "岗位状态", "学历要求", "薪酬", "联系人", "联系电话"}));
             int i = 0;
             List<List<Object>> rowsData = new ArrayList();
             for (PostVo item : result.getList()) {
@@ -171,13 +171,13 @@ public class PostController {
                 ++i;
                 row.add(i);
                 row.add(item.professionName);
+                row.add(item.workName);
                 row.add(item.recruitCount);
                 row.add(dateUtils.dateToStr(item.startTime));
                 row.add(dateUtils.dateToStr(item.endTime));
                 row.add(item.companyName);
                 row.add(item.getSiteName());
-                row.add(item.recordStatus == 1 ? "启用" : "停用");
-                row.add(item.workName);
+                row.add(item.recordStatus == 1 ? "启用" : "禁用");
                 row.add(item.cultureLevelName);
                 if(item.minSalary!=null){
                     if(item.maxSalary!=null){

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

@@ -499,6 +499,8 @@ public class PostServiceImpl implements PostService {
                         .findFirst().orElse(new SysDictionaryItem()).getCode();
                 if (item.workCode == null || item.workCode == "") {
                     errorInfo += "工种不存在！";
+                }else{
+                    item.workName = item.getWorkCategoryName();
                 }
             }
 

vue/src/views/companyService/post/index.vue

@@ -131,7 +131,7 @@
           <template v-if="column.key === 'recordStatus'">
             <div style="text-align: center;">
               <label v-if="record.recordStatus==1" style="color:green;" >启用</label>
-              <label v-if="record.recordStatus==0" style="color:red;">停用</label>
+              <label v-if="record.recordStatus==0" style="color:red;">禁用</label>
             </div>
           </template>
         </template>
@@ -206,7 +206,7 @@ export default defineComponent({
         {cnName: '岗位最高月薪', enName: 'maxSalary', width: 100},
         {cnName: '岗位最低月薪', enName: 'minSalary', width: 100},
         {cnName: '是否有试用期', enName: 'isTrailName', width: 100},
-        {cnName: '试用期时长(月)', enName: 'trailtime', width: 100},
+        {cnName: '试用期时长(月)', enName: 'trailMonths', width: 100},
         {cnName: '试用期最高薪酬', enName: 'trailMaxSalary', width: 100},
         {cnName: '试用期最低薪酬', enName: 'trailMinSalary', width: 100},
         {cnName: '福利待遇', enName: 'welfare', width: 100},
@@ -230,6 +230,7 @@ export default defineComponent({
         isDisabled: true
       },
       {title: '岗位名称', dataIndex: 'professionName', key: 'professionName', align: "center"},
+      {title: '工种名称', dataIndex: 'workName', key: 'workName', width: 200, align: "center"},
       {title: '招聘人数', dataIndex: 'recruitCount', key: 'recruitCount', width: 120, align: "center"},
       {title: '开始日期', dataIndex: 'startTime', key: 'startTime', width: 120, align: "center",
         customRender: (item) => {