bug修改

src/main/java/com/jeeplus/modules/api/dpposition/entity/DpPositionForApplyAPI.java

@@ -19,473 +19,485 @@ import java.util.List;
 
 /**
  * 自发布岗位Entity
+ *
  * @author lifei
  * @version 2019-06-28
  */
 public class DpPositionForApplyAPI extends DataEntity<DpPositionForApplyAPI> {
 
-	private static final long serialVersionUID = 1L;
-	private HpUser hpUser;		// 用户
-	private String positionName;		// 岗位标题
-	private String positionDetail;		// 职位描述
-	private Integer positionCategory;		// 职位类型（8：C端自发布全职 9：C端自发布兼职）
-	private String fulltimePositionType;		// 全职职位类别（0：服务员 1：校园活动 2：实习 3：调研 4：送餐员 5：导购 6：网络编辑 7：普工 8：设计 9：文员助理 10：派单 11：销售 12：安保 13：礼仪 14：促销 15：翻译 16：客服 17：演出 18：家教导师 19：模特 20：快递分拣 21：厨师 22：物流仓储 23：贸易采购 24：技工 25：保洁 26：才艺技能 27：其它）
-	private String parttimePositionType;		// 兼职职位类别（0：文员助理 1：市场推广 2：家教培训 3：餐饮服务 4：促销导购 5：物流仓储 6：展会演出 7：才艺技能 8：客服话务 9：代驾司机 10：app试玩 11：线上推广 12：编辑 13：模特 14：技工 15：保洁 16：其它）
-	private Integer recruitNumber;		// （兼职）招聘人数/（全职）接受报名人数（null或0视为若干）
-	private String basicSalary;		// 基础薪资（全职）（0：1000~2000 1：2001~3000 2：3001~4000 3：4001~5000 4：5001~6000 5：6001~7000 6：7001~8000 7：8001~9000 8：9001~10000 9：10000以上）
-	private String salaryPeriod;		// 薪资周期（兼职）（0：天 1：周 2：月：3 次 4：时 5：其他）
-	private String salary;		// 基本薪资（兼职）
-	private String otherSalary;		// 提成（兼职）
-	private String salaryStructure;		// 薪资结构（全职）
-	private String welfare;		// 岗位福利（0：包住宿 1：包工作餐 2：交通补助 3：加班补助 4：有提成 5：奖金 6：转正机会 7.五险一金），可多选，数组存储
-	private String settlementMethod;		// 结算方式（0：月结 1：周结 2：日结 3：完工结 4：其他）
-	private String hasRegularBus;		// 班车（全职）（0：没有 1：有）
-	private String qualification;		// 学历要求（0：不限 1：小学 2：中学 3：高中 4：大专 5：本科 6：研究生 7：博士 8：博士后 15：其他）
-	private String ageRange;		// 年龄要求（全职）
-	private Integer gender;		// 性别要求（0：不限 1：男 2：女）
-	private String workExperience;		// 工作经验（全职）（0：不限 1：1~2年 2：2~3年 3：3~5年 4：5年以上）
-	private Boolean isHealthCertification;		// 是否需要健康证（兼职）（0：不需要 1：需要）
-	private String workDate;		// 工作日期（兼职）（多天，数组存储）
-	private String startWorkTime;		// 开始工作时段（兼职）
-	private String endWordTime;		// 结束工作时段（兼职）
-	private Boolean requireGroup;		// 是否需要打工团队（0：不需要 1：需要）
-	private Boolean isPublishNationwide;		// 是否全国发布（0：不是 1：是）
-	private String contactPerson;		// 联系人
-	private String contactPhone;		// 联系电话
-	private Date endDate;		// 截至时间（岗位招聘结束时间，不填即为长期招聘）
-	private Boolean isPause;		// 是否暂停（0：不是 1：是）
-	private String authenticationStatus;		// 认证状态（1：未审核 2：未通过 3：已通过）
-	private Boolean isOn;		// 是否上架（0：下架 1：上架）
-	private String enterpriseName; //企业名称
-	private List<HpPositionAddress> hpPositionAddressList;   //岗位地址
-	private Integer count;  //新报名个数
-	private DpEnterpriseAuthentication dpEnterpriseAuthentication;//自发布企业
-	private HpCompany hpCompany;
-	private String regularBus;
-	private String specialWelfare;
-	private String workDay;   //存放workDate
-	private Date publishTime;        // 发布时间（岗位招聘开始时间），岗位招聘对外显示条件为发布时间到截至时间，且岗位未暂停招聘
-	private Date authenticationTime; //认证时间
-	private String authenticationBy;  //认证操作者
-	private HpMember hpMember;  //会员表用户
-	private String workTime;  //存放startWorkTime与endWordTime拼接的时间
-
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	public Date getAuthenticationTime() {
-		return authenticationTime;
-	}
-
-	public void setAuthenticationTime(Date authenticationTime) {
-		this.authenticationTime = authenticationTime;
-	}
-
-	public String getAuthenticationBy() {
-		return authenticationBy;
-	}
-
-	public void setAuthenticationBy(String authenticationBy) {
-		this.authenticationBy = authenticationBy;
-	}
-
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	public Date getPublishTime() {
-		return publishTime;
-	}
-
-	public void setPublishTime(Date publishTime) {
-		this.publishTime = publishTime;
-	}
-
-	public String getWorkDay() {
-		return workDay;
-	}
-
-	public void setWorkDay(String workDay) {
-		this.workDay = workDay;
-	}
-
-	public String getSpecialWelfare() {
-		return specialWelfare;
-	}
-
-	public void setSpecialWelfare(String specialWelfare) {
-		this.specialWelfare = specialWelfare;
-	}
-
-
-	public String getRegularBus() {
-		return regularBus;
-	}
-
-	public void setRegularBus(String regularBus) {
-		this.regularBus = regularBus;
-	}
-
-	public DpEnterpriseAuthentication getDpEnterpriseAuthentication() {
-		return dpEnterpriseAuthentication;
-	}
-
-	public void setDpEnterpriseAuthentication(DpEnterpriseAuthentication dpEnterpriseAuthentication) {
-		this.dpEnterpriseAuthentication = dpEnterpriseAuthentication;
-	}
-
-	public HpCompany getHpCompany() {
-		return hpCompany;
-	}
-
-	public void setHpCompany(HpCompany hpCompany) {
-		this.hpCompany = hpCompany;
-	}
-
-	public DpPositionForApplyAPI() {
-		super();
-		this.setIdType(IDTYPE_AUTO);
-	}
-
-	public Integer getCount() {
-		return count;
-	}
-
-	public void setCount(Integer count) {
-		this.count = count;
-	}
-
-	public List<HpPositionAddress> getHpPositionAddressList() {
-		return hpPositionAddressList;
-	}
-
-	public void setHpPositionAddressList(List<HpPositionAddress> hpPositionAddressList) {
-		this.hpPositionAddressList = hpPositionAddressList;
-	}
-
-	public String getEnterpriseName() {
-		return enterpriseName;
-	}
-
-	public void setEnterpriseName(String enterpriseName) {
-		this.enterpriseName = enterpriseName;
-	}
-
-	public DpPositionForApplyAPI(String id){
-		super(id);
-	}
+    private static final long serialVersionUID = 1L;
+    private HpUser hpUser;        // 用户
+    private String positionName;        // 岗位标题
+    private String positionDetail;        // 职位描述
+    private Integer positionCategory;        // 职位类型（8：C端自发布全职 9：C端自发布兼职）
+    private String fulltimePositionType;        // 全职职位类别（0：服务员 1：校园活动 2：实习 3：调研 4：送餐员 5：导购 6：网络编辑 7：普工 8：设计 9：文员助理 10：派单 11：销售 12：安保 13：礼仪 14：促销 15：翻译 16：客服 17：演出 18：家教导师 19：模特 20：快递分拣 21：厨师 22：物流仓储 23：贸易采购 24：技工 25：保洁 26：才艺技能 27：其它）
+    private String parttimePositionType;        // 兼职职位类别（0：文员助理 1：市场推广 2：家教培训 3：餐饮服务 4：促销导购 5：物流仓储 6：展会演出 7：才艺技能 8：客服话务 9：代驾司机 10：app试玩 11：线上推广 12：编辑 13：模特 14：技工 15：保洁 16：其它）
+    private Integer recruitNumber;        // （兼职）招聘人数/（全职）接受报名人数（null或0视为若干）
+    private String basicSalary;        // 基础薪资（全职）（0：1000~2000 1：2001~3000 2：3001~4000 3：4001~5000 4：5001~6000 5：6001~7000 6：7001~8000 7：8001~9000 8：9001~10000 9：10000以上）
+    private String salaryPeriod;        // 薪资周期（兼职）（0：天 1：周 2：月：3 次 4：时 5：其他）
+    private String salary;        // 基本薪资（兼职）
+    private String otherSalary;        // 提成（兼职）
+    private String salaryStructure;        // 薪资结构（全职）
+    private String welfare;        // 岗位福利（0：包住宿 1：包工作餐 2：交通补助 3：加班补助 4：有提成 5：奖金 6：转正机会 7.五险一金），可多选，数组存储
+    private String settlementMethod;        // 结算方式（0：月结 1：周结 2：日结 3：完工结 4：其他）
+    private String hasRegularBus;        // 班车（全职）（0：没有 1：有）
+    private String qualification;        // 学历要求（0：不限 1：小学 2：中学 3：高中 4：大专 5：本科 6：研究生 7：博士 8：博士后 15：其他）
+    private String ageRange;        // 年龄要求（全职）
+    private Integer gender;        // 性别要求（0：不限 1：男 2：女）
+    private String workExperience;        // 工作经验（全职）（0：不限 1：1~2年 2：2~3年 3：3~5年 4：5年以上）
+    private Boolean isHealthCertification;        // 是否需要健康证（兼职）（0：不需要 1：需要）
+    private String workDate;        // 工作日期（兼职）（多天，数组存储）
+    private String startWorkTime;        // 开始工作时段（兼职）
+    private String endWordTime;        // 结束工作时段（兼职）
+    private Boolean requireGroup;        // 是否需要打工团队（0：不需要 1：需要）
+    private Boolean isPublishNationwide;        // 是否全国发布（0：不是 1：是）
+    private String contactPerson;        // 联系人
+    private String contactPhone;        // 联系电话
+    private Date endDate;        // 截至时间（岗位招聘结束时间，不填即为长期招聘）
+    private Boolean isPause;        // 是否暂停（0：不是 1：是）
+    private String authenticationStatus;        // 认证状态（1：未审核 2：未通过 3：已通过）
+    private Boolean isOn;        // 是否上架（0：下架 1：上架）
+    private String enterpriseName; //企业名称
+    private List<HpPositionAddress> hpPositionAddressList;   //岗位地址
+    private Integer count;  //新报名个数
+    private DpEnterpriseAuthentication dpEnterpriseAuthentication;//自发布企业
+    private HpCompany hpCompany;
+    private String regularBus;
+    private String specialWelfare;
+    private String workDay;   //存放workDate
+    private Date publishTime;        // 发布时间（岗位招聘开始时间），岗位招聘对外显示条件为发布时间到截至时间，且岗位未暂停招聘
+    private Date authenticationTime; //认证时间
+    private String authenticationBy;  //认证操作者
+    private HpMember hpMember;  //会员表用户
+    private String workTime;  //存放startWorkTime与endWordTime拼接的时间
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    public Date getAuthenticationTime() {
+        return authenticationTime;
+    }
+
+    public void setAuthenticationTime(Date authenticationTime) {
+        this.authenticationTime = authenticationTime;
+    }
+
+    public String getAuthenticationBy() {
+        return authenticationBy;
+    }
+
+    public void setAuthenticationBy(String authenticationBy) {
+        this.authenticationBy = authenticationBy;
+    }
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public Date getPublishTime() {
+        return publishTime;
+    }
+
+    public void setPublishTime(Date publishTime) {
+        this.publishTime = publishTime;
+    }
+
+    public String getWorkDay() {
+        return workDay;
+    }
+
+    public void setWorkDay(String workDay) {
+        this.workDay = workDay;
+    }
+
+    public String getSpecialWelfare() {
+        return specialWelfare;
+    }
+
+    public void setSpecialWelfare(String specialWelfare) {
+        this.specialWelfare = specialWelfare;
+    }
+
+
+    public String getRegularBus() {
+        return regularBus;
+    }
+
+    public void setRegularBus(String regularBus) {
+        this.regularBus = regularBus;
+    }
+
+    public DpEnterpriseAuthentication getDpEnterpriseAuthentication() {
+        return dpEnterpriseAuthentication;
+    }
+
+    public void setDpEnterpriseAuthentication(DpEnterpriseAuthentication dpEnterpriseAuthentication) {
+        this.dpEnterpriseAuthentication = dpEnterpriseAuthentication;
+    }
+
+    public HpCompany getHpCompany() {
+        return hpCompany;
+    }
+
+    public void setHpCompany(HpCompany hpCompany) {
+        this.hpCompany = hpCompany;
+    }
+
+    public DpPositionForApplyAPI() {
+        super();
+        this.setIdType(IDTYPE_AUTO);
+    }
+
+    public Integer getCount() {
+        return count;
+    }
+
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+
+    public List<HpPositionAddress> getHpPositionAddressList() {
+        return hpPositionAddressList;
+    }
+
+    public void setHpPositionAddressList(List<HpPositionAddress> hpPositionAddressList) {
+        this.hpPositionAddressList = hpPositionAddressList;
+    }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public DpPositionForApplyAPI(String id) {
+        super(id);
+    }
 
-	public HpUser getHpUser() {
-		return hpUser;
-	}
+    public HpUser getHpUser() {
+        return hpUser;
+    }
 
-	public void setHpUser(HpUser hpUser) {
-		this.hpUser = hpUser;
-	}
+    public void setHpUser(HpUser hpUser) {
+        this.hpUser = hpUser;
+    }
 
-	@ExcelField(title="岗位标题", align=2, sort=2)
-	public String getPositionName() {
-		return positionName;
-	}
+    @ExcelField(title = "岗位标题", align = 2, sort = 2)
+    public String getPositionName() {
+        return positionName;
+    }
 
-	public void setPositionName(String positionName) {
-		this.positionName = positionName;
-	}
+    public void setPositionName(String positionName) {
+        this.positionName = positionName;
+    }
 
-	@ExcelField(title="职位描述", align=2, sort=3)
-	public String getPositionDetail() {
-		return positionDetail;
-	}
+    @ExcelField(title = "职位描述", align = 2, sort = 3)
+    public String getPositionDetail() {
+        return positionDetail;
+    }
 
-	public void setPositionDetail(String positionDetail) {
-		this.positionDetail = positionDetail;
-	}
+    public void setPositionDetail(String positionDetail) {
+        this.positionDetail = positionDetail;
+    }
 
-	@ExcelField(title="职位类型（8：C端自发布全职 9：C端自发布兼职）", align=2, sort=4)
-	public Integer getPositionCategory() {
-		return positionCategory;
-	}
+    @ExcelField(title = "职位类型（8：C端自发布全职 9：C端自发布兼职）", align = 2, sort = 4)
+    public Integer getPositionCategory() {
+        return positionCategory;
+    }
 
-	public void setPositionCategory(Integer positionCategory) {
-		this.positionCategory = positionCategory;
-	}
+    public void setPositionCategory(Integer positionCategory) {
+        this.positionCategory = positionCategory;
+    }
 
-	@ExcelField(title="全职职位类别（0：服务员 1：校园活动 2：实习 3：调研 4：送餐员 5：导购 6：网络编辑 7：普工 8：设计 9：文员助理 10：派单 11：销售 12：安保 13：礼仪 14：促销 15：翻译 16：客服 17：演出 18：家教导师 19：模特 20：快递分拣 21：厨师 22：物流仓储 23：贸易采购 24：技工 25：保洁 26：才艺技能 27：其它）", dictType="fullposition_type", align=2, sort=5)
-	public String getFulltimePositionType() {
+    @ExcelField(title = "全职职位类别（0：服务员 1：校园活动 2：实习 3：调研 4：送餐员 5：导购 6：网络编辑 7：普工 8：设计 9：文员助理 10：派单 11：销售 12：安保 13：礼仪 14：促销 15：翻译 16：客服 17：演出 18：家教导师 19：模特 20：快递分拣 21：厨师 22：物流仓储 23：贸易采购 24：技工 25：保洁 26：才艺技能 27：其它）", dictType = "fullposition_type", align = 2, sort = 5)
+    public String getFulltimePositionType() {
         if (StringUtils.isNotBlank(fulltimePositionType)) {
             fulltimePositionType = DictUtils.getDictLabel(fulltimePositionType, "fulltimePositionType", "");
         }
-		return fulltimePositionType;
-	}
+        return fulltimePositionType;
+    }
 
-	public void setFulltimePositionType(String fulltimePositionType) {
-		this.fulltimePositionType = fulltimePositionType;
-	}
+    public void setFulltimePositionType(String fulltimePositionType) {
+        this.fulltimePositionType = fulltimePositionType;
+    }
 
-	@ExcelField(title="兼职职位类别（0：文员助理 1：市场推广 2：家教培训 3：餐饮服务 4：促销导购 5：物流仓储 6：展会演出 7：才艺技能 8：客服话务 9：代驾司机 10：app试玩 11：线上推广 12：编辑 13：模特 14：技工 15：保洁 16：其它）", dictType="parposition_type", align=2, sort=6)
-	public String getParttimePositionType() {
+    @ExcelField(title = "兼职职位类别（0：文员助理 1：市场推广 2：家教培训 3：餐饮服务 4：促销导购 5：物流仓储 6：展会演出 7：才艺技能 8：客服话务 9：代驾司机 10：app试玩 11：线上推广 12：编辑 13：模特 14：技工 15：保洁 16：其它）", dictType = "parposition_type", align = 2, sort = 6)
+    public String getParttimePositionType() {
         if (StringUtils.isNotBlank(parttimePositionType)) {
             parttimePositionType = DictUtils.getDictLabel(parttimePositionType, "parttimePositionType", "");
         }
-		return parttimePositionType;
-	}
+        return parttimePositionType;
+    }
 
-	public void setParttimePositionType(String parttimePositionType) {
-		this.parttimePositionType = parttimePositionType;
-	}
+    public void setParttimePositionType(String parttimePositionType) {
+        this.parttimePositionType = parttimePositionType;
+    }
 
-	@ExcelField(title="（兼职）招聘人数/（全职）接受报名人数（null或0视为若干）", dictType="", align=2, sort=7)
-	public Integer getRecruitNumber() {
-		return recruitNumber;
-	}
+    @ExcelField(title = "（兼职）招聘人数/（全职）接受报名人数（null或0视为若干）", dictType = "", align = 2, sort = 7)
+    public Integer getRecruitNumber() {
+        return recruitNumber;
+    }
 
-	public void setRecruitNumber(Integer recruitNumber) {
-		this.recruitNumber = recruitNumber;
-	}
+    public void setRecruitNumber(Integer recruitNumber) {
+        this.recruitNumber = recruitNumber;
+    }
 
-	@ExcelField(title="基础薪资（全职）（0：1000~2000 1：2001~3000 2：3001~4000 3：4001~5000 4：5001~6000 5：6001~7000 6：7001~8000 7：8001~9000 8：9001~10000 9：10000以上）", dictType="", align=2, sort=8)
-	public String getBasicSalary() {
-		return basicSalary;
-	}
+    @ExcelField(title = "基础薪资（全职）（0：1000~2000 1：2001~3000 2：3001~4000 3：4001~5000 4：5001~6000 5：6001~7000 6：7001~8000 7：8001~9000 8：9001~10000 9：10000以上）", dictType = "", align = 2, sort = 8)
+    public String getBasicSalary() {
+        return basicSalary;
+    }
 
-	public void setBasicSalary(String basicSalary) {
-		this.basicSalary = basicSalary;
-	}
+    public void setBasicSalary(String basicSalary) {
+        this.basicSalary = basicSalary;
+    }
 
-	@ExcelField(title="薪资周期（兼职）（0：天 1：周 2：月：3 次 4：时 5：其他）", align=2, sort=9)
-	public String getSalaryPeriod() {
+    @ExcelField(title = "薪资周期（兼职）（0：天 1：周 2：月：3 次 4：时 5：其他）", align = 2, sort = 9)
+    public String getSalaryPeriod() {
         if (StringUtils.isNotBlank(salaryPeriod)) {
             salaryPeriod = DictUtils.getDictLabel(salaryPeriod, "salaryPeriod", "");
         }
-		return salaryPeriod;
-	}
-
-	public void setSalaryPeriod(String salaryPeriod) {
-		this.salaryPeriod = salaryPeriod;
-	}
-
-	@ExcelField(title="基本薪资（兼职）", align=2, sort=10)
-	public String getSalary() {
-		return salary;
-	}
-
-	public void setSalary(String salary) {
-		this.salary = salary;
-	}
-
-	@ExcelField(title="提成（兼职）", align=2, sort=11)
-	public String getOtherSalary() {
-		return otherSalary;
-	}
-
-	public void setOtherSalary(String otherSalary) {
-		this.otherSalary = otherSalary;
-	}
-
-	@ExcelField(title="薪资结构（全职）", align=2, sort=12)
-	public String getSalaryStructure() {
-		return salaryStructure;
-	}
-
-	public void setSalaryStructure(String salaryStructure) {
-		this.salaryStructure = salaryStructure;
-	}
-
-	@ExcelField(title="岗位福利（0：包住宿 1：包工作餐 2：交通补助 3：加班补助 4：有提成 5：奖金 6：转正机会 7.五险一金），可多选，数组存储", dictType="", align=2, sort=13)
-	public String getWelfare() {
+        return salaryPeriod;
+    }
+
+    public void setSalaryPeriod(String salaryPeriod) {
+        this.salaryPeriod = salaryPeriod;
+    }
+
+    @ExcelField(title = "基本薪资（兼职）", align = 2, sort = 10)
+    public String getSalary() {
+        return salary;
+    }
+
+    public void setSalary(String salary) {
+        this.salary = salary;
+    }
+
+    @ExcelField(title = "提成（兼职）", align = 2, sort = 11)
+    public String getOtherSalary() {
+        return otherSalary;
+    }
+
+    public void setOtherSalary(String otherSalary) {
+        this.otherSalary = otherSalary;
+    }
+
+    @ExcelField(title = "薪资结构（全职）", align = 2, sort = 12)
+    public String getSalaryStructure() {
+        return salaryStructure;
+    }
+
+    public void setSalaryStructure(String salaryStructure) {
+        this.salaryStructure = salaryStructure;
+    }
+
+    @ExcelField(title = "岗位福利（0：包住宿 1：包工作餐 2：交通补助 3：加班补助 4：有提成 5：奖金 6：转正机会 7.五险一金），可多选，数组存储", dictType = "", align = 2, sort = 13)
+    public String getWelfare() {
         return welfare;
-	}
+    }
 
-	public void setWelfare(String welfare) {
-		this.welfare = welfare;
-	}
+    public void setWelfare(String welfare) {
+        this.welfare = welfare;
+    }
 
-	@ExcelField(title="结算方式（0：月结 1：周结 2：日结 3：完工结 4：其他）", dictType="", align=2, sort=14)
-	public String getSettlementMethod() {
+    @ExcelField(title = "结算方式（0：月结 1：周结 2：日结 3：完工结 4：其他）", dictType = "", align = 2, sort = 14)
+    public String getSettlementMethod() {
         return settlementMethod;
-	}
+    }
 
-	public String getSettlementMethodDict() {
-		if (StringUtils.isNotBlank(settlementMethod)) {
-			settlementMethod = DictUtils.getDictLabel(settlementMethod, "settlement_method", "");
-		}
-		return settlementMethod;
-	}
+    public String getSettlementMethodDict() {
+        if (StringUtils.isNotBlank(settlementMethod)) {
+            settlementMethod = DictUtils.getDictLabel(settlementMethod, "settlement_method", "");
+        }
+        return settlementMethod;
+    }
 
 
-	public void setSettlementMethod(String settlementMethod) {
-		this.settlementMethod = settlementMethod;
-	}
+    public void setSettlementMethod(String settlementMethod) {
+        this.settlementMethod = settlementMethod;
+    }
 
-	@ExcelField(title="班车（全职）（0：没有 1：有）", align=2, sort=15)
-	public String getHasRegularBus() {
-		return hasRegularBus;
-	}
+    @ExcelField(title = "班车（全职）（0：没有 1：有）", align = 2, sort = 15)
+    public String getHasRegularBus() {
+        return hasRegularBus;
+    }
 
-	public void setHasRegularBus(String hasRegularBus) {
-		this.hasRegularBus = hasRegularBus;
-	}
+    public void setHasRegularBus(String hasRegularBus) {
+        this.hasRegularBus = hasRegularBus;
+    }
 
-	@ExcelField(title="学历要求（0：不限 1：小学 2：中学 3：高中 4：大专 5：本科 6：研究生 7：博士 8：博士后 15：其他）", align=2, sort=16)
-	public String getQualification() {
+    @ExcelField(title = "学历要求（0：不限 1：小学 2：中学 3：高中 4：大专 5：本科 6：研究生 7：博士 8：博士后 15：其他）", align = 2, sort = 16)
+    public String getQualification() {
         if (StringUtils.isNotBlank(qualification)) {
             qualification = DictUtils.getDictLabel(qualification, "qualification", "");
         }
-		return qualification;
-	}
+        return qualification;
+    }
 
-	public void setQualification(String qualification) {
-		this.qualification = qualification;
-	}
+    public void setQualification(String qualification) {
+        this.qualification = qualification;
+    }
 
-	@ExcelField(title="年龄要求（全职）", align=2, sort=17)
-	public String getAgeRange() {
-		return ageRange;
-	}
+    @ExcelField(title = "年龄要求（全职）", align = 2, sort = 17)
+    public String getAgeRange() {
+        return ageRange;
+    }
 
-	public void setAgeRange(String ageRange) {
-		this.ageRange = ageRange;
-	}
+    public void setAgeRange(String ageRange) {
+        this.ageRange = ageRange;
+    }
 
-	@ExcelField(title="性别要求（0：不限 1：男 2：女）", align=2, sort=18)
-	public Integer getGender() {
-		return gender;
-	}
+    @ExcelField(title = "性别要求（0：不限 1：男 2：女）", align = 2, sort = 18)
+    public Integer getGender() {
+        return gender;
+    }
 
-	public void setGender(Integer gender) {
-		this.gender = gender;
-	}
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
 
-	@ExcelField(title="工作经验（全职）（0：不限 1：1~2年 2：2~3年 3：3~5年 4：5年以上）", align=2, sort=19)
-	public String getWorkExperience() {
+    @ExcelField(title = "工作经验（全职）（0：不限 1：1~2年 2：2~3年 3：3~5年 4：5年以上）", align = 2, sort = 19)
+    public String getWorkExperience() {
         if (StringUtils.isNotBlank(workExperience)) {
             workExperience = DictUtils.getDictLabel(workExperience, "workExperience", "");
         }
-		return workExperience;
-	}
-
-	public void setWorkExperience(String workExperience) {
-		this.workExperience = workExperience;
-	}
-
-	@ExcelField(title="是否需要健康证（兼职）（0：不需要 1：需要）", align=2, sort=20)
-	public Boolean getIsHealthCertification() {
-		return isHealthCertification;
-	}
-
-	public void setIsHealthCertification(Boolean isHealthCertification) {
-		this.isHealthCertification = isHealthCertification;
-	}
-
-	@ExcelField(title="工作日期（兼职）（多天，数组存储）", align=2, sort=21)
-	public String getWorkDate() {
-		return workDate;
-	}
-
-	public void setWorkDate(String workDate) {
-		this.workDate = workDate;
-	}
-
-	@ExcelField(title="开始工作时段（兼职）", align=2, sort=22)
-	public String getStartWorkTime() {
-		return startWorkTime;
-	}
-
-	public void setStartWorkTime(String startWorkTime) {
-		this.startWorkTime = startWorkTime;
-	}
-
-	@ExcelField(title="结束工作时段（兼职）", align=2, sort=23)
-	public String getEndWordTime() {
-		return endWordTime;
-	}
-
-	public void setEndWordTime(String endWordTime) {
-		this.endWordTime = endWordTime;
-	}
-
-	@ExcelField(title="是否需要打工团队（0：不需要 1：需要）", dictType="", align=2, sort=24)
-	public Boolean getRequireGroup() {
-		return requireGroup;
-	}
-
-	public void setRequireGroup(Boolean requireGroup) {
-		this.requireGroup = requireGroup;
-	}
-
-	@ExcelField(title="是否全国发布（0：不是 1：是）", align=2, sort=25)
-	public Boolean getIsPublishNationwide() {
-		return isPublishNationwide;
-	}
-
-	public void setIsPublishNationwide(Boolean isPublishNationwide) {
-		this.isPublishNationwide = isPublishNationwide;
-	}
-
-	@ExcelField(title="联系人", align=2, sort=26)
-	public String getContactPerson() {
-		return contactPerson;
-	}
-
-	public void setContactPerson(String contactPerson) {
-		this.contactPerson = contactPerson;
-	}
-
-	@ExcelField(title="联系电话", align=2, sort=27)
-	public String getContactPhone() {
-		return contactPhone;
-	}
-
-	public void setContactPhone(String contactPhone) {
-		this.contactPhone = contactPhone;
-	}
-
-
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@ExcelField(title="截至时间（岗位招聘结束时间，不填即为长期招聘）", align=2, sort=29)
-	public Date getEndDate() {
-		return endDate;
-	}
-
-	public void setEndDate(Date endDate) {
-		this.endDate = endDate;
-	}
-
-	@ExcelField(title="是否暂停（0：不是 1：是）", align=2, sort=30)
-	public Boolean getIsPause() {
-		return isPause;
-	}
-
-	public void setIsPause(Boolean isPause) {
-		this.isPause = isPause;
-	}
-
-	@ExcelField(title="认证状态（1：未审核 2：未通过 3：已通过）", dictType="authenticationStatus", align=2, sort=31)
-	public String getAuthenticationStatus() {
-		return authenticationStatus;
-	}
-
-	public void setAuthenticationStatus(String authenticationStatus) {
-		this.authenticationStatus = authenticationStatus;
-	}
-
-	@ExcelField(title="是否上架（0：下架 1：上架）", align=2, sort=33)
-	public Boolean getIsOn() {
-		return isOn;
-	}
-
-	public void setIsOn(Boolean isOn) {
-		this.isOn = isOn;
-	}
-
-	public HpMember getHpMember() {
-		return hpMember;
-	}
-
-	public void setHpMember(HpMember hpMember) {
-		this.hpMember = hpMember;
-	}
-
-	public String getWorkTime() {
-		return workTime;
-	}
-
-	public void setWorkTime(String workTime) {
-		this.workTime = workTime;
-	}
+        return workExperience;
+    }
+
+    public void setWorkExperience(String workExperience) {
+        this.workExperience = workExperience;
+    }
+
+    @ExcelField(title = "是否需要健康证（兼职）（0：不需要 1：需要）", align = 2, sort = 20)
+    public Boolean getIsHealthCertification() {
+        return isHealthCertification;
+    }
+
+    public void setIsHealthCertification(Boolean isHealthCertification) {
+        this.isHealthCertification = isHealthCertification;
+    }
+
+    @ExcelField(title = "工作日期（兼职）（多天，数组存储）", align = 2, sort = 21)
+    public String getWorkDate() {
+        return workDate;
+    }
+
+    public void setWorkDate(String workDate) {
+        this.workDate = workDate;
+    }
+
+    @ExcelField(title = "开始工作时段（兼职）", align = 2, sort = 22)
+    public String getStartWorkTime() {
+        return startWorkTime;
+    }
+
+    public void setStartWorkTime(String startWorkTime) {
+        this.startWorkTime = startWorkTime;
+    }
+
+    @ExcelField(title = "结束工作时段（兼职）", align = 2, sort = 23)
+    public String getEndWordTime() {
+        return endWordTime;
+    }
+
+    public void setEndWordTime(String endWordTime) {
+        this.endWordTime = endWordTime;
+    }
+
+    @ExcelField(title = "是否需要打工团队（0：不需要 1：需要）", dictType = "", align = 2, sort = 24)
+    public Boolean getRequireGroup() {
+        return requireGroup;
+    }
+
+    public void setRequireGroup(Boolean requireGroup) {
+        this.requireGroup = requireGroup;
+    }
+
+    @ExcelField(title = "是否全国发布（0：不是 1：是）", align = 2, sort = 25)
+    public Boolean getIsPublishNationwide() {
+        return isPublishNationwide;
+    }
+
+    public void setIsPublishNationwide(Boolean isPublishNationwide) {
+        this.isPublishNationwide = isPublishNationwide;
+    }
+
+    @ExcelField(title = "联系人", align = 2, sort = 26)
+    public String getContactPerson() {
+        return contactPerson;
+    }
+
+    public void setContactPerson(String contactPerson) {
+        this.contactPerson = contactPerson;
+    }
+
+    @ExcelField(title = "联系电话", align = 2, sort = 27)
+    public String getContactPhone() {
+        return contactPhone;
+    }
+
+    public void setContactPhone(String contactPhone) {
+        this.contactPhone = contactPhone;
+    }
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelField(title = "截至时间（岗位招聘结束时间，不填即为长期招聘）", align = 2, sort = 29)
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    @ExcelField(title = "是否暂停（0：不是 1：是）", align = 2, sort = 30)
+    public Boolean getIsPause() {
+        return isPause;
+    }
+
+    public void setIsPause(Boolean isPause) {
+        this.isPause = isPause;
+    }
+
+    @ExcelField(title = "认证状态（1：未审核 2：未通过 3：已通过）", dictType = "authenticationStatus", align = 2, sort = 31)
+    public String getAuthenticationStatus() {
+        return authenticationStatus;
+    }
+
+    public void setAuthenticationStatus(String authenticationStatus) {
+        this.authenticationStatus = authenticationStatus;
+    }
+
+    @ExcelField(title = "是否上架（0：下架 1：上架）", align = 2, sort = 33)
+    public Boolean getIsOn() {
+        return isOn;
+    }
+
+    public void setIsOn(Boolean isOn) {
+        this.isOn = isOn;
+    }
+
+    public HpMember getHpMember() {
+        return hpMember;
+    }
+
+    public void setHpMember(HpMember hpMember) {
+        this.hpMember = hpMember;
+    }
+
+    public String getWorkTime() {
+        return workTime;
+    }
+
+    public void setWorkTime(String workTime) {
+        this.workTime = workTime;
+    }
+
+    @Override
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    @Override
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
 }

src/main/java/com/jeeplus/modules/dpposition/service/DpPositionService.java

@@ -436,7 +436,7 @@ public class DpPositionService extends CrudService<DpPositionMapper, DpPosition>
                 if (StringUtils.isNotBlank(endDate)) {
                     endDate = endDate + " 23:59:59";
                     position.setEndDate(sdf.parse(endDate));
-                }else {
+                } else {
                     position.setEndDate(null);
                 }
                 position.setCreateDate(new Date());
@@ -577,7 +577,7 @@ public class DpPositionService extends CrudService<DpPositionMapper, DpPosition>
                 if (StringUtils.isNotBlank(endDate)) {
                     endDate = endDate + " 23:59:59";
                     position.setEndDate(sdf.parse(endDate));
-                }else {
+                } else {
                     position.setEndDate(null);
                 }
                 position.setCreateDate(new Date());
@@ -660,11 +660,12 @@ public class DpPositionService extends CrudService<DpPositionMapper, DpPosition>
                             int year = cale.get(Calendar.YEAR);
                             birthYear = String.valueOf(year - Integer.parseInt(hpResume1.getBirthYear()) + 1);
                             hpResume1.setBirthYear(birthYear);
+                            HpApplyPosition hpApplyPosition = hpApplyPositionService.get(hpResume1.getApplyId());
                             if (hpResume1.getReadTime() == null) {
-                                HpApplyPosition hpApplyPosition = hpApplyPositionService.get(hpResume1.getApplyId());
                                 hpApplyPosition.setReadTime(new Date());
                                 hpApplyPositionService.save(hpApplyPosition);
                             }
+                            hpResume1.setCreateDate(hpApplyPosition.getApplyTime());
                             if (StringUtils.isNotBlank(hpResume1.getHeadImg())) {
                                 if (!hpResume1.getHeadImg().contains("http")) {
                                     hpResume1.setHeadImg(Global.getAliyunUrl() + hpResume1.getHeadImg());

src/main/java/com/jeeplus/modules/hpuser/entity/HpResume.java

@@ -4,6 +4,7 @@
 package com.jeeplus.modules.hpuser.entity;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.google.common.collect.Lists;
 import com.jeeplus.core.persistence.DataEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
@@ -258,4 +259,15 @@ public class HpResume extends DataEntity<HpResume> {
     public void setHpMember(HpMember hpMember) {
         this.hpMember = hpMember;
     }
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @Override
+    public Date getCreateDate() {
+        return super.getCreateDate();
+    }
+
+    @Override
+    public void setCreateDate(Date createDate) {
+        super.setCreateDate(createDate);
+    }
 }

src/main/java/com/jeeplus/modules/hpuser/service/HpApplyPositionService.java

@@ -231,6 +231,12 @@ public class HpApplyPositionService extends CrudService<HpApplyPositionMapper, H
                         break;
                     case "8":
                         DpPositionForApplyAPI dpPositionForApplyAPI = dpPositionService.getDpPositionForApplyAPI(positionId);
+                        if (dpPositionForApplyAPI.getEndDate() != null) {
+                            if (new Date().getTime() >= dpPositionForApplyAPI.getEndDate().getTime() || "1".equals(dpPositionForApplyAPI.getDelFlag())) {
+                                returnMap.put("success", "1018");
+                                return returnMap;
+                            }
+                        }
                         HpMessage hpMessage = new HpMessage();
                         hpMessage.setHpMember(dpPositionForApplyAPI.getHpMember());
                         hpMessage.setPositionId(positionId);
@@ -241,16 +247,16 @@ public class HpApplyPositionService extends CrudService<HpApplyPositionMapper, H
                         hpMessage.setType(23);
                         hpMessage.setIsRead(false);
                         hpMessageService.save(hpMessage);
-                        if (dpPositionForApplyAPI.getEndDate() != null) {
-                            if (new Date().getTime() >= dpPositionForApplyAPI.getEndDate().getTime() || "1".equals(dpPositionForApplyAPI.getDelFlag())) {
-                                returnMap.put("success", "1018");
-                                return returnMap;
-                            }
-                        }
                         hpApplyPositionAPI.setRefuse(false);
                         break;
                     case "9":
                         DpPositionForApplyAPI dpPositionForApplyAPI1 = dpPositionService.getDpPositionForApplyAPI(positionId);
+                        if (dpPositionForApplyAPI1.getEndDate() != null) {
+                            if (new Date().getTime() >= dpPositionForApplyAPI1.getEndDate().getTime() || "1".equals(dpPositionForApplyAPI1.getDelFlag())) {
+                                returnMap.put("success", "1018");
+                                return returnMap;
+                            }
+                        }
                         HpMessage hpMessage1 = new HpMessage();
                         hpMessage1.setHpMember(dpPositionForApplyAPI1.getHpMember());
                         hpMessage1.setPositionId(positionId);
@@ -261,12 +267,6 @@ public class HpApplyPositionService extends CrudService<HpApplyPositionMapper, H
                         hpMessage1.setType(23);
                         hpMessage1.setIsRead(false);
                         hpMessageService.save(hpMessage1);
-                        if (dpPositionForApplyAPI1.getEndDate() != null) {
-                            if (new Date().getTime() >= dpPositionForApplyAPI1.getEndDate().getTime() || "1".equals(dpPositionForApplyAPI1.getDelFlag())) {
-                                returnMap.put("success", "1018");
-                                return returnMap;
-                            }
-                        }
                         hpApplyPositionAPI.setRefuse(false);
                         break;
                 }

src/main/java/com/jeeplus/modules/hpuser/service/HpResumeService.java

@@ -11,6 +11,7 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.dpposition.service.DpPositionService;
+import com.jeeplus.modules.hpuser.entity.HpApplyPosition;
 import com.jeeplus.modules.hpuser.entity.HpResume;
 import com.jeeplus.modules.hpuser.entity.HpResumeWorkExperience;
 import com.jeeplus.modules.hpuser.mapper.HpResumeMapper;
@@ -49,6 +50,8 @@ public class HpResumeService extends CrudService<HpResumeMapper, HpResume> {
     private DpPositionService dpPositionService;
     @Autowired
     private HpMemberService hpMemberService;
+    @Autowired
+    private HpApplyPositionService hpApplyPositionService;
 
     public HpResume get(String id) {
         return super.get(id);
@@ -690,6 +693,8 @@ public class HpResumeService extends CrudService<HpResumeMapper, HpResume> {
                                 String birthYear = String.valueOf(year - Integer.parseInt(hpResume1.getBirthYear()) + 1);
                                 hpResume1.setBirthYear(birthYear);
                             }
+                            HpApplyPosition hpApplyPosition = hpApplyPositionService.get(hpResume1.getApplyId());
+                            hpResume1.setCreateDate(hpApplyPosition.getApplyTime());
                             if (StringUtils.isNotBlank(hpResume1.getHeadImg())) {
                                 if (!hpResume1.getHeadImg().contains("http")) {
                                     hpResume1.setHeadImg(Global.getAliyunUrl() + hpResume1.getHeadImg());

src/main/webapp/webpage/modules/hpuser/hpApplyPositionList.js

@@ -99,6 +99,9 @@ $(document).ready(function() {
                 sortable: false,
                 sortName: 'hpResume.birthYear',
                        formatter:function(value, row , index){
+                            if(row.hpResume == null){
+                                return '-';
+                            }
                             if (value == null || value == undefined){
                                 return '-';
                             }