From b6e6554de3f566b36d447826b98ddc97fa8d7ba4 Mon Sep 17 00:00:00 2001 From: qinyulong Date: Fri, 16 Jan 2026 13:15:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E5=B2=97=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/request/CultivateDetailQuery.java | 4 ++++ .../pojo/request/JobTransferSave.java | 22 ++++++++++++++++++ .../controller/PostHandleController.java | 5 ++-- .../mapper/CultivateDetailMapper.xml | 4 ++-- .../service/IPostHandleService.java | 5 ++-- .../service/impl/PostHandleServiceImpl.java | 8 +++++-- .../岗位处理导入模板下载.xls | Bin 21504 -> 21504 bytes 7 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/JobTransferSave.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CultivateDetailQuery.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CultivateDetailQuery.java index 19fb4664..e4ccb754 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CultivateDetailQuery.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CultivateDetailQuery.java @@ -4,7 +4,9 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDate; import java.util.Date; /** @@ -71,11 +73,13 @@ public class CultivateDetailQuery extends BaseEntity { /** * 开始时间 */ + @Schema(description = "开始时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date startTime; /** * 结束时间 */ + @Schema(description = "结束时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date endTime; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/JobTransferSave.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/JobTransferSave.java new file mode 100644 index 00000000..971fbdbb --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/JobTransferSave.java @@ -0,0 +1,22 @@ +package org.springblade.desk.jobTransfer.pojo.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 转岗功能保存实体类 + */ +@Data +public class JobTransferSave { + @Schema(description = "人员岗位管理ID", required = true) + private Long phId; + + @Schema(description = "人员岗位管理状态1实习-培训中,2转岗中,3正常,4下岗中,5离职,6转岗培训合格,7下岗培训合格，8实习培训合格，9培训不合格", required = true) + private Short phStatus; + + @Schema(description = "新班组ID", required = true) + private Long deptId; + + @Schema(description = "新岗位", required = true) + private String station; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java index 1663826f..004dfc82 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java @@ -20,6 +20,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel; import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport; +import org.springblade.desk.jobTransfer.pojo.request.JobTransferSave; import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery; import org.springframework.beans.BeanUtils; import org.springframework.core.io.Resource; @@ -242,8 +243,8 @@ public class PostHandleController extends BladeController { @PostMapping("/jobTransfer") @ApiOperationSupport(order = 13) @Operation(summary = "转岗", description = "传入postHandle") - public R jobTransfer(@Valid @RequestBody PostHandleEntity postHandle) { - return postHandleService.jobTransfer(postHandle); + public R jobTransfer(@Valid @RequestBody JobTransferSave jobTransferSave) { + return postHandleService.jobTransfer(jobTransferSave); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.xml index 1a7f9c64..ed763444 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.xml @@ -107,10 +107,10 @@ AND mp.early_warning_day = #{query.earlyWarningDay} - + AND cd.DISTRIBUTE_TIME >= #{query.startTime} - + AND cd.DISTRIBUTE_TIME <= #{query.endTime} ORDER BY cd.create_time DESC diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java index 45045850..fdb37701 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java @@ -5,6 +5,7 @@ import org.springblade.core.tool.api.R; import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel; import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport; +import org.springblade.desk.jobTransfer.pojo.request.JobTransferSave; import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery; import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -86,10 +87,10 @@ public interface IPostHandleService extends BaseService { /** * 转岗 * - * @param postHandleEntity + * @param jobTransferSave * @return */ - R jobTransfer(PostHandleEntity postHandleEntity); + R jobTransfer(JobTransferSave jobTransferSave); /** * 离职 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java index c9df38a1..83e89bf0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java @@ -12,6 +12,7 @@ import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; import org.springblade.desk.jobTransfer.pojo.enums.*; import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel; import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport; +import org.springblade.desk.jobTransfer.pojo.request.JobTransferSave; import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery; import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; import org.springblade.desk.jobTransfer.mapper.PostHandleMapper; @@ -262,12 +263,15 @@ public class PostHandleServiceImpl extends BaseServiceImplkYVI(wFz_&d%wzyeN zs!b3k&*KwMMA6H{AP(1yY9<#BaT6TkHgNIDdFXCnV6a2Tt^Y1# zJJ26r{|hjH0}m7sEIJAgfMJ6vu8%`p42QTj4skigM-3@`^0?{=^P;ff;bZ!O~h;Ieq;%RC7<@d`ou$Y5&2~E}#QxHJ2LS(X&n0vh_ zObgs1NB{v{4z~hg6vPT~Byoto#Kjp|c)xkLZ?2UHR$)<3&<@&s#YRUQ0AO6wu>b%7 delta 985 zcmZoz!Pu~ZaYG6V-#)G1-F%IA7#VEa*i9QZ7qOgXCR>Rr)L&sxa8Nh^wD$m5 z0WZv9XySY*;tpak^>FboAYXt0#2lakG!N>6&1Z*+L)A}i6q91t0!xWZo+avTC