menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/major/MajorRespVO.java

@@ -19,6 +19,10 @@ public class MajorRespVO {
     @ExcelProperty("id")
     private Long id;
 
+    @Schema(description = "类别")
+    @ExcelProperty("类别")
+    private String categorize;
+
     @Schema(description = "专业名称")
     @ExcelProperty("专业名称")
     private String nameCn;
@@ -32,6 +36,9 @@ public class MajorRespVO {
     @DictFormat(MENDUNER_STATUS)
     private String status;
 
+    @Schema(description = "顺序", example = "1")
+    private Integer sort;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/major/MajorSaveReqVO.java

@@ -22,4 +22,7 @@ public class MajorSaveReqVO {
     @NotBlank(message = "{1_099_000_001}")
     private String status;
 
+    @Schema(description = "顺序", example = "1")
+    private Integer sort;
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/job/JobAdvertisedDO.java

@@ -39,6 +39,7 @@ public class JobAdvertisedDO extends TenantBaseDO {
     /**
      * 来源方关联id
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Long bizId;
     /**
      * 企业id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/major/MajorDO.java

@@ -2,6 +2,7 @@ package com.citu.module.menduner.system.dal.dataobject.major;
 
 import com.citu.framework.tenant.core.db.TenantBaseDO;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -51,5 +52,8 @@ public class MajorDO extends TenantBaseDO {
      * 枚举 {@link  MendunerStatusEnum 对应的类}
      */
     private String status;
-
+    /**
+     * 排序
+     */
+    private Integer sort;
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/major/MajorMapper.java

@@ -25,7 +25,7 @@ public interface MajorMapper extends BaseMapperX<MajorDO> {
                 .likeRightIfPresent(MajorDO::getNameEn, reqVO.getNameEn())
                 .eqIfPresent(MajorDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(MajorDO::getCreateTime, reqVO.getCreateTime())
-                .orderByAsc(MajorDO::getId));
+                .orderByAsc(MajorDO::getSort));
     }
 
     default List<MajorDO> searchByName(String name) {
@@ -38,7 +38,7 @@ public interface MajorMapper extends BaseMapperX<MajorDO> {
                         .likeRight(MajorDO::getNameEn, name);
             });
         }
-        wrapperX.orderByAsc(MajorDO::getUpdater);
+        wrapperX.orderByAsc(MajorDO::getSort);
 
         return selectList(wrapperX);
     }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/fair/FairServiceImpl.java

@@ -298,6 +298,8 @@ public class FairServiceImpl implements FairService {
 
         // 购买门票的企业, 增加发布职位的数量
         fairWhiteService.increaseAdmissionNum(LoginUserContext.getEnterpriseId(), reqVO.getJobFairId());
+        // 清除招聘会职位标识
+        jobAdvertisedService.cleanFairMark(LoginUserContext.getEnterpriseId(), reqVO.getJobFairId(), reqVO.getJobId());
 
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/fair/FairWhiteServiceImpl.java

@@ -46,11 +46,11 @@ public class FairWhiteServiceImpl implements FairWhiteService {
 
     @Override
     @DSTransactional
-    public void addWhiteList(Long jobFairId, List<Long> enterpriseIds,Integer sort) {
+    public void addWhiteList(Long jobFairId, List<Long> enterpriseIds, Integer sort) {
         for (Long enterpriseId : enterpriseIds) {
             FairWhiteDO fairWhiteDO = get(enterpriseId, jobFairId);
             if (null != fairWhiteDO) {
-                if(!Objects.equals(fairWhiteDO.getSort(), sort)) {
+                if (!Objects.equals(fairWhiteDO.getSort(), sort)) {
                     fairWhiteDO.setSort(sort);
                     mapper.updateById(fairWhiteDO);
                 }
@@ -150,7 +150,6 @@ public class FairWhiteServiceImpl implements FairWhiteService {
             return;
         }
         mapper.increase(enterpriseId, jobFairId, 1);
-
     }
 
     @Override

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/interview/InterviewInviteServiceImpl.java

@@ -294,10 +294,10 @@ public class InterviewInviteServiceImpl implements InterviewInviteService {
         if (LocalDateTime.now().isAfter(reqVO.getTime())) {
             throw exception(INTERVIEW_INVITE_TIME_LESS_THAN_NOW);
         }
-        if (mapper.checkExistsTime(reqVO.getId(), enterpriseId, userId, reqVO.getJobId(), reqVO.getTime())) {
-            // 该时间段已有其他面试者预约
-            throw exception(INTERVIEW_INVITE_TIME_OVERLAP);
-        }
+//        if (mapper.checkExistsTime(reqVO.getId(), enterpriseId, userId, reqVO.getJobId(), reqVO.getTime())) {
+//            // 该时间段已有其他面试者预约
+//            throw exception(INTERVIEW_INVITE_TIME_OVERLAP);
+//        }
 
         if (!isMobile(reqVO.getInvitePhone())) {
             throw exception(INTERVIEW_INVITE_INVITE_PHONE_FORMAT_ERROR);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedService.java

@@ -96,6 +96,14 @@ public interface JobAdvertisedService {
      **/
     List<JobAdvertisedDO> getListByEnterpriseIdAndType(Long enterpriseId, List<String> types);
 
+    /**
+     * 清除招聘会职位标识
+     *
+     * @param enterpriseId 企业id
+     * @param jobFairId    招聘会id
+     **/
+    void cleanFairMark(Long enterpriseId, Long jobFairId,Long jobId);
+
     // ========== 求职端 ==========
 
     /**

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedServiceImpl.java

@@ -9,6 +9,7 @@ import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.dict.core.DictFrameworkUtils;
+import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.menduner.system.aop.VipEntitlementCheck;
 import com.citu.module.menduner.system.aop.VipEntitlementCheckAspect;
@@ -31,6 +32,7 @@ import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedExtendDO;
 import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedExtendMapper;
 import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedMapper;
+import com.citu.module.menduner.system.enums.job.JobSourceEnum;
 import com.citu.module.menduner.system.enums.job.JobStatusEnum;
 import com.citu.module.menduner.system.enums.sync.OperateTypeEnum;
 import com.citu.module.menduner.system.enums.sync.SyncConstants;
@@ -165,6 +167,22 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
         return mapper.selectListByEnterpriseIdAndTypeAndNotHire(enterpriseId, types);
     }
 
+    @Override
+    public void cleanFairMark(Long enterpriseId, Long jobFairId,Long jobId) {
+        List<JobAdvertisedDO> List = mapper.selectList(new LambdaQueryWrapperX<JobAdvertisedDO>()
+                .eq(JobAdvertisedDO::getEnterpriseId, enterpriseId)
+                .eq(JobAdvertisedDO::getSource, JobSourceEnum.FAIR.getType())
+                .eq(JobAdvertisedDO::getBizId, jobFairId)
+                .eqIfPresent(JobAdvertisedDO::getId, jobId)
+        );
+        for (JobAdvertisedDO jobAdvertisedDO : List) {
+            jobAdvertisedDO.setSource(JobSourceEnum.MANAGER.getType());
+            jobAdvertisedDO.setBizId(null);
+            mapper.updateById(jobAdvertisedDO);
+        }
+
+    }
+
     @Override
     public PageResult<AppJobAdvertisedHomeRespVO> getRecommendedPage(PageParam pageParam) {
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/handler/JobFairOperateHandler.java

@@ -86,7 +86,7 @@ public class JobFairOperateHandler implements JobOperateHandler {
         // 判断之前职位不是属于招聘会，现在改为招聘会的情况
         if (JobSourceEnum.FAIR.getType().equals(job.getSource())) {
             // 基于招聘会修改职位
-            if(JobStatusEnum.ENABLE.getStatus().equals(job.getStatus())){
+            if(JobStatusEnum.ENABLE.getStatus().equals(oldJob.getStatus())){
                 // 修改完招聘会后，同步职位到招聘会里面
                 fairService.joinJobFair(joinJobFairReqVO
                         .builder()