From d843197e5b996cd41cd82f29f233f91c142797a0 Mon Sep 17 00:00:00 2001 From: sh Date: Tue, 14 Oct 2025 13:32:46 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E6=98=AF?= =?UTF-8?q?create=5Ftime=E4=B8=BA=E7=A9=BA=E6=83=85=E5=86=B5=202.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=81=8C=E5=8A=A1=E5=BD=95=E7=94=A8=E6=98=AF=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B2=97=E4=BD=8D=E7=94=B3=E8=AF=B7=E8=A1=A8?= =?UTF-8?q?=E5=BD=95=E7=94=A8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/cms/domain/EmployeeConfirm.java | 13 +++++++++---- .../java/com/ruoyi/cms/domain/JobApply.java | 2 ++ .../com/ruoyi/cms/domain/vo/CandidateVO.java | 1 + .../impl/EmployeeConfirmServiceImpl.java | 13 ++++++++++++- .../resources/mapper/app/JobApplyMapper.xml | 2 +- .../config/FieldMetaObjectConfig.java | 18 +++++++++++------- 6 files changed, 36 insertions(+), 13 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/EmployeeConfirm.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/EmployeeConfirm.java index 82159b0..e5990ab 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/EmployeeConfirm.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/EmployeeConfirm.java @@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -49,9 +47,8 @@ public class EmployeeConfirm extends BaseEntity { /** * 入职日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty("入职日期") - private Date entryDate; + private String entryDate; /** * 联系电话 */ @@ -63,4 +60,12 @@ public class EmployeeConfirm extends BaseEntity { @ApiModelProperty("劳动合同期限") private String contractTerm; + @ApiModelProperty("工作id") + private Long jobId; + + /** + * 申请id + */ + @TableField(exist = false) + private Long applyId; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobApply.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobApply.java index c6818da..d3b964f 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobApply.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobApply.java @@ -38,4 +38,6 @@ public class JobApply extends BaseEntity @ApiModelProperty("匹配度") private Long matchingDegree; + @ApiModelProperty("是否录用 0录用 2或null未录用") + private String hire; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/CandidateVO.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/CandidateVO.java index 52c4e9d..3024f10 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/CandidateVO.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/CandidateVO.java @@ -11,4 +11,5 @@ public class CandidateVO extends AppUser { @JsonFormat(pattern = "yyyy-MM-dd") private Date applyDate; private Integer matchingDegree; + private String applyId; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java index 6bff201..45b8029 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java @@ -1,7 +1,9 @@ package com.ruoyi.cms.service.impl; import com.ruoyi.cms.domain.EmployeeConfirm; +import com.ruoyi.cms.domain.JobApply; import com.ruoyi.cms.mapper.EmployeeConfirmMapper; +import com.ruoyi.cms.mapper.JobApplyMapper; import com.ruoyi.cms.service.EmployeeConfirmService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,6 +17,8 @@ public class EmployeeConfirmServiceImpl implements EmployeeConfirmService { @Autowired EmployeeConfirmMapper employeeConfirmMapper; + @Autowired + private JobApplyMapper jobApplyMapper; @Override public List getEmployeeConfirmList(EmployeeConfirm employeeConfirm) { @@ -23,7 +27,14 @@ public class EmployeeConfirmServiceImpl implements EmployeeConfirmService { @Override public int insertEmployeeConfirm(EmployeeConfirm employeeConfirm) { - return employeeConfirmMapper.insert(employeeConfirm); + int t=employeeConfirmMapper.insert(employeeConfirm); + if(t>0){ + JobApply apply=new JobApply(); + apply.setId(employeeConfirm.getApplyId()); + apply.setHire("0"); + jobApplyMapper.updateById(apply); + } + return t; } @Override diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml index f6745db..e8b1162 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml @@ -40,7 +40,7 @@ ORDER BY ja.create_time DESC