diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppOutdoorFairController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppOutdoorFairController.java index 12d7e32..7a5a9f6 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppOutdoorFairController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppOutdoorFairController.java @@ -351,7 +351,8 @@ public class AppOutdoorFairController extends BaseController jobFair.setJobFairEndTime(fair.getEndTime()); jobFair.setJobFairHostUnit(fair.getHostUnit()); jobFair.setJobFairOrganizeUnit(fair.getHostUnit()); - jobFair.setJobFairIntroduction(StringUtils.isNotBlank(fair.getVenueName()) ? fair.getVenueName() : fair.getAddress()); + jobFair.setJobFairIntroduction(fair.getFairIntroduction()); + jobFair.setJobFairProcess(fair.getFairProcess()); jobFair.setJobFairImage(fair.getPhotoUrl()); jobFair.setJobFairSignUpStartTime(fair.getApplyStartTime()); jobFair.setJobFairSignUpEndTime(fair.getApplyEndTime()); diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/OutdoorFair.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/OutdoorFair.java index 4405421..2466431 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/OutdoorFair.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/OutdoorFair.java @@ -101,6 +101,14 @@ public class OutdoorFair extends BaseEntity @ApiModelProperty("招聘会照片") private String photoUrl; + @Excel(name = "招聘会简介") + @ApiModelProperty("招聘会简介") + private String fairIntroduction; + + @Excel(name = "招聘会整体流程") + @ApiModelProperty("招聘会整体流程") + private String fairProcess; + @TableField(exist = false) @ApiModelProperty("当前企业ID") private Long companyId; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/rc/PublicJobFair.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/rc/PublicJobFair.java index d7d8e5a..d058e04 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/rc/PublicJobFair.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/rc/PublicJobFair.java @@ -57,6 +57,9 @@ public class PublicJobFair implements Serializable { @ApiModelProperty("招聘会简介") private String jobFairIntroduction; + @ApiModelProperty("招聘会整体流程") + private String jobFairProcess; + @ApiModelProperty("备注") private String jobFairRemark; diff --git a/sql/cms_outdoor_fair.sql b/sql/cms_outdoor_fair.sql index 79b2415..56a7a1a 100644 --- a/sql/cms_outdoor_fair.sql +++ b/sql/cms_outdoor_fair.sql @@ -24,6 +24,8 @@ CREATE TABLE IF NOT EXISTS "cms_outdoor_fair" ( "apply_end_time" TIMESTAMP(0) NOT NULL, "online_apply" BOOLEAN NOT NULL DEFAULT FALSE, "photo_url" VARCHAR(500), + "fair_introduction" TEXT, + "fair_process" TEXT, "create_by" VARCHAR(64) DEFAULT '', "create_time" TIMESTAMP(0), "update_by" VARCHAR(64) DEFAULT '', @@ -48,6 +50,8 @@ COMMENT ON COLUMN "cms_outdoor_fair"."apply_start_time" IS '开放申请时间'; COMMENT ON COLUMN "cms_outdoor_fair"."apply_end_time" IS '截止申请时间'; COMMENT ON COLUMN "cms_outdoor_fair"."online_apply" IS '是否开启线上申请'; COMMENT ON COLUMN "cms_outdoor_fair"."photo_url" IS '招聘会照片'; +COMMENT ON COLUMN "cms_outdoor_fair"."fair_introduction" IS '招聘会简介'; +COMMENT ON COLUMN "cms_outdoor_fair"."fair_process" IS '招聘会整体流程'; COMMENT ON COLUMN "cms_outdoor_fair"."del_flag" IS '删除标志(0代表存在 2代表删除)'; CREATE INDEX IF NOT EXISTS "idx_cms_outdoor_fair_title" ON "cms_outdoor_fair" ("title"); diff --git a/sql/migration_outdoor_fair_content.sql b/sql/migration_outdoor_fair_content.sql new file mode 100644 index 0000000..d7bce15 --- /dev/null +++ b/sql/migration_outdoor_fair_content.sql @@ -0,0 +1,11 @@ +-- 户外招聘会内容字段:招聘会简介、招聘会整体流程 +-- 瀚高数据库 / PostgreSQL 兼容 + +ALTER TABLE "cms_outdoor_fair" + ADD COLUMN IF NOT EXISTS "fair_introduction" TEXT; + +ALTER TABLE "cms_outdoor_fair" + ADD COLUMN IF NOT EXISTS "fair_process" TEXT; + +COMMENT ON COLUMN "cms_outdoor_fair"."fair_introduction" IS '招聘会简介'; +COMMENT ON COLUMN "cms_outdoor_fair"."fair_process" IS '招聘会整体流程';