suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改文件路径-sjx

Browse Source
develop-QA
sunjianxi 3 months ago
parent 3eafa13e5d
commit 157fa60c2c
36 changed files with 69 additions and 103 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateMaintenanceController.java
  2. 8
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateTypeController.java
  3. 13
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CultivateDetailController.java
  4. 12
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java
  5. 6
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java
  6. 11
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/TrainingPlanController.java
  7. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java
  8. 6
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml
  9. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.java
  10. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.xml
  11. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.java
  12. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.xml
  13. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.java
  14. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.xml
  15. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.java
  16. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.xml
  17. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.java
  18. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.xml
  19. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java
  20. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateTypeService.java
  21. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICultivateDetailService.java
  22. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IEquipmentMaintenanceService.java
  23. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java
  24. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ITrainingPlanService.java
  25. 10
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java
  26. 6
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateTypeServiceImpl.java
  27. 9
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java
  28. 7
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java
  29. 12
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java
  30. 7
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/TrainingPlanServiceImpl.java
  31. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateMaintenanceWrapper.java
  32. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateTypeWrapper.java
  33. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CultivateDetailWrapper.java
  34. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/EquipmentMaintenanceWrapper.java
  35. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/PostHandleWrapper.java
  36. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/TrainingPlanWrapper.java

15
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateMaintenanceController.java
Unescape View File

@ -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<Resource> downloadExcelTemplate() {
return ExcelExtUtil.downloadXlsTemplate(
"Excel/jobTransfer/证书维护导入模板.xls",
"Excel/jobtransfer/证书维护导入模板.xls",
"证书维护导入模板.xls");
}

8
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateTypeController.java
Unescape View File

@ -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;

13
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CultivateDetailController.java
Unescape View File

@ -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;

12
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java
Unescape View File

@ -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;

6
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java
Unescape View File

@ -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;

11
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/TrainingPlanController.java
Unescape View File

@ -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;

3
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java
Unescape View File

@ -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;

6
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.desk.jobTransfer.mapper.CertificateMaintenanceMapper">
<mapper namespace="org.springblade.desk.jobtransfer.mapper.CertificateMaintenanceMapper">
<!-- 通用查询映射结果 -->
<resultMap id="mesCertificateMaintenanceResultMap"
@ -23,12 +23,12 @@
<result column="MAINTENANCE_STATUS" property="maintenanceStatus"/>
</resultMap>
<!-- 结果映射：一对多关系 -->
<!-- <resultMap id="certificateLedgerMap" type="org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO">-->
<!-- <resultMap id="certificateLedgerMap" type="vo.org.springblade.desk.jobtransfer.pojo.CertificateLedgerVO">-->
<!-- &lt;!&ndash; 人员岗位数据映射 &ndash;&gt;-->
<!-- <association property="postHandleVO" resultMap="postHandleMap"/>-->
<!-- &lt;!&ndash; 岗位证书数据集合映射 &ndash;&gt;-->
<!-- <collection property="certificateMaintenanceVOList"-->
<!-- ofType="org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO"-->
<!-- ofType="vo.org.springblade.desk.jobtransfer.pojo.CertificateMaintenanceVO"-->
<!-- resultMap="certificateMaintenanceMap"/>-->
<!-- </resultMap>-->

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.java
Unescape View File

@ -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;

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.desk.jobTransfer.mapper.CertificateTypeMapper">
<mapper namespace="org.springblade.desk.jobtransfer.mapper.CertificateTypeMapper">
<!-- 通用查询映射结果 -->
<resultMap id="mesCertificateTypeResultMap"

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.java
Unescape View File

@ -1,4 +1,4 @@
package org.springblade.desk.jobTransfer.mapper;
package org.springblade.desk.jobtransfer.mapper;
import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity;
import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel;

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.desk.jobTransfer.mapper.CultivateDetailMapper">
<mapper namespace="org.springblade.desk.jobtransfer.mapper.CultivateDetailMapper">
<!-- 通用查询映射结果 -->
<resultMap id="mesCultivateDetailResultMap"

3
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.java
Unescape View File

@ -1,10 +1,9 @@
package org.springblade.desk.jobTransfer.mapper;
package org.springblade.desk.jobtransfer.mapper;
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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.desk.jobTransfer.mapper.EquipmentMaintenanceMapper">
<mapper namespace="org.springblade.desk.jobtransfer.mapper.EquipmentMaintenanceMapper">
<!-- 通用查询映射结果 -->
<resultMap id="mesEquipmentMaintenanceResultMap"

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.java
Unescape View File

@ -1,4 +1,4 @@
package org.springblade.desk.jobTransfer.mapper;
package org.springblade.desk.jobtransfer.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity;

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.desk.jobTransfer.mapper.PostHandleMapper">
<mapper namespace="org.springblade.desk.jobtransfer.mapper.PostHandleMapper">
<!-- 通用查询映射结果 -->
<resultMap id="mesPostHandleResultMap" type="org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity">

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.java
Unescape View File

@ -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;

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.desk.jobTransfer.mapper.TrainingPlanMapper">
<mapper namespace="org.springblade.desk.jobtransfer.mapper.TrainingPlanMapper">
<!-- 通用查询映射结果 -->
<resultMap id="mesTrainingPlanResultMap" type="org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity">

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java
Unescape View File

@ -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;

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateTypeService.java
Unescape View File

@ -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;

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICultivateDetailService.java
Unescape View File

@ -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;

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IEquipmentMaintenanceService.java
Unescape View File

@ -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;

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java
Unescape View File

@ -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;

3
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ITrainingPlanService.java
Unescape View File

@ -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;

10
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java
Unescape View File

@ -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;

6
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateTypeServiceImpl.java
Unescape View File

@ -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;

9
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java
Unescape View File

@ -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;

7
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java
Unescape View File

@ -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;

12
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java
Unescape View File

@ -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;

7
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/TrainingPlanServiceImpl.java
Unescape View File

@ -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;

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateMaintenanceWrapper.java
Unescape View File

@ -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;

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateTypeWrapper.java
Unescape View File

@ -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;

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CultivateDetailWrapper.java
Unescape View File

@ -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;

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/EquipmentMaintenanceWrapper.java
Unescape View File

@ -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;

3
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/PostHandleWrapper.java
Unescape View File

@ -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;

2
blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/TrainingPlanWrapper.java
Unescape View File

@ -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;

Write Preview
Loading…
Cancel
Save