diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CultivateDetailEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CultivateDetailEntity.java index f1b083f6..705554c4 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CultivateDetailEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CultivateDetailEntity.java @@ -61,6 +61,11 @@ public class CultivateDetailEntity extends BaseEntity { */ @Schema(description = "下发时间") private Date distributeTime; + /** + * 完成时间 + */ + @Schema(description = "完成时间") + private Date finishTime; /** * 附件链接 */ 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 new file mode 100644 index 00000000..19fb4664 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CultivateDetailQuery.java @@ -0,0 +1,81 @@ +package org.springblade.desk.jobTransfer.pojo.request; + +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 java.util.Date; + +/** + * 培训安排分页检索 实体类 + * + * @author qyl + * @since 2026-01-09 + */ +@Data +public class CultivateDetailQuery extends BaseEntity { + + /** + * 姓名 + */ + @Schema(description = "姓名") + private String name; + /** + * 工号 + */ + @Schema(description = "工号") + private String code; + /** + * 用工类型 + */ + @Schema(description = "用工类型(1实习工,2正式工)") + private Short staffType; + /** + * 培训类型(1实习,2转岗,3下岗) + */ + @Schema(description = "培训类型(1实习,2转岗,3下岗)") + private Short type; + /** + * 培训模板ID + */ + @Schema(description = "培训模板ID") + private Long planId; + /** + * 培训师ID + */ + @Schema(description = "培训师ID") + private Long teacherId; + /** + * 培训状态(1未配置,2等待下发,3已下发-培训中,4已到期,5已培训-待确认,6培训完成) + */ + @Schema(description = "培训状态(1未配置,2等待下发,3已下发-培训中,4已到期,5已培训-待确认,6培训完成)") + private Short caStatus; + /** + * 下发时间 + */ + @Schema(description = "下发时间") + private Date distributeTime; + + /** + * 培训周期(天) + */ + @Schema(description = "培训周期(天)") + private Integer cycle; + /** + * 预警周期(天) + */ + @Schema(description = "预警周期(天)") + private Integer earlyWarningDay; + + /** + * 开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date startTime; + /** + * 结束时间 + */ + @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/vo/CultivateDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CultivateDetailVO.java index 5490bc4e..216d6f24 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CultivateDetailVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CultivateDetailVO.java @@ -18,4 +18,27 @@ public class CultivateDetailVO extends CultivateDetailEntity { @Serial private static final long serialVersionUID = 1L; + //姓名 + private String name; + + //用工号 + private String code; + + //用工类型 + private String staffTypeName; + + //培训类型 + private String typeName; + + //培训周期(天) + private Integer cycle; + + //预警周期(天) + private Integer earlyWarningDay; + + //培训计划 + private String planName; + + //状态 + private String caStatusName; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CultivateDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CultivateDetailController.java index 2644f031..40f388e1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CultivateDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CultivateDetailController.java @@ -14,6 +14,7 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; +import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -62,8 +63,8 @@ public class CultivateDetailController extends BladeController { @GetMapping("/page") @ApiOperationSupport(order = 3) @Operation(summary = "分页", description = "传入cultivateDetail") - public R> page(CultivateDetailVO cultivateDetail, Query query) { - IPage pages = cultivateDetailService.selectCultivateDetailPage(Condition.getPage(query), cultivateDetail); + public R> page(CultivateDetailQuery cultivateDetailQuery, Query query) { + IPage pages = cultivateDetailService.selectCultivateDetailPage(Condition.getPage(query), cultivateDetailQuery); return R.data(pages); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.java index 2ca14dbf..b21bd807 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.java @@ -2,6 +2,7 @@ package org.springblade.desk.jobTransfer.mapper; import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; +import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery; import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -22,10 +23,10 @@ public interface CultivateDetailMapper extends BaseMapper * 自定义分页 * * @param page 分页参数 - * @param cultivateDetail 查询参数 + * @param query 查询参数 * @return List */ - List selectCultivateDetailPage(IPage page, CultivateDetailVO cultivateDetail); + List selectCultivateDetailPage(IPage page, CultivateDetailQuery query); /** 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 7ce4430e..a806ff0f 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 @@ -22,13 +22,98 @@ + + + + + + + + + + + + + + + + + + + + + - + SELECT + cd.*, + bu.real_name as name, + bu.code as code, + mph.staff_type, + mp.cycle, + mp.early_warning_day, + mp.name as plan_name + FROM + mes_cultivate_detail cd + LEFT JOIN + mes_post_handle mph ON cd.ph_id = mph.id AND mph.is_deleted = 0 + LEFT JOIN + mes_training_plan mp ON cd.plan_id = mp.id AND mp.is_deleted = 0 + LEFT JOIN + blade_user bu ON mph.user_id = bu.id + WHERE + cd.is_deleted = 0 + + AND bu.real_name LIKE CONCAT(CONCAT('%', #{query.name}), '%') + + + AND bu.code LIKE CONCAT(CONCAT('%', #{query.code}), '%') + + + AND mph.staff_type = #{query.staffType} + + + AND cd.type = #{query.type} + + + AND cd.plan_id = #{query.planId} + + + AND cd.teacher_id = #{query.teacherId} + + + AND cd.ca_status = #{query.caStatus} + + + AND cd.distribute_time = #{query.distributeTime} + + + AND mp.cycle = #{query.cycle} + + + 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/ICultivateDetailService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICultivateDetailService.java index 58806370..38b7e05e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICultivateDetailService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICultivateDetailService.java @@ -3,6 +3,7 @@ package org.springblade.desk.jobTransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; +import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery; import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; @@ -23,7 +24,7 @@ public interface ICultivateDetailService extends BaseService */ - IPage selectCultivateDetailPage(IPage page, CultivateDetailVO cultivateDetail); + IPage selectCultivateDetailPage(IPage page, CultivateDetailQuery cultivateDetail); /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java index 37aa8855..cdc4e3a4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java @@ -2,6 +2,7 @@ package org.springblade.desk.jobTransfer.service.impl; import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; +import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery; import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; import org.springblade.desk.jobTransfer.mapper.CultivateDetailMapper; import org.springblade.desk.jobTransfer.service.ICultivateDetailService; @@ -22,8 +23,8 @@ import java.util.List; public class CultivateDetailServiceImpl extends BaseServiceImpl implements ICultivateDetailService { @Override - public IPage selectCultivateDetailPage(IPage page, CultivateDetailVO cultivateDetail) { - return page.setRecords(baseMapper.selectCultivateDetailPage(page, cultivateDetail)); + public IPage selectCultivateDetailPage(IPage page, CultivateDetailQuery cultivateDetailQuery) { + return page.setRecords(baseMapper.selectCultivateDetailPage(page, cultivateDetailQuery)); } diff --git a/doc/sql/mes/increase-260108.sql b/doc/sql/mes/increase-260108.sql index 3387114d..ecc45c7a 100644 --- a/doc/sql/mes/increase-260108.sql +++ b/doc/sql/mes/increase-260108.sql @@ -357,3 +357,9 @@ COMMENT ON COLUMN MES_EQUIPMENT_MAINTENANCE.MAINTENANCE_STATUS IS '维护状态(1正常,2到期,3离职)'; COMMENT ON TABLE MES_EQUIPMENT_MAINTENANCE IS '岗位设备维护'; + +--加字段 +ALTER TABLE MES_CULTIVATE_DETAIL + ADD (FINISH_TIME DATE); +COMMENT +ON COLUMN MES_CULTIVATE_DETAIL.FINISH_TIME IS '完成时间' \ No newline at end of file