1、增加企业查询条件

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/web/AppWebContentController.java

@@ -4,7 +4,7 @@ package com.citu.module.menduner.system.controller.app.common.web;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.controller.base.web.WebContentRespVO;
-import com.citu.module.menduner.system.dal.dataobject.web.ContentStyle;
+import com.citu.module.menduner.system.dal.dataobject.ContentStyle;
 import com.citu.module.menduner.system.dal.dataobject.web.WebContentDO;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.service.web.WebContentService;
@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import com.citu.framework.security.core.annotations.PreAuthenticated;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/vo/EnterprisePageReqVO.java

@@ -41,6 +41,13 @@ public class EnterprisePageReqVO extends PageParam {
     @Schema(description = "人员规模（0-20人，20-99人，100-499人，500-999人，1000-9999人，9999人以上）")
     private String scale;
 
+    @Schema(description = "vip标识")
+    private String vipFlag;
+
+    @Schema(description = "vip过期时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] vipExpireDate;
+
     @Schema(description = "帐号状态（0正常 1停用）")
     private String status;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/job/JobAdvertisedRespVO.java

@@ -119,6 +119,10 @@ public class JobAdvertisedRespVO {
     @ExcelProperty("雇佣金额")
     private Long hirePrice;
 
+    @Schema(description = "刷新时间")
+    @ExcelProperty("刷新时间")
+    private LocalDateTime refreshTime;
+
     @Schema(description = "职位状态", example = "2")
     @ExcelProperty(value = "职位状态", converter = DictConvert.class)
     @DictFormat(MENDUNER_JOB_STATUS)

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/web/WebContentRespVO.java

@@ -3,9 +3,7 @@ package com.citu.module.menduner.system.controller.base.web;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.citu.module.menduner.system.dal.dataobject.web.ContentStyle;
+import com.citu.module.menduner.system.dal.dataobject.ContentStyle;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/web/WebContentSaveReqVO.java

@@ -1,6 +1,6 @@
 package com.citu.module.menduner.system.controller.base.web;
 
-import com.citu.module.menduner.system.dal.dataobject.web.ContentStyle;
+import com.citu.module.menduner.system.dal.dataobject.ContentStyle;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/web/ContentStyle.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/ContentStyle.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.dal.dataobject.web;
+package com.citu.module.menduner.system.dal.dataobject;
 
 import lombok.Data;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/web/WebContentDO.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.citu.framework.tenant.core.db.TenantBaseDO;
+import com.citu.module.menduner.system.dal.dataobject.ContentStyle;
 import lombok.*;
 
 import java.util.List;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseMapper.java

@@ -70,6 +70,8 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
         query.eqIfPresent(EnterpriseDO::getIndustryId, reqVO.getIndustryId());
         query.eqIfPresent(EnterpriseDO::getFinancingStatus, reqVO.getFinancingStatus());
         query.eqIfPresent(EnterpriseDO::getScale, reqVO.getScale());
+        query.eqIfPresent(EnterpriseDO::getVipFlag, reqVO.getVipFlag());
+        query.betweenIfPresent(EnterpriseDO::getVipExpireDate, reqVO.getVipExpireDate());
         query.betweenIfPresent(EnterpriseDO::getCreateTime, reqVO.getCreateTime());
         query.orderByDesc(EnterpriseDO::getId);
         return selectJoinPage(reqVO, EnterpriseDetailRespVO.class, query);

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

@@ -566,6 +566,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
 
     void enable(JobAdvertisedDO job) {
         job.setStatus(JobStatusEnum.ENABLE.getStatus());
+        job.setUpdateTime(LocalDateTime.now());
         mapper.updateById(job);
         jobDataSync(job, SyncConstants.UPDATE);
     }
@@ -581,6 +582,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
         if (null != expireTime) {
             job.setExpireTime(expireTime);
         }
+        job.setUpdateTime(LocalDateTime.now());
         mapper.updateById(job);
         jobDataSync(job, SyncConstants.UPDATE);
     }
@@ -601,6 +603,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
 
     void disable(JobAdvertisedDO job) {
         job.setStatus(JobStatusEnum.DISABLE.getStatus());
+        job.setUpdateTime(LocalDateTime.now());
         mapper.updateById(job);
         jobDataSync(job, SyncConstants.UPDATE);
     }
@@ -610,7 +613,9 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
     public void refresh(List<Long> ids) {
         for (Long id : ids) {
             JobAdvertisedDO job = get(id);
-            job.setRefreshTime(LocalDateTime.now());
+            LocalDateTime time = LocalDateTime.now();
+            job.setRefreshTime(time);
+            job.setUpdateTime(time);
             mapper.updateById(job);
             jobDataSync(job, SyncConstants.UPDATE);
         }