diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateMaintenanceExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateMaintenanceExcel.java index 50c400106..51078350e 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateMaintenanceExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateMaintenanceExcel.java @@ -1,6 +1,7 @@ package org.springblade.desk.jobTransfer.pojo.excel; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.math.BigDecimal; @@ -29,48 +30,121 @@ public class CertificateMaintenanceExcel implements Serializable { @Serial private static final long serialVersionUID = 1L; - /** - * 岗位处理ID + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("姓名") + private String userName; + /** + * 班组ID + */ + @ColumnWidth(20) + @ExcelProperty("所属班组") + private String deptName; + /** + * 所属岗位 + */ + @ColumnWidth(20) + @ExcelProperty("所属岗位") + private String station; + /** + * 技能等级 */ @ColumnWidth(20) - @ExcelProperty("岗位处理ID") - private Long phId; + @ExcelProperty("技能等级") + private String skillName; /** - * 证书类型ID + * 最高学历 */ @ColumnWidth(20) - @ExcelProperty("证书类型ID") - private Long certificateId; + @ExcelProperty("最高学历") + private String education; + /** + * 出生日期 + */ + @ColumnWidth(20) + @ExcelProperty("出生日期") + private Date dataBirth; + /** + * 证书名称 + */ + @ColumnWidth(20) + @ExcelProperty("证书名称") + private String CertificateTypeName; /** * 证书编号 */ @ColumnWidth(20) @ExcelProperty("证书编号") private String certificateCode; + /** + * 从事本岗位或工种时间 + */ + @ColumnWidth(20) + @ExcelProperty("从事本岗位或工种时间") + private Short workingHours; /** * 证书日期 */ @ColumnWidth(20) @ExcelProperty("证书日期") private Date certificateDate; + /** + * 证书有效期 + */ + @ColumnWidth(20) + @ExcelProperty("证书有效期") + private Short validityPeriod; + /** + * 证书到期日期 + */ + @ColumnWidth(20) + @ExcelProperty("证书到期日期") + private Date validityPeriodExpire; /** * 适航日期 */ @ColumnWidth(20) @ExcelProperty("适航日期") private Date airworthinessDate; + + /** + * 适航有效期 + */ + @ColumnWidth(20) + @ExcelProperty("适航有效期") + private Short airworthinessValidityPeriod; + /** + * 适航日期 + */ + @ColumnWidth(20) + @ExcelProperty("适航到期日期") + private Date airworthinessDateExpire; /** * 宇航日期 */ @ColumnWidth(20) @ExcelProperty("宇航日期") private Date astronautDate; + + /** + * 宇航有效期 + */ + @ColumnWidth(20) + @ExcelProperty("宇航有效期") + private Short astronautValidityPeriod; + /** + * 宇航到期日期 + */ + @ColumnWidth(20) + @ExcelProperty("宇航到期日期") + private Date astronautDateExpire; /** * 维护状态(1正常,2到期,3离职) */ @ColumnWidth(20) - @ExcelProperty("维护状态(1正常,2到期,3离职)") - private Short maintenanceStatus; + @ExcelProperty("状态") + private String MaintenanceStatusName; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CultivateDetailExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CultivateDetailExcel.java index fd5fd1dd5..70f4a3f18 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CultivateDetailExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CultivateDetailExcel.java @@ -29,31 +29,40 @@ public class CultivateDetailExcel implements Serializable { @Serial private static final long serialVersionUID = 1L; + //姓名 + @ColumnWidth(20) + @ExcelProperty("姓名") + private String name; - /** - * 岗位处理ID - */ + //用工号 @ColumnWidth(20) - @ExcelProperty("岗位处理ID") - private Long phId; - /** - * 培训类型(1实习,2转岗,3下岗) - */ + @ExcelProperty("工号") + private String code; + + //用工类型名 @ColumnWidth(20) - @ExcelProperty("培训类型(1实习,2转岗,3下岗)") - private Short type; - /** - * 培训模板ID - */ + @ExcelProperty("用工类型") + private String staffTypeName; + //培训类型 @ColumnWidth(20) - @ExcelProperty("培训模板ID") - private Long planId; - /** - * 培训师ID - */ + @ExcelProperty("培训类型") + private String typeName; + + //培训周期(天) + @ColumnWidth(20) + @ExcelProperty("培训周期(天)") + private Integer cycle; + + //预警周期(天) + @ColumnWidth(20) + @ExcelProperty("预警周期(天)") + private Integer earlyWarningDay; + + //培训计划 @ColumnWidth(20) - @ExcelProperty("培训师ID") - private Long teacherId; + @ExcelProperty("培训计划") + private String planName; + /** * 培训师 */ @@ -63,9 +72,10 @@ public class CultivateDetailExcel implements Serializable { /** * 培训状态(1未配置,2等待下发,3已下发-培训中,4已到期,5已培训-待确认,6培训完成) */ + //状态 @ColumnWidth(20) - @ExcelProperty("培训状态(1未配置,2等待下发,3已下发-培训中,4已到期,5已培训-待确认,6培训完成)") - private Short caStatus; + @ExcelProperty("培训状态") + private String caStatusName; /** * 下发时间 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/EquipmentMaintenanceExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/EquipmentMaintenanceExcel.java index cf14166c8..6742f7169 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/EquipmentMaintenanceExcel.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/EquipmentMaintenanceExcel.java @@ -29,36 +29,83 @@ public class EquipmentMaintenanceExcel implements Serializable { @Serial private static final long serialVersionUID = 1L; - /** - * 岗位处理ID + * 名称 */ @ColumnWidth(20) - @ExcelProperty("岗位处理ID") - private Long phId; + @ExcelProperty("姓名") + private String userName; /** - * 设备ID + * 班组ID */ @ColumnWidth(20) - @ExcelProperty("设备ID") - private Long equipmentId; + @ExcelProperty("所属班组") + private String deptName; /** - * 设备有效期 + * 所属岗位 */ @ColumnWidth(20) - @ExcelProperty("设备有效期") - private Integer equipmentValidityPeriod; + @ExcelProperty("所属岗位") + private String station; + /** + * 技能等级 + */ + @ColumnWidth(20) + @ExcelProperty("技能等级") + private String skillName; + /** + * 最高学历 + */ + @ColumnWidth(20) + @ExcelProperty("最高学历") + private String education; + /** + * 出生日期 + */ + @ColumnWidth(20) + @ExcelProperty("出生日期") + private Date dataBirth; + /** + * 设备名称 + */ + @ColumnWidth(20) + @ExcelProperty("设备名称") + private String deviceName; + /** + * 设备编码 + */ + @ColumnWidth(20) + @ExcelProperty("设备编码") + private String deviceCode; + /** + * 规格型号 + */ + @ColumnWidth(20) + @ExcelProperty("规格型号") + private String macSpec; /** * 设备日期 */ @ColumnWidth(20) @ExcelProperty("设备日期") private Date equipmentDate; + /** + * 设备有效期 + */ + @ColumnWidth(20) + @ExcelProperty("设备有效期") + private Integer equipmentValidityPeriod; + /** + * 设备到期日期 + */ + @ColumnWidth(20) + @ExcelProperty("设备到期日期") + private Date validityPeriodExpire; /** * 维护状态(1正常,2到期,3离职) */ @ColumnWidth(20) - @ExcelProperty("维护状态(1正常,2到期,3离职)") - private Short maintenanceStatus; + @ExcelProperty("状态") + private String maintenanceStatusName; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateMaintenanceVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateMaintenanceVO.java index 7d2ba0fed..17bddf95b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateMaintenanceVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateMaintenanceVO.java @@ -7,6 +7,9 @@ import lombok.EqualsAndHashCode; import org.springblade.desk.jobTransfer.pojo.enums.MaintenanceStatusEnum; import java.io.Serial; +import java.time.LocalDate; +import java.time.Period; +import java.time.ZoneId; import java.util.Calendar; import java.util.Date; @@ -21,6 +24,9 @@ import java.util.Date; public class CertificateMaintenanceVO extends CertificateMaintenanceEntity { @Serial private static final long serialVersionUID = 1L; + +// @Schema(description = "从事本岗位或工种时间") +// private Short workingHours; /** * 证书名称 */ @@ -88,6 +94,28 @@ public class CertificateMaintenanceVO extends CertificateMaintenanceEntity { } } + public Short getWorkingYears() { + Date createTime = this.getCreateTime(); + Date now = new Date(); + + LocalDate startDate = createTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + LocalDate endDate = now.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + + // 使用Period计算间隔 + Period period = Period.between(startDate, endDate); + int years = period.getYears(); + int months = period.getMonths(); + int days = period.getDays(); + + // 如果月数或天数大于0，则说明不满一年但已超出一个完整年份的周期，需要加1 + long workingYears = (months > 0 || days > 0) ? years + 1 : years; + + if (workingYears < Short.MIN_VALUE || workingYears > Short.MAX_VALUE) { + throw new ArithmeticException("工龄数值超出Short范围"); + } + return (short) workingYears; + } + public String getMaintenanceStatusName() { if (this.getMaintenanceStatus() == MaintenanceStatusEnum.DEPART.getCode().shortValue()) { return MaintenanceStatusEnum.DEPART.getName(); diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/EquipmentMaintenanceVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/EquipmentMaintenanceVO.java index 2c09c1c8f..b8721eb2b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/EquipmentMaintenanceVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/EquipmentMaintenanceVO.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.jobTransfer.pojo.enums.MaintenanceStatusEnum; import java.io.Serial; import java.util.Calendar; @@ -50,4 +51,17 @@ public class EquipmentMaintenanceVO extends EquipmentMaintenanceEntity { return null; } } + + public String getMaintenanceStatusName() { + if (this.getMaintenanceStatus() == MaintenanceStatusEnum.DEPART.getCode().shortValue()) { + return MaintenanceStatusEnum.DEPART.getName(); + } + Date date = new Date(); + if (getValidityPeriodExpire() != null && getValidityPeriodExpire().getTime() < date.getTime()) { + setMaintenanceStatus(MaintenanceStatusEnum.DUE.getCode().shortValue()); + return MaintenanceStatusEnum.DUE.getName(); + } + setMaintenanceStatus(MaintenanceStatusEnum.NORMAL.getCode().shortValue()); + return MaintenanceStatusEnum.NORMAL.getName(); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateMaintenanceController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateMaintenanceController.java index c944f804b..139c6941c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateMaintenanceController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateMaintenanceController.java @@ -18,8 +18,12 @@ 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.CertificateMaintenanceExcel; +import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery; import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO; +import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; +import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; +import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -32,6 +36,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; @@ -134,18 +139,38 @@ public class CertificateMaintenanceController extends BladeController { /** * 导出数据 */ - @IsAdmin @GetMapping("/export-certificateMaintenance") @ApiOperationSupport(order = 9) @Operation(summary = "导出数据", description = "传入certificateMaintenance") - public void exportCertificateMaintenance(@Parameter(hidden = true) @RequestParam Map certificateMaintenance, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(certificateMaintenance, CertificateMaintenanceEntity.class); + public void exportCertificateMaintenance(CertificateLedgerQuery certificateLedgerQuery, Query query, BladeUser bladeUser, HttpServletResponse response) { +// QueryWrapper queryWrapper = Condition.getQueryWrapper(certificateMaintenance, CertificateMaintenanceEntity.class); //if (!AuthUtil.isAdministrator()) { // queryWrapper.lambda().eq(CertificateMaintenance::getTenantId, bladeUser.getTenantId()); //} //queryWrapper.lambda().eq(CertificateMaintenanceEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = certificateMaintenanceService.exportCertificateMaintenance(queryWrapper); - ExcelUtil.export(response, "证书维护数据" + DateUtil.time(), "证书维护数据表", list, CertificateMaintenanceExcel.class); +// List list = certificateMaintenanceService.exportCertificateMaintenance(queryWrapper); + query.setSize(99999); + IPage pages = certificateMaintenanceService.selectCertificateMaintenancePage(Condition.getPage(query), certificateLedgerQuery); + List list = pages.getRecords(); + List excels = new ArrayList<>(); + for (CertificateLedgerVO certificateLedgerVO : list) { + PostHandleVO postHandleVO = certificateLedgerVO.getPostHandleVO(); + if (null != certificateLedgerVO.getCertificateMaintenanceVOList() + && certificateLedgerVO.getCertificateMaintenanceVOList().size() > 0) { + for (CertificateMaintenanceVO certificateMaintenanceVO : certificateLedgerVO.getCertificateMaintenanceVOList()) { + CertificateMaintenanceExcel excel = new CertificateMaintenanceExcel(); + BeanUtils.copyProperties(certificateMaintenanceVO, excel); + excel.setUserName(postHandleVO.getName()); + excel.setDeptName(postHandleVO.getDeptName()); + excel.setDataBirth(postHandleVO.getDataBirth()); + excel.setSkillName(postHandleVO.getSkillName()); + excel.setStation(postHandleVO.getStation()); + excel.setEducation(postHandleVO.getEducation()); + excels.add(excel); + } + } + } + ExcelUtil.export(response, "证书维护数据" + DateUtil.time(), "证书维护数据表", excels, CertificateMaintenanceExcel.class); } @PostConstruct // 项目启动后立即执行一次 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateTypeController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateTypeController.java index e35425038..33ed06f75 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateTypeController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateTypeController.java @@ -111,7 +111,6 @@ public class CertificateTypeController extends BladeController { /** * 导出数据 */ - @IsAdmin @GetMapping("/export-certificateType") @ApiOperationSupport(order = 9) @Operation(summary = "导出数据", description = "传入certificateType") 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 604580a31..0a8d9002d 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 @@ -16,7 +16,10 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum; import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; +import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel; import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery; +import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; +import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -30,6 +33,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; +import java.util.ArrayList; import java.util.Date; import java.util.Map; import java.util.List; @@ -116,18 +120,26 @@ public class CultivateDetailController extends BladeController { /** * 导出数据 */ - @IsAdmin @GetMapping("/export-cultivateDetail") @ApiOperationSupport(order = 9) @Operation(summary = "导出数据", description = "传入cultivateDetail") - public void exportCultivateDetail(@Parameter(hidden = true) @RequestParam Map cultivateDetail, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(cultivateDetail, CultivateDetailEntity.class); + public void exportCultivateDetail(CultivateDetailQuery cultivateDetailQuery, Query query, HttpServletResponse response) { +// QueryWrapper queryWrapper = Condition.getQueryWrapper(cultivateDetail, CultivateDetailEntity.class); //if (!AuthUtil.isAdministrator()) { // queryWrapper.lambda().eq(CultivateDetail::getTenantId, bladeUser.getTenantId()); //} //queryWrapper.lambda().eq(CultivateDetailEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = cultivateDetailService.exportCultivateDetail(queryWrapper); - ExcelUtil.export(response, "培训安排数据" + DateUtil.time(), "培训安排数据表", list, CultivateDetailExcel.class); +// List list = cultivateDetailService.exportCultivateDetail(queryWrapper); + query.setSize(99999); + IPage pages = cultivateDetailService.selectCultivateDetailPage(Condition.getPage(query), cultivateDetailQuery); + List list = pages.getRecords(); + List excels = new ArrayList<>(); + for (CultivateDetailVO cultivateDetailVO : list) { + CultivateDetailExcel excel = new CultivateDetailExcel(); + BeanUtils.copyProperties(cultivateDetailVO, excel); + excels.add(excel); + } + ExcelUtil.export(response, "培训安排数据" + DateUtil.time(), "培训安排数据表", excels, CultivateDetailExcel.class); } /** 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 aad088948..d3437a40e 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 @@ -19,14 +19,15 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel; +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.springblade.desk.jobTransfer.pojo.vo.*; +import org.springframework.beans.BeanUtils; 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; import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceVO; import org.springblade.desk.jobTransfer.wrapper.EquipmentMaintenanceWrapper; import org.springblade.desk.jobTransfer.service.IEquipmentMaintenanceService; import org.springblade.core.boot.ctrl.BladeController; @@ -34,6 +35,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; +import java.util.ArrayList; import java.util.Map; import java.util.List; @@ -136,18 +138,38 @@ public class EquipmentMaintenanceController extends BladeController { /** * 导出数据 */ - @IsAdmin @GetMapping("/export-equipmentMaintenance") @ApiOperationSupport(order = 9) @Operation(summary = "导出数据", description = "传入equipmentMaintenance") - public void exportEquipmentMaintenance(@Parameter(hidden = true) @RequestParam Map equipmentMaintenance, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(equipmentMaintenance, EquipmentMaintenanceEntity.class); + public void exportEquipmentMaintenance(EquipmentMaintenanceQuery equipmentMaintenanceQuery, Query query, BladeUser bladeUser, HttpServletResponse response) { +// QueryWrapper queryWrapper = Condition.getQueryWrapper(equipmentMaintenance, EquipmentMaintenanceEntity.class); //if (!AuthUtil.isAdministrator()) { // queryWrapper.lambda().eq(EquipmentMaintenance::getTenantId, bladeUser.getTenantId()); //} //queryWrapper.lambda().eq(EquipmentMaintenanceEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = equipmentMaintenanceService.exportEquipmentMaintenance(queryWrapper); - ExcelUtil.export(response, "岗位设备维护数据" + DateUtil.time(), "岗位设备维护数据表", list, EquipmentMaintenanceExcel.class); +// List list = equipmentMaintenanceService.exportEquipmentMaintenance(queryWrapper); + query.setSize(99999); + IPage pages = equipmentMaintenanceService.selectEquipmentMaintenancePage(Condition.getPage(query), equipmentMaintenanceQuery); + List list = pages.getRecords(); + List excels = new ArrayList<>(); + for (EquipmentMaintenanceListVO equipmentMaintenanceListVO : list) { + PostHandleVO postHandleVO = equipmentMaintenanceListVO.getPostHandleVO(); + if (null != equipmentMaintenanceListVO.getEquipmentMaintenanceVOList() + && equipmentMaintenanceListVO.getEquipmentMaintenanceVOList().size() > 0) { + for (EquipmentMaintenanceVO maintenanceVO : equipmentMaintenanceListVO.getEquipmentMaintenanceVOList()) { + EquipmentMaintenanceExcel excel = new EquipmentMaintenanceExcel(); + BeanUtils.copyProperties(maintenanceVO, excel); + excel.setUserName(postHandleVO.getName()); + excel.setDeptName(postHandleVO.getDeptName()); + excel.setDataBirth(postHandleVO.getDataBirth()); + excel.setSkillName(postHandleVO.getSkillName()); + excel.setStation(postHandleVO.getStation()); + excel.setEducation(postHandleVO.getEducation()); + excels.add(excel); + } + } + } + ExcelUtil.export(response, "岗位设备维护数据" + DateUtil.time(), "岗位设备维护数据表", excels, EquipmentMaintenanceExcel.class); } @PostConstruct // 项目启动后立即执行一次 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/TrainingPlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/TrainingPlanController.java index dd6276a08..ff06551cd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/TrainingPlanController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/TrainingPlanController.java @@ -130,7 +130,6 @@ public class TrainingPlanController extends BladeController { /** * 导出数据 */ - @IsAdmin @GetMapping("/export-trainingPlan") @ApiOperationSupport(order = 9) @Operation(summary = "导出数据", description = "传入trainingPlan") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml index 2f8f7b155..93194c53d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml @@ -93,6 +93,7 @@ + @@ -113,6 +114,7 @@ bd.TS_NAME as DEPT_NAME, cm.id as cm_id, cm.ph_id as cm_ph_id, + cm.create_time as cm_create_time, cm.certificate_id, cm.certificate_code, cm.certificate_date, diff --git a/doc/sql/mes/increase-260113.sql b/doc/sql/mes/increase-260113.sql index c61bf0376..11e0f216c 100644 --- a/doc/sql/mes/increase-260113.sql +++ b/doc/sql/mes/increase-260113.sql @@ -3,3 +3,81 @@ ALTER TABLE MES_EQUIPMENT MODIFY (WORKSTATION_ID NUMBER (20,0)); ALTER TABLE MES_EQUIPMENT RENAME COLUMN WORKSTATION_ID TO WORK_CENTER_ID; +--字典 +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010964046474784769', '0', 'staff_type', '-1', '用工类型', '1026', '用工类型', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010964096160509954', '2010964046474784769', 'staff_type', '1', '实习工', '1', '实习工', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010964125885542401', '2010964046474784769', 'staff_type', '2', '正式工', '2', '正式工', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010964532472983554', '0', 'cultivate_status', '-1', '培训类型', '1027', '培训类型', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010964577607888897', '2010964532472983554', 'cultivate_status', '1', '实习', '1', '实习', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010964608230502401', '2010964532472983554', 'cultivate_status', '2', '转岗', '2', '转岗', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010964640312733697', '2010964532472983554', 'cultivate_status', '3', '下岗', '3', '下岗', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010964863843971073', '0', 'training_status', '-1', '培训状态', '1028', '培训状态', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010964906055446530', '2010964863843971073', 'training_status', '1', '未配置', '1', '未配置', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010964940725563393', '2010964863843971073', 'training_status', '2', '等待下发', '2', '等待下发', '0', '1', + '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010964980449816578', '2010964863843971073', 'training_status', '3', '已下发-培训中', '3', '已下发-培训中', + '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010965012834037761', '2010964863843971073', 'training_status', '4', '已到期', '4', '已到期', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010965054177292289', '2010964863843971073', 'training_status', '5', '已培训-待确认', '5', '已培训-待确认', + '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010965089786933249', '2010964863843971073', 'training_status', '6', '培训完成', '6', '培训完成', '0', '1', + '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2008364878937874434', '0', 'equipment_used', '-1', '设备服役状态', '1021', '设备服役状态', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2008364966972121090', '2008364878937874434', 'equipment_used', '1', '正常服役', '0', '正常服役', '0', '1', + '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2008365020491440129', '2008364878937874434', 'equipment_used', '2', '服役中', '1', '服役中', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2008365080713256962', '2008364878937874434', 'equipment_used', '3', '暂停服役', '2', '暂停服役', '0', '1', + '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010961090912333825', '0', 'post_handle_status', '-1', '人员岗位管理状态', '1024', NULL, '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010961260999749634', '2010961090912333825', 'post_handle_status', '1', '实习中', '1', '实习中', '0', '1', + '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010961315622170625', '2010961090912333825', 'post_handle_status', '2', '转岗中', '2', '转岗中', '0', '1', + '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010961353375100929', '2010961090912333825', 'post_handle_status', '3', '正常', '3', '正常', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010961399629885441', '2010961090912333825', 'post_handle_status', '4', '下岗中', '4', '下岗中', '0', '1', + '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010961438691438593', '2010961090912333825', 'post_handle_status', '5', '离职', '5', '离职', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010961468466802689', '2010961090912333825', 'post_handle_status', '6', '转岗培训合格', '6', '转岗培训合格', + '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010961519066886145', '2010961090912333825', 'post_handle_status', '7', '下岗培训合格', '7', '下岗培训合格', + '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010961567850835970', '2010961090912333825', 'post_handle_status', '8', '实习培训合格', '8', '实习培训合格', + '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010961601405267970', '2010961090912333825', 'post_handle_status', '9', '培训不合格', '9', '培训不合格', '0', + '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010962442006704130', '0', 'skill_level', '-1', '技能等级', '1025', '技能等级', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010962529642491905', '2010962442006704130', 'skill_level', '1', '中级', '1', '中级', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010962574047588354', '2010962442006704130', 'skill_level', '2', '高级', '2', '高级', '0', '1', '0'); +INSERT INTO BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED) +VALUES ('2010962612769402882', '2010962442006704130', 'skill_level', '3', '技师', '3', '技师', '0', '1', '0');