转岗功能修改

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;
 }

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;
+}

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);
     }
 
     /**

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}
         </if>
         <!-- 时间范围查询 -->
-        <if test="query.startTime != null and query.startTime != ''">
+        <if test="query.startTime != null">
             AND cd.DISTRIBUTE_TIME &gt;= #{query.startTime}
         </if>
-        <if test="query.endTime != null and query.endTime != ''">
+        <if test="query.endTime != null">
             AND cd.DISTRIBUTE_TIME &lt;= #{query.endTime}
         </if>
         ORDER BY cd.create_time DESC

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<PostHandleEntity> {
     /**
      * 转岗
      *
-     * @param postHandleEntity
+     * @param jobTransferSave
      * @return
      */
-    R jobTransfer(PostHandleEntity postHandleEntity);
+    R jobTransfer(JobTransferSave jobTransferSave);
 
     /**
      * 离职

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 BaseServiceImpl<PostHandleMapper, Pos
     }
 
     @Override
-    public R jobTransfer(PostHandleEntity postHandleEntity) {
-        if (!(PostHandleStatusEnum.JOB_TRANSFER_TRAINED.getCode().shortValue() == postHandleEntity.getPhStatus())) {
+    public R jobTransfer(JobTransferSave jobTransferSave) {
+        if (!(PostHandleStatusEnum.JOB_TRANSFER_TRAINED.getCode().shortValue() == jobTransferSave.getPhStatus())) {
             return R.fail("请在转岗培训完成后操作");
         }
+        PostHandleEntity postHandleEntity = new PostHandleEntity();
         postHandleEntity.setPhStatus(PostHandleStatusEnum.NORMALITY.getCode().shortValue());
         postHandleEntity.setToNewJob(new Date());
+        postHandleEntity.setDeptId(jobTransferSave.getDeptId());
+        postHandleEntity.setStation(jobTransferSave.getStation());
         return R.status(this.updateById(postHandleEntity));
     }