From 157fa60c2cd8b869cd41573bc458fbde23b89af6 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Fri, 16 Jan 2026 16:27:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E8=B7=AF?= =?UTF-8?q?=E5=BE=84-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CertificateMaintenanceController.java | 15 ++++----------- .../controller/CertificateTypeController.java | 8 +++----- .../controller/CultivateDetailController.java | 13 +++---------- .../EquipmentMaintenanceController.java | 12 +++--------- .../controller/PostHandleController.java | 6 +++--- .../controller/TrainingPlanController.java | 11 +++-------- .../mapper/CertificateMaintenanceMapper.java | 3 +-- .../mapper/CertificateMaintenanceMapper.xml | 6 +++--- .../jobTransfer/mapper/CertificateTypeMapper.java | 2 +- .../jobTransfer/mapper/CertificateTypeMapper.xml | 2 +- .../jobTransfer/mapper/CultivateDetailMapper.java | 2 +- .../jobTransfer/mapper/CultivateDetailMapper.xml | 2 +- .../mapper/EquipmentMaintenanceMapper.java | 3 +-- .../mapper/EquipmentMaintenanceMapper.xml | 2 +- .../desk/jobTransfer/mapper/PostHandleMapper.java | 2 +- .../desk/jobTransfer/mapper/PostHandleMapper.xml | 2 +- .../jobTransfer/mapper/TrainingPlanMapper.java | 2 +- .../jobTransfer/mapper/TrainingPlanMapper.xml | 2 +- .../service/ICertificateMaintenanceService.java | 2 +- .../service/ICertificateTypeService.java | 2 +- .../service/ICultivateDetailService.java | 2 +- .../service/IEquipmentMaintenanceService.java | 2 +- .../jobTransfer/service/IPostHandleService.java | 2 +- .../jobTransfer/service/ITrainingPlanService.java | 3 +-- .../impl/CertificateMaintenanceServiceImpl.java | 10 +++++----- .../service/impl/CertificateTypeServiceImpl.java | 6 +++--- .../service/impl/CultivateDetailServiceImpl.java | 9 ++++----- .../impl/EquipmentMaintenanceServiceImpl.java | 7 +++---- .../service/impl/PostHandleServiceImpl.java | 12 ++++++------ .../service/impl/TrainingPlanServiceImpl.java | 7 +++---- .../wrapper/CertificateMaintenanceWrapper.java | 2 +- .../wrapper/CertificateTypeWrapper.java | 2 +- .../wrapper/CultivateDetailWrapper.java | 2 +- .../wrapper/EquipmentMaintenanceWrapper.java | 2 +- .../jobTransfer/wrapper/PostHandleWrapper.java | 3 +-- .../jobTransfer/wrapper/TrainingPlanWrapper.java | 2 +- 36 files changed, 69 insertions(+), 103 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 84321bfe..6d505bd3 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 @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -12,7 +12,6 @@ import lombok.AllArgsConstructor; import jakarta.validation.Valid; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -20,25 +19,19 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel; import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceImport; -import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport; 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.springblade.system.cache.UserCache; -import org.springblade.system.pojo.entity.UserInfo; import org.springframework.beans.BeanUtils; import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; 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.CertificateMaintenanceEntity; import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO; -import org.springblade.desk.jobTransfer.wrapper.CertificateMaintenanceWrapper; -import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService; +import org.springblade.desk.jobtransfer.wrapper.CertificateMaintenanceWrapper; +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; @@ -187,7 +180,7 @@ public class CertificateMaintenanceController extends BladeController { @Operation(summary = "下载Excel模板", description = "") public ResponseEntity downloadExcelTemplate() { return ExcelExtUtil.downloadXlsTemplate( - "Excel/jobTransfer/证书维护导入模板.xls", + "Excel/jobtransfer/证书维护导入模板.xls", "证书维护导入模板.xls"); } 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 97b44fbf..3b6d7343 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 @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -8,7 +8,6 @@ import lombok.AllArgsConstructor; import jakarta.validation.Valid; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -19,12 +18,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO; -import org.springblade.desk.jobTransfer.wrapper.CertificateTypeWrapper; -import org.springblade.desk.jobTransfer.service.ICertificateTypeService; +import org.springblade.desk.jobtransfer.wrapper.CertificateTypeWrapper; +import org.springblade.desk.jobtransfer.service.ICertificateTypeService; 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; 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 30bbbdf6..1e07e10e 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 @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -8,34 +8,27 @@ import jakarta.annotation.PostConstruct; import lombok.AllArgsConstructor; import jakarta.validation.Valid; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; 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.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; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; -import org.springblade.desk.jobTransfer.wrapper.CultivateDetailWrapper; -import org.springblade.desk.jobTransfer.service.ICultivateDetailService; +import org.springblade.desk.jobtransfer.wrapper.CultivateDetailWrapper; +import org.springblade.desk.jobtransfer.service.ICultivateDetailService; 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.ArrayList; import java.util.Date; -import java.util.Map; import java.util.List; import jakarta.servlet.http.HttpServletResponse; 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 019f5f9e..08d9d2f6 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 @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -12,31 +12,25 @@ import lombok.AllArgsConstructor; import jakarta.validation.Valid; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; 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.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.*; 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.wrapper.EquipmentMaintenanceWrapper; -import org.springblade.desk.jobTransfer.service.IEquipmentMaintenanceService; +import org.springblade.desk.jobtransfer.wrapper.EquipmentMaintenanceWrapper; +import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService; 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.ArrayList; -import java.util.Map; import java.util.List; import jakarta.servlet.http.HttpServletResponse; 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 c96cf453..ab958e64 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,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.micrometer.core.instrument.binder.BaseUnits; import io.swagger.v3.oas.annotations.Parameters; @@ -30,8 +30,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; -import org.springblade.desk.jobTransfer.wrapper.PostHandleWrapper; -import org.springblade.desk.jobTransfer.service.IPostHandleService; +import org.springblade.desk.jobtransfer.wrapper.PostHandleWrapper; +import org.springblade.desk.jobtransfer.service.IPostHandleService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; 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 ff06551c..55f9b054 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 @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -11,27 +11,22 @@ import lombok.AllArgsConstructor; import jakarta.validation.Valid; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; 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.entity.CultivateDetailEntity; -import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum; import org.springblade.desk.jobTransfer.pojo.excel.TrainingPlanExcel; 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.TrainingPlanEntity; import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO; -import org.springblade.desk.jobTransfer.wrapper.TrainingPlanWrapper; -import org.springblade.desk.jobTransfer.service.ITrainingPlanService; +import org.springblade.desk.jobtransfer.wrapper.TrainingPlanWrapper; +import org.springblade.desk.jobtransfer.service.ITrainingPlanService; 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.Date; import java.util.Map; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java index 85ea27e8..4192a155 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java @@ -1,10 +1,9 @@ -package org.springblade.desk.jobTransfer.mapper; +package org.springblade.desk.jobtransfer.mapper; 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.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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 fb44eea5..dff07c11 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 @@ -1,6 +1,6 @@ - + - + - + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.java index 8c322867..fa121106 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.mapper; +package org.springblade.desk.jobtransfer.mapper; import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; import org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.xml index e8d02765..44871de5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.xml @@ -1,6 +1,6 @@ - + - + - + - + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.java index 74e8ad84..9b176a80 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.mapper; +package org.springblade.desk.jobtransfer.mapper; import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity; import org.springblade.desk.jobTransfer.pojo.excel.TrainingPlanExcel; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.xml index 9996d23c..d1535582 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.xml @@ -1,6 +1,6 @@ - + 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 dba9d2d0..d16cfa2b 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 @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.service; +package org.springblade.desk.jobtransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.springblade.core.tool.api.R; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateTypeService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateTypeService.java index e976a6dd..37af5d26 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateTypeService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateTypeService.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.service; +package org.springblade.desk.jobtransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; 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 febffdc1..f776797f 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 @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.service; +package org.springblade.desk.jobtransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.springblade.core.tool.api.R; 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 6ef616a0..f3410f91 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 @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.service; +package org.springblade.desk.jobtransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java index fdb37701..def7a292 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.service; +package org.springblade.desk.jobtransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.springblade.core.tool.api.R; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ITrainingPlanService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ITrainingPlanService.java index bd0bbacb..f608b33e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ITrainingPlanService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ITrainingPlanService.java @@ -1,9 +1,8 @@ -package org.springblade.desk.jobTransfer.service; +package org.springblade.desk.jobtransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity; import org.springblade.desk.jobTransfer.pojo.excel.TrainingPlanExcel; -import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; 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 89c27b2c..1d9dbd88 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 @@ -1,10 +1,10 @@ -package org.springblade.desk.jobTransfer.service.impl; +package org.springblade.desk.jobtransfer.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.annotation.Resource; import org.springblade.core.tool.api.R; -import org.springblade.desk.jobTransfer.mapper.CertificateTypeMapper; -import org.springblade.desk.jobTransfer.mapper.PostHandleMapper; +import org.springblade.desk.jobtransfer.mapper.CertificateTypeMapper; +import org.springblade.desk.jobtransfer.mapper.PostHandleMapper; import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; import org.springblade.desk.jobTransfer.pojo.enums.PostHandleStatusEnum; @@ -13,8 +13,8 @@ import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel; import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceImport; import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery; import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO; -import org.springblade.desk.jobTransfer.mapper.CertificateMaintenanceMapper; -import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService; +import org.springblade.desk.jobtransfer.mapper.CertificateMaintenanceMapper; +import org.springblade.desk.jobtransfer.service.ICertificateMaintenanceService; import org.springblade.system.cache.UserCache; import org.springblade.system.pojo.entity.UserInfo; import org.springframework.stereotype.Service; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateTypeServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateTypeServiceImpl.java index a6bc9570..7684ef99 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateTypeServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateTypeServiceImpl.java @@ -1,10 +1,10 @@ -package org.springblade.desk.jobTransfer.service.impl; +package org.springblade.desk.jobtransfer.service.impl; import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; import org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel; import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO; -import org.springblade.desk.jobTransfer.mapper.CertificateTypeMapper; -import org.springblade.desk.jobTransfer.service.ICertificateTypeService; +import org.springblade.desk.jobtransfer.mapper.CertificateTypeMapper; +import org.springblade.desk.jobtransfer.service.ICertificateTypeService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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 4f7ad9d1..73acde2f 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 @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.service.impl; +package org.springblade.desk.jobtransfer.service.impl; import jakarta.annotation.Resource; import org.springblade.core.tool.api.R; @@ -8,10 +8,9 @@ import org.springblade.desk.jobTransfer.pojo.enums.PostHandleStatusEnum; 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; -import org.springblade.desk.jobTransfer.service.IPostHandleService; -import org.springframework.beans.factory.annotation.Autowired; +import org.springblade.desk.jobtransfer.mapper.CultivateDetailMapper; +import org.springblade.desk.jobtransfer.service.ICultivateDetailService; +import org.springblade.desk.jobtransfer.service.IPostHandleService; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; 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 8341ba92..9b193be1 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 @@ -1,12 +1,11 @@ -package org.springblade.desk.jobTransfer.service.impl; +package org.springblade.desk.jobtransfer.service.impl; import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; 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.EquipmentMaintenanceVO; -import org.springblade.desk.jobTransfer.mapper.EquipmentMaintenanceMapper; -import org.springblade.desk.jobTransfer.service.IEquipmentMaintenanceService; +import org.springblade.desk.jobtransfer.mapper.EquipmentMaintenanceMapper; +import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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 1f20fc62..d3948583 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 @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.service.impl; +package org.springblade.desk.jobtransfer.service.impl; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import jakarta.annotation.Resource; @@ -15,11 +15,11 @@ 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; -import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService; -import org.springblade.desk.jobTransfer.service.ICultivateDetailService; -import org.springblade.desk.jobTransfer.service.IEquipmentMaintenanceService; -import org.springblade.desk.jobTransfer.service.IPostHandleService; +import org.springblade.desk.jobtransfer.mapper.PostHandleMapper; +import org.springblade.desk.jobtransfer.service.ICertificateMaintenanceService; +import org.springblade.desk.jobtransfer.service.ICultivateDetailService; +import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService; +import org.springblade.desk.jobtransfer.service.IPostHandleService; import org.springblade.system.cache.SysCache; import org.springblade.system.cache.UserCache; import org.springblade.system.pojo.entity.User; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/TrainingPlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/TrainingPlanServiceImpl.java index f642b888..56a65f74 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/TrainingPlanServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/TrainingPlanServiceImpl.java @@ -1,12 +1,11 @@ -package org.springblade.desk.jobTransfer.service.impl; +package org.springblade.desk.jobtransfer.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity; import org.springblade.desk.jobTransfer.pojo.excel.TrainingPlanExcel; -import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO; -import org.springblade.desk.jobTransfer.mapper.TrainingPlanMapper; -import org.springblade.desk.jobTransfer.service.ITrainingPlanService; +import org.springblade.desk.jobtransfer.mapper.TrainingPlanMapper; +import org.springblade.desk.jobtransfer.service.ITrainingPlanService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateMaintenanceWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateMaintenanceWrapper.java index 49f91ec6..39b0cb6a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateMaintenanceWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateMaintenanceWrapper.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.wrapper; +package org.springblade.desk.jobtransfer.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateTypeWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateTypeWrapper.java index 920d0d1c..f9afd749 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateTypeWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateTypeWrapper.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.wrapper; +package org.springblade.desk.jobtransfer.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CultivateDetailWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CultivateDetailWrapper.java index 39ef09f7..ab48529c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CultivateDetailWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CultivateDetailWrapper.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.wrapper; +package org.springblade.desk.jobtransfer.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/EquipmentMaintenanceWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/EquipmentMaintenanceWrapper.java index 9cd1b3b9..29ba2694 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/EquipmentMaintenanceWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/EquipmentMaintenanceWrapper.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.wrapper; +package org.springblade.desk.jobtransfer.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/PostHandleWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/PostHandleWrapper.java index 3a1b5ad0..94f77a6e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/PostHandleWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/PostHandleWrapper.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.wrapper; +package org.springblade.desk.jobtransfer.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; @@ -8,7 +8,6 @@ import org.springblade.system.cache.SysCache; import org.springblade.system.cache.UserCache; import org.springblade.system.pojo.entity.Dept; import org.springblade.system.pojo.entity.User; -import org.springblade.system.pojo.entity.UserDept; import java.util.Objects; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/TrainingPlanWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/TrainingPlanWrapper.java index 8eb00fa9..2c95150a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/TrainingPlanWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/TrainingPlanWrapper.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.wrapper; +package org.springblade.desk.jobtransfer.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil;