From e41dc018a1de5667d61b03526c437dc0573b4538 Mon Sep 17 00:00:00 2001 From: qinyulong Date: Mon, 12 Jan 2026 16:33:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E=E6=88=96?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B2=97=E4=BD=8D=E8=AF=81=E4=B9=A6=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0=E5=B2=97=E4=BD=8D=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CertificateMaintenanceController.java | 11 +++++++++-- .../service/ICertificateMaintenanceService.java | 9 ++++++++- .../impl/CertificateMaintenanceServiceImpl.java | 15 +++++++++++++++ .../service/impl/PostHandleServiceImpl.java | 4 ++-- 4 files changed, 34 insertions(+), 5 deletions(-) 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 f030bc6f..c944f804 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 @@ -31,7 +31,6 @@ import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; import java.util.Map; import java.util.List; @@ -123,7 +122,15 @@ public class CertificateMaintenanceController extends BladeController { return R.status(certificateMaintenanceService.deleteLogic(Func.toLongList(ids))); } - + /** + * 批量新增或修改 + */ + @PostMapping("/submit-list") + @ApiOperationSupport(order = 8) + @Operation(summary = "批量新增或修改", description = "") + public R submitList(@Valid @RequestBody List certificateMaintenances) { + return R.status(certificateMaintenanceService.submitList(certificateMaintenances)); + } /** * 导出数据 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java index 77316fa0..a0e5d0b9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java @@ -5,7 +5,6 @@ import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel; import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery; import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; @@ -40,4 +39,12 @@ public interface ICertificateMaintenanceService extends BaseService certificateMaintenances); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java index 14d33de5..df4c6118 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -41,4 +42,18 @@ public class CertificateMaintenanceServiceImpl extends BaseServiceImpl certificateMaintenances) { + //保存基本字段 + boolean saved = this.saveOrUpdateBatch(certificateMaintenances); + //计算过期时间和状态，批量更新 + baseMapper.updateMaintenanceStatus(); + return saved; + } + + + + } 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 70815818..9e5b6894 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 @@ -139,7 +139,7 @@ public class PostHandleServiceImpl extends BaseServiceImpl cultivateDetails = new ArrayList<>(); for (Long phId : ids) { CultivateDetailEntity detail = new CultivateDetailEntity(); - detail.setType((short) 2); + detail.setType(CultivateStatusEnum.JOB_TRANSFER.getCode().shortValue()); detail.setPlanId(trainingPlanId); detail.setPhId(phId); detail.setCaStatus(TrainingStatusEnum.WAIT_DISTRIBUTE.getCode().shortValue()); @@ -180,7 +180,7 @@ public class PostHandleServiceImpl extends BaseServiceImpl cultivateDetails = new ArrayList<>(); for (Long phId : ids) { CultivateDetailEntity detail = new CultivateDetailEntity(); - detail.setType((short) 3); + detail.setType(CultivateStatusEnum.LAYOFF.getCode().shortValue()); detail.setPlanId(trainingPlanId); detail.setPhId(phId); detail.setCaStatus(TrainingStatusEnum.WAIT_DISTRIBUTE.getCode().shortValue());