From 337e76da521f09bc8db8f599667a408d8975158a Mon Sep 17 00:00:00 2001 From: qinyulong Date: Tue, 13 Jan 2026 16:03:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=B2=97=E4=BD=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=AF=BC=E5=87=BA=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?= =?UTF-8?q?+=E5=AE=9A=E6=97=B6=E6=9B=B4=E6=96=B0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/excel/PostHandleExcel.java | 21 +++++++------------ .../jobTransfer/pojo/vo/PostHandleVO.java | 12 +++++++---- .../EquipmentMaintenanceController.java | 16 ++++++++++++++ .../controller/PostHandleController.java | 20 +++++++++++++----- .../mapper/EquipmentMaintenanceMapper.java | 3 +++ .../service/IEquipmentMaintenanceService.java | 10 +++++++++ .../impl/EquipmentMaintenanceServiceImpl.java | 5 +++++ 7 files changed, 64 insertions(+), 23 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/PostHandleExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/PostHandleExcel.java index f022c9fc..16e65d16 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/PostHandleExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/PostHandleExcel.java @@ -29,13 +29,6 @@ public class PostHandleExcel implements Serializable { @Serial private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - @ColumnWidth(20) - @ExcelProperty("用户ID") - private Long userId; /** * 名称 */ @@ -70,8 +63,8 @@ public class PostHandleExcel implements Serializable { * 班组ID */ @ColumnWidth(20) - @ExcelProperty("班组ID") - private Long deptId; + @ExcelProperty("班组") + private String deptName; /** * 所属岗位 */ @@ -95,7 +88,7 @@ public class PostHandleExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("婚姻状态(0未婚，1已婚)") - private String marriage; + private String marriageName; /** * 毕业院校 */ @@ -125,7 +118,7 @@ public class PostHandleExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("用工类型") - private Short staffType; + private String staffTypeName; /** * 参加工作时间 */ @@ -137,7 +130,7 @@ public class PostHandleExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("技能等级") - private Short skill; + private String skillName; /** * 任现职时间 */ @@ -166,7 +159,7 @@ public class PostHandleExcel implements Serializable { * 1实习-培训中,2转岗中,3正常,4下岗中,5离职,6培训合格,7培训不合格 */ @ColumnWidth(20) - @ExcelProperty("1实习-培训中,2转岗中,3正常,4下岗中,5离职,6培训合格,7培训不合格") - private Short phStatus; + @ExcelProperty("状态") + private String phStatusName; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/PostHandleVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/PostHandleVO.java index 7716f321..ffc71e83 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/PostHandleVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/PostHandleVO.java @@ -4,10 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springblade.desk.jobTransfer.pojo.enums.PostHandleStatusEnum; -import org.springblade.desk.jobTransfer.pojo.enums.SkillEnum; -import org.springblade.desk.jobTransfer.pojo.enums.StaffTypeEnum; -import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum; +import org.springblade.desk.jobTransfer.pojo.enums.*; import java.io.Serial; @@ -41,6 +38,9 @@ public class PostHandleVO extends PostHandleEntity { //技能等级名 @Schema(description = "技能等级名") private String skillName; + //技能等级名 + @Schema(description = "婚姻名") + private String marriageName; public String getPhStatusName() { return PostHandleStatusEnum.getName(null != this.getPhStatus() ? this.getPhStatus().intValue() : null); @@ -53,4 +53,8 @@ public class PostHandleVO extends PostHandleEntity { public String getSkillName() { return SkillEnum.getName(null != this.getSkill() ? this.getSkill().intValue() : null); } + + public String getMarriageName() { + return MarriageEnum.getName(null != this.getMarriage() ? this.getMarriage() : null); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java index d38f03a2..aad08894 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java @@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import jakarta.annotation.PostConstruct; import lombok.AllArgsConstructor; import jakarta.validation.Valid; @@ -20,6 +21,7 @@ import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel; import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery; import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -148,4 +150,18 @@ public class EquipmentMaintenanceController extends BladeController { ExcelUtil.export(response, "岗位设备维护数据" + DateUtil.time(), "岗位设备维护数据表", list, EquipmentMaintenanceExcel.class); } + @PostConstruct // 项目启动后立即执行一次 + public void init() { + updateMaintenanceStatus(); + } + + /** + * 更新设备维护状态 + * TODO 以后需要交由PowerJob服务统一管理 + */ + @Scheduled(cron = "0 0 0 * * ?") // 每天凌晨0点执行 + public void updateMaintenanceStatus() { + equipmentMaintenanceService.updateMaintenanceStatus(); + } + } 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 cef1dd1e..c6a5f332 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 @@ -1,5 +1,6 @@ package org.springblade.desk.jobTransfer.controller; +import io.micrometer.core.instrument.binder.BaseUnits; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.Schema; @@ -34,6 +35,7 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; +import java.util.ArrayList; import java.util.Map; import java.util.List; import java.util.stream.Collectors; @@ -182,18 +184,26 @@ public class PostHandleController extends BladeController { /** * 导出数据 */ - @IsAdmin @GetMapping("/export-postHandle") @ApiOperationSupport(order = 11) @Operation(summary = "导出数据", description = "传入postHandle") - public void exportPostHandle(@Parameter(hidden = true) @RequestParam Map postHandle, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(postHandle, PostHandleEntity.class); + public void exportPostHandle(PostHandleQuery postHandleQuery, Query query, HttpServletResponse response) { + query.setSize(99999); + IPage pages = postHandleService.selectPostHandlePage(Condition.getPage(query), postHandleQuery); + List list = pages.getRecords(); +// QueryWrapper queryWrapper = Condition.getQueryWrapper(postHandle, PostHandleEntity.class); //if (!AuthUtil.isAdministrator()) { // queryWrapper.lambda().eq(PostHandle::getTenantId, bladeUser.getTenantId()); //} //queryWrapper.lambda().eq(PostHandleEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = postHandleService.exportPostHandle(queryWrapper); - ExcelUtil.export(response, "岗位处理数据" + DateUtil.time(), "岗位处理数据表", list, PostHandleExcel.class); +// List list = postHandleService.exportPostHandle(queryWrapper); + List excels = new ArrayList<>(); + for (PostHandleVO postHandleVO : list) { + PostHandleExcel excel = new PostHandleExcel(); + BeanUtils.copyProperties(postHandleVO, excel); + excels.add(excel); + } + ExcelUtil.export(response, "岗位处理数据" + DateUtil.time(), "岗位处理数据表", excels, PostHandleExcel.class); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.java index 845dfd8f..79f59061 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.java @@ -38,5 +38,8 @@ public interface EquipmentMaintenanceMapper extends BaseMapper exportEquipmentMaintenance(@Param("ew") Wrapper queryWrapper); + /** + * 更新设备维护状态 + */ void updateMaintenanceStatus(); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IEquipmentMaintenanceService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IEquipmentMaintenanceService.java index 20a8a7ed..6ef616a0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IEquipmentMaintenanceService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IEquipmentMaintenanceService.java @@ -35,6 +35,16 @@ public interface IEquipmentMaintenanceService extends BaseService exportEquipmentMaintenance(Wrapper queryWrapper); + /** + * 批量增改 + * + * @param equipmentMaintenanceEntities + * @return + */ Boolean submitList(List equipmentMaintenanceEntities); + /** + * 更新设备维护状态 + */ + void updateMaintenanceStatus(); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java index 8c48c7e5..8341ba92 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java @@ -46,4 +46,9 @@ public class EquipmentMaintenanceServiceImpl extends BaseServiceImpl