From 06f622b85d24927adb499eb562b89f376e7dc752 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 19 一月 2026 17:52:01 +0800
Subject: [PATCH] 删除StaffJoinLeaveRecord相关代码
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 9 ----
src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java | 4 --
src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java | 12 +++---
src/main/java/com/ruoyi/quality/service/IQualityInspectService.java | 3 -
src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java | 9 ++--
src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java | 3 -
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java | 4 +-
src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java | 1
/dev/null | 43 ---------------------
src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java | 4 --
src/main/java/com/ruoyi/staff/service/StaffContractService.java | 7 ---
src/main/java/com/ruoyi/staff/service/StaffLeaveService.java | 2 -
src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java | 2 -
13 files changed, 14 insertions(+), 89 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
index bef5926..75cbc5a 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
@@ -30,8 +30,8 @@
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.project.system.service.ISysNoticeService;
-import com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
+import com.ruoyi.staff.mapper.StaffOnJobMapper;
+import com.ruoyi.staff.pojo.StaffOnJob;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -48,11 +48,12 @@
private final MeetDraftMapper meetDraftMapper;
private final MeetApplicationMapper meetApplicationMapper;
- private final StaffJoinLeaveRecordMapper staffJoinLeaveRecordMapper;
+ private final StaffOnJobMapper staffOnJobMapper;
private final MeetingMinutesMapper meetingMinutesMapper;
private final SysUserMapper userMapper;
private final ISysNoticeService sysNoticeService;
+
@Override
public IPage<MeetingRoom> getMeetingRoomList(SearchMeetingRoomVo vo) {
@@ -165,7 +166,7 @@
.filter(s -> !s.isEmpty())
.map(Long::valueOf)
.map(staffId -> {
- StaffJoinLeaveRecord record = staffJoinLeaveRecordMapper.selectById(staffId);
+ StaffOnJob record = staffOnJobMapper.selectById(staffId);
if (record == null) {
return null;
}
diff --git a/src/main/java/com/ruoyi/quality/service/IQualityInspectService.java b/src/main/java/com/ruoyi/quality/service/IQualityInspectService.java
index f464e9b..92bc88f 100644
--- a/src/main/java/com/ruoyi/quality/service/IQualityInspectService.java
+++ b/src/main/java/com/ruoyi/quality/service/IQualityInspectService.java
@@ -5,11 +5,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.pojo.QualityInspect;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
-import com.ruoyi.staff.pojo.StaffOnJob;
import javax.servlet.http.HttpServletResponse;
-import java.util.List;
public interface IQualityInspectService extends IService<QualityInspect> {
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index f4b6e2c..48b055b 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -1,10 +1,8 @@
package com.ruoyi.quality.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,22 +19,15 @@
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.mapper.QualityInspectMapper;
-import com.ruoyi.quality.mapper.QualityInspectParamMapper;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
import com.ruoyi.quality.mapper.QualityUnqualifiedMapper;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectParam;
-import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper;
-import com.ruoyi.staff.mapper.StaffOnJobMapper;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
-import com.ruoyi.staff.pojo.StaffOnJob;
-import com.ruoyi.staff.service.IStaffOnJobService;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
index 2f84699..53f55fd 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
@@ -3,8 +3,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
-import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.PersonalAttendanceRecordsService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffJoinLeaveRecordController.java b/src/main/java/com/ruoyi/staff/controller/StaffJoinLeaveRecordController.java
deleted file mode 100644
index ceec984..0000000
--- a/src/main/java/com/ruoyi/staff/controller/StaffJoinLeaveRecordController.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.ruoyi.staff.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.dto.SupplierManageDto;
-import com.ruoyi.basic.pojo.SupplierManage;
-import com.ruoyi.basic.service.ISupplierService;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.staff.dto.StaffJoinLeaveRecordDto;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
-import com.ruoyi.staff.service.IStaffJoinLeaveRecordService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 鏂板鍏ヨ亴/绂昏亴
- */
-@RestController
-@RequestMapping("/staff/staffJoinLeaveRecord")
-public class StaffJoinLeaveRecordController {
-
- @Resource
- private IStaffJoinLeaveRecordService staffJoinLeaveRecordService;
-
- /**
- * 鏂板鍏ヨ亴/绂昏亴
- * @param staffJoinLeaveRecord
- * @return
- */
- @PostMapping("/add")
- public AjaxResult add(@RequestBody StaffJoinLeaveRecord staffJoinLeaveRecord) {
- return AjaxResult.success(staffJoinLeaveRecordService.add(staffJoinLeaveRecord));
- }
-
- /**
- * 鍒犻櫎鍏ヨ亴/绂昏亴
- * @param ids
- * @return
- */
- @DeleteMapping("/del")
- public AjaxResult delStaffJoinLeaveRecord(@RequestBody List<Integer> ids) {
- if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
- }
- return AjaxResult.success(staffJoinLeaveRecordService.delStaffJoinLeaveRecord(ids));
- }
-
- /**
- * 鍏ヨ亴/绂昏亴璇︽儏
- * @param id
- * @return
- */
- @GetMapping("/{id}")
- public AjaxResult staffJoinLeaveRecordDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(staffJoinLeaveRecordService.getById(id));
- }
-
- /**
- * 鍏ヨ亴/绂昏亴淇敼
- * @param staffJoinLeaveRecord
- * @return
- */
- @PostMapping("/update")
- public AjaxResult update(@RequestBody StaffJoinLeaveRecord staffJoinLeaveRecord) {
- return AjaxResult.success(staffJoinLeaveRecordService.updateStaffJoinLeaveRecord(staffJoinLeaveRecord));
- }
-
- /**
- * 鍏ヨ亴/绂昏亴鍒嗛〉鏌ヨ
- * @param page
- * @param staffJoinLeaveRecord
- * @return
- */
- @GetMapping("/listPage")
- public AjaxResult staffJoinLeaveRecordListPage(Page page, StaffJoinLeaveRecord staffJoinLeaveRecord) {
- return AjaxResult.success(staffJoinLeaveRecordService.staffJoinLeaveRecordListPage(page, staffJoinLeaveRecord));
- }
-
- /**
- * 鍏ヨ亴/绂昏亴瀵煎嚭
- * @param response
- * @param staffJoinLeaveRecord
- */
- @PostMapping("/export")
- public void staffJoinLeaveRecordExport(HttpServletResponse response,StaffJoinLeaveRecord staffJoinLeaveRecord) {
- staffJoinLeaveRecordService.staffJoinLeaveRecordExport(response, staffJoinLeaveRecord);
- }
-
-
-}
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java b/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
index f4a0830..c018008 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.StaffLeaveDto;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
import com.ruoyi.staff.service.StaffLeaveService;
import io.swagger.annotations.Api;
import org.springframework.util.CollectionUtils;
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
index 47894d0..8e3d6b6 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -47,8 +47,8 @@
* @return
*/
@GetMapping("/list")
- public AjaxResult staffOnJobList() {
- return AjaxResult.success(staffOnJobService.staffOnJobList());
+ public AjaxResult staffOnJobList(StaffOnJob staffOnJob) {
+ return AjaxResult.success(staffOnJobService.staffOnJobList(staffOnJob));
}
/**
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffJoinLeaveRecordDto.java b/src/main/java/com/ruoyi/staff/dto/StaffJoinLeaveRecordDto.java
deleted file mode 100644
index eb0466f..0000000
--- a/src/main/java/com/ruoyi/staff/dto/StaffJoinLeaveRecordDto.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.ruoyi.staff.dto;
-
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
-import lombok.Data;
-
-@Data
-public class StaffJoinLeaveRecordDto extends StaffJoinLeaveRecord {
- private String postName;
-}
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java b/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
index 724d9c1..7afd407 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
@@ -2,7 +2,6 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
import com.ruoyi.staff.pojo.StaffOnJob;
import lombok.Data;
@@ -16,14 +15,11 @@
@Excel(name = "宀椾綅",sort = 8)
private String postName;
- @Excel(name = "鍚堝悓骞撮檺")
private String contractTerm;
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍚堝悓寮�濮嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
private Date contractStartTime;
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍚堝悓缁撴潫鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date contractEndTime;
}
diff --git a/src/main/java/com/ruoyi/staff/mapper/StaffJoinLeaveRecordMapper.java b/src/main/java/com/ruoyi/staff/mapper/StaffJoinLeaveRecordMapper.java
deleted file mode 100644
index 8fe879c..0000000
--- a/src/main/java/com/ruoyi/staff/mapper/StaffJoinLeaveRecordMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ruoyi.staff.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.dto.SupplierManageDto;
-import com.ruoyi.basic.excel.SupplierManageExcelDto;
-import com.ruoyi.basic.pojo.SupplierManage;
-import com.ruoyi.staff.dto.StaffJoinLeaveRecordDto;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface StaffJoinLeaveRecordMapper extends BaseMapper<StaffJoinLeaveRecord> {
-
- IPage<StaffJoinLeaveRecordDto> staffJoinLeaveRecordListPage(Page page, @Param("staffJoinLeaveRecord") StaffJoinLeaveRecord staffJoinLeaveRecord);
-
- List<StaffJoinLeaveRecord> staffJoinLeaveRecordList(@Param("staffJoinLeaveRecord") StaffJoinLeaveRecord staffJoinLeaveRecord);
-
- List<StaffJoinLeaveRecord> staffOnJobList();
-
-}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
deleted file mode 100644
index 7cf3d29..0000000
--- a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package com.ruoyi.staff.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.dto.DateQueryDto;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.NonNull;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * 浜哄憳绠＄悊--鏂板鍏ヨ亴/绂昏亴
- * staff_join_leave_record
- */
-@TableName(value = "staff_join_leave_record")
-@Data
-public class StaffJoinLeaveRecord extends DateQueryDto implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * 搴忓彿
- */
- @TableId(type = IdType.AUTO)
- private Long id;
-
- /**
- * 鐘舵��(0:绂昏亴;1:鍏ヨ亴)
- */
- @NotBlank(message = "鍛樺伐鐘舵�佷笉鑳戒负绌�!!!!!!!!")
- @Excel(name = "鐘舵��",readConverterExp = "0=绂昏亴,1=鍏ヨ亴")
- private Integer staffState;
-
- /**
- * 璇曠敤鏈燂紙鏈堬級
- */
- @Excel(name = "璇曠敤鏈燂紙鏈堬級")
- private Integer probationPeriod;
-
-
-
- /**
- * 鍛樺伐缂栧彿
- */
- @Excel(name = "鍛樺伐缂栧彿")
- private String staffNo;
-
- /**
- * 鍛樺伐濮撳悕
- */
- @Excel(name = "鍛樺伐濮撳悕")
- private String staffName;
-
- /**
- * 鎬у埆
- */
- @Excel(name = "鎬у埆")
- private String sex;
-
- /**
- * 绫嶈疮
- */
- @Excel(name = "绫嶈疮")
- private String nativePlace;
-
- /**
- * 宀椾綅
- */
- @Excel(name = "宀椾綅")
- private Integer sysPostId;
-
- /**
- * 瀹跺涵浣忓潃
- */
- @Excel(name = "瀹跺涵浣忓潃")
- private String adress;
-
- /**
- * 绗竴瀛﹀巻
- */
- @Excel(name = "绗竴瀛﹀巻")
- private String firstStudy;
-
- /**
- * 涓撲笟
- */
- @Excel(name = "涓撲笟")
- private String profession;
-
- /**
- * 韬唤璇佸彿鐮�
- */
- @Excel(name = "韬唤璇佸彿鐮�")
- private String identityCard;
-
- /**
- * 骞撮緞
- */
- @Excel(name = "骞撮緞")
- private String age;
-
- /**
- * 鑱旂郴鐢佃瘽
- */
- @Excel(name = "鑱旂郴鐢佃瘽")
- private String phone;
-
- /**
- * 绱ф�ヨ仈绯讳汉
- */
- @Excel(name = "绱ф�ヨ仈绯讳汉")
- private String emergencyContact;
-
- /**
- * 绱ф�ヨ仈绯讳汉鐢佃瘽
- */
- @Excel(name = "绱ф�ヨ仈绯讳汉鐢佃瘽")
- private String emergencyContactPhone;
-
- /**
- * 鍚堝悓骞撮檺
- */
- @Excel(name = "鍚堝悓骞撮檺")
- private String contractTerm;
-
- /**
- * 鍚堝悓寮�濮嬫棩鏈�
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍚堝悓寮�濮嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
- private Date contractStartTime;
-
- /**
- * 鍚堝悓缁撴潫鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍚堝悓缁撴潫鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- private Date contractEndTime;
-
-
- /**
- * 寮�濮嬭瘯鐢ㄦ棩鏈�
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "寮�濮嬭瘯鐢ㄦ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
- private Date trialStartDate;
-
- /**
- * 璇曠敤缁撴潫鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "璇曠敤缁撴潫鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- private Date trialEndDate;
-
- /**
- * 绛捐鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "绛捐鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
- private Date signDate;
-
- /**
- * 宸ヨ祫鎶ラ叕閫夋嫨鏉℃
- */
-// @Excel(name = "宸ヨ祫鎶ラ叕閫夋嫨鏉℃")
- private String salarySelect;
-
- /**
- * 璇曠敤鏈熷伐璧�
- */
- @Excel(name = "璇曠敤鏈熷伐璧�")
- private BigDecimal proSalary;
-
- /**
- * 鍔冲姩鍚堝悓鏈熼檺閫夋嫨
- */
-// @Excel(name = "鍔冲姩鍚堝悓鏈熼檺閫夋嫨")
- private String dateSelect;
-
- /**
- * 澶囨敞锛堢鍒╁緟閬囷級
- */
- @Excel(name = "澶囨敞锛堢鍒╁緟閬囷級")
- private String remark;
-
- /**
- * 绂昏亴鍘熷洜
- */
- @Excel(name = "绂昏亴鍘熷洜",readConverterExp = "salary=钖祫寰呴亣,career_development=鑱屼笟鍙戝睍,work_environment=宸ヤ綔鐜,personal_reason=涓汉鍘熷洜,other=鍏朵粬")
- private String dimissionReason;
-
- /**
- * 绂昏亴澶囨敞
- */
- @Excel(name = "绂昏亴澶囨敞")
- private String dimissionRemark;
-
-
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
-
- @ApiModelProperty(value = "淇敼鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updateTime;
-
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateUser;
-
- @ApiModelProperty(value = "绉熸埛ID")
- @TableField(fill = FieldFill.INSERT)
- private Long tenantId;
-
-
-}
diff --git a/src/main/java/com/ruoyi/staff/service/IStaffJoinLeaveRecordService.java b/src/main/java/com/ruoyi/staff/service/IStaffJoinLeaveRecordService.java
deleted file mode 100644
index 1cf0f82..0000000
--- a/src/main/java/com/ruoyi/staff/service/IStaffJoinLeaveRecordService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.ruoyi.staff.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.dto.SupplierManageDto;
-import com.ruoyi.basic.pojo.SupplierManage;
-import com.ruoyi.staff.dto.StaffJoinLeaveRecordDto;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-public interface IStaffJoinLeaveRecordService extends IService<StaffJoinLeaveRecord> {
-
-
- IPage<StaffJoinLeaveRecordDto> staffJoinLeaveRecordListPage(Page page, StaffJoinLeaveRecord staffJoinLeaveRecord);
-
- void staffJoinLeaveRecordExport(HttpServletResponse response, StaffJoinLeaveRecord staffJoinLeaveRecord);
-
- int add(StaffJoinLeaveRecord staffJoinLeaveRecord);
-
- int delStaffJoinLeaveRecord(List<Integer> ids);
-
- int updateStaffJoinLeaveRecord(StaffJoinLeaveRecord staffJoinLeaveRecord);
-}
diff --git a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java b/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
index f392d66..1e60ffe 100644
--- a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
+++ b/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.staff.dto.StaffOnJobDto;
import com.ruoyi.staff.pojo.StaffContract;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
import com.ruoyi.staff.pojo.StaffOnJob;
import org.springframework.web.multipart.MultipartFile;
@@ -29,7 +28,7 @@
void staffOnJobExport(HttpServletResponse response, StaffOnJob staffOnJob);
- List<StaffJoinLeaveRecord> staffOnJobList();
+ List<StaffOnJobDto> staffOnJobList(StaffOnJob staffOnJob);
Boolean importData(MultipartFile file);
diff --git a/src/main/java/com/ruoyi/staff/service/StaffContractService.java b/src/main/java/com/ruoyi/staff/service/StaffContractService.java
index 5c2319c..a7414ba 100644
--- a/src/main/java/com/ruoyi/staff/service/StaffContractService.java
+++ b/src/main/java/com/ruoyi/staff/service/StaffContractService.java
@@ -4,14 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.staff.dto.StaffContractDto;
-import com.ruoyi.staff.dto.StaffOnJobDto;
import com.ruoyi.staff.pojo.StaffContract;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
-import com.ruoyi.staff.pojo.StaffOnJob;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
public interface StaffContractService extends IService<StaffContract> {
diff --git a/src/main/java/com/ruoyi/staff/service/StaffLeaveService.java b/src/main/java/com/ruoyi/staff/service/StaffLeaveService.java
index be27fdc..9fab5a1 100644
--- a/src/main/java/com/ruoyi/staff/service/StaffLeaveService.java
+++ b/src/main/java/com/ruoyi/staff/service/StaffLeaveService.java
@@ -4,8 +4,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.staff.dto.StaffLeaveDto;
-import com.ruoyi.staff.dto.StaffOnJobDto;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
import com.ruoyi.staff.pojo.StaffLeave;
import javax.servlet.http.HttpServletResponse;
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
deleted file mode 100644
index 0b2eba7..0000000
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.ruoyi.staff.service.impl;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.staff.dto.StaffJoinLeaveRecordDto;
-import com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper;
-import com.ruoyi.staff.mapper.StaffOnJobMapper;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
-import com.ruoyi.staff.pojo.StaffOnJob;
-import com.ruoyi.staff.service.IStaffJoinLeaveRecordService;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-
-
-@Service
-@AllArgsConstructor
-@Transactional(rollbackFor = Exception.class)
-public class StaffJoinLeaveRecordServiceImpl extends ServiceImpl<StaffJoinLeaveRecordMapper, StaffJoinLeaveRecord> implements IStaffJoinLeaveRecordService {
-
- private StaffJoinLeaveRecordMapper staffJoinLeaveRecordMapper;
- private StaffOnJobMapper staffOnJobMapper;
-
-
- //鍒嗛〉鏌ヨ
- @Override
- public IPage<StaffJoinLeaveRecordDto> staffJoinLeaveRecordListPage(Page page, StaffJoinLeaveRecord staffJoinLeaveRecord) {
- return staffJoinLeaveRecordMapper.staffJoinLeaveRecordListPage(page,staffJoinLeaveRecord);
- }
-
- //瀵煎嚭
- @Override
- public void staffJoinLeaveRecordExport(HttpServletResponse response, StaffJoinLeaveRecord staffJoinLeaveRecord) {
- List<StaffJoinLeaveRecord> staffJoinLeaveRecords =staffJoinLeaveRecordMapper.staffJoinLeaveRecordList(staffJoinLeaveRecord);
- ExcelUtil<StaffJoinLeaveRecord> util = new ExcelUtil<StaffJoinLeaveRecord>(StaffJoinLeaveRecord.class);
- util.exportExcel(response, staffJoinLeaveRecords, staffJoinLeaveRecord.getStaffState()==0?"鍛樺伐绂昏亴":"鍛樺伐鍏ヨ亴"+"瀵煎嚭");
- }
-
- //鏂板鍏ヨ亴/绂昏亴
- @Override
- public int add(StaffJoinLeaveRecord staffJoinLeaveRecord) {
- String[] ignoreProperties = {"id"};//鎺掗櫎id灞炴��
- List<StaffOnJob> staffOnJobs = staffOnJobMapper.selectList(Wrappers.<StaffOnJob>lambdaQuery().eq(StaffOnJob::getStaffNo, staffJoinLeaveRecord.getStaffNo()));
- if (staffJoinLeaveRecord.getStaffState()==1){
- /*鍏ヨ亴*/
- //(鏍规嵁鍛樺伐缂栧彿鍒ゆ柇鏄惁宸茬粡鏂板鍒板湪鑱岃〃閲岄潰,濡傛灉宸茬粡鏈夊氨鏇存柊,娌℃湁灏辨柊澧�)
- if (staffOnJobs.size()>0){
- StaffOnJob staffOnJob = staffOnJobs.get(0);
- //鍏堟瘮杈冨埌鏈熸棩鏈�,杩欓噷閫夌敤鍒版湡鏃ユ湡鏈�涔呯殑
- if (staffJoinLeaveRecord.getContractEndTime().compareTo(staffOnJob.getContractExpireTime())>0) {
- BeanUtils.copyProperties(staffJoinLeaveRecord,staffOnJob,ignoreProperties);
- staffOnJobMapper.updateById(staffOnJob);
- }
- }else {
- StaffOnJob staffOnJob = new StaffOnJob();
- BeanUtils.copyProperties(staffJoinLeaveRecord,staffOnJob,ignoreProperties);
- staffOnJob.setContractExpireTime(staffJoinLeaveRecord.getContractEndTime());
- staffOnJobMapper.insert(staffOnJob);
- }
- }else {
- /*绂昏亴*/
- //鏍规嵁鍛樺伐缂栧彿鎵惧埌瀵瑰簲鐨勬暟鎹皢鐘舵�佸彉鏇�
- if (staffOnJobs.size()>0){
- StaffOnJob staffOnJob = staffOnJobs.get(0);
- staffOnJob.setStaffState(staffJoinLeaveRecord.getStaffState());
- staffOnJobMapper.updateById(staffOnJob);
- }else {
- throw new BaseException("娌℃湁鎵惧埌"+staffJoinLeaveRecord.getStaffNo()+"缂栧彿鐨勫憳宸�,鏃犳硶鏂板绂昏亴!!!");
- }
- if (staffJoinLeaveRecord.getDimissionReason()==null){
- throw new BaseException("绂昏亴鍘熷洜涓嶈兘涓虹┖!!!");
- }
- }
- return staffJoinLeaveRecordMapper.insert(staffJoinLeaveRecord);
- }
-
-
- //鍒犻櫎鍏ヨ亴/绂昏亴
- @Override
- public int delStaffJoinLeaveRecord(List<Integer> ids) {
- List<StaffJoinLeaveRecord> staffJoinLeaveRecords = staffJoinLeaveRecordMapper.selectBatchIds(ids);
- for (StaffJoinLeaveRecord staffJoinLeaveRecord : staffJoinLeaveRecords) {
- //鍏堝垽鏂槸鍏ヨ亴杩樻槸绂昏亴
- if (staffJoinLeaveRecord.getStaffState()==1){
- /*鍏ヨ亴*/
- //濡傛灉鏄叆鑱�,闇�瑕佸厛鏍规嵁鍛樺伐缂栧彿鍒ゆ柇璇ュ憳宸ユ槸鍚﹁繕鏈夊叾浠栧叆鑱屼俊鎭�
- List<StaffJoinLeaveRecord> joinLeaveRecords = staffJoinLeaveRecordMapper.selectList(Wrappers.<StaffJoinLeaveRecord>lambdaQuery()
- .eq(StaffJoinLeaveRecord::getStaffState, 1)
- .eq(StaffJoinLeaveRecord::getStaffNo, staffJoinLeaveRecord.getStaffNo())
- .ne(StaffJoinLeaveRecord::getId, staffJoinLeaveRecord.getId()));
- if (joinLeaveRecords.size()>0){
- //杩橀渶瑕佸垽鏂鍛樺伐鏄惁鏈夌鑱屼俊鎭�
- List<StaffJoinLeaveRecord> leaveRecords = staffJoinLeaveRecordMapper.selectList(Wrappers.<StaffJoinLeaveRecord>lambdaQuery()
- .eq(StaffJoinLeaveRecord::getStaffState, 0)
- .eq(StaffJoinLeaveRecord::getStaffNo, staffJoinLeaveRecord.getStaffNo()));
- // 濡傛灉鏈夐偅鍦ㄨ亴琛ㄤ粎鍋氭洿鏂颁笉鍒犻櫎,濡傛灉娌℃湁鍏朵粬鍏ヨ亴淇℃伅,閭ｄ箞鍦ㄨ亴琛ㄩ渶鍚屾鍒犻櫎
- if (leaveRecords.size()>0){
- //濡傛灉鏈夌鑱屼俊鎭�,鍒ゆ柇绂昏亴鏁伴噺鍜屽叆鑱屾暟閲忔瘯绔�,濡傛灉鍏ヨ亴鏁伴噺澶т簬绂昏亴
- if (joinLeaveRecords.size()>leaveRecords.size()){
- //璇ュ憳宸ュ氨杩樻槸鍦ㄨ亴
- //鍏堟瘮杈冨埌鏈熸棩鏈�,杩欓噷閫夌敤鍒版湡鏃ユ湡鏈�涔呯殑
- Optional<StaffJoinLeaveRecord> max = joinLeaveRecords.stream().max(Comparator.comparing(StaffJoinLeaveRecord::getContractEndTime));
- staffOnJobMapper.update(null,Wrappers.<StaffOnJob>lambdaUpdate()
- .eq(StaffOnJob::getStaffNo, staffJoinLeaveRecord.getStaffNo())
- .set(StaffOnJob::getContractTerm, max.get().getContractTerm())
- .set(StaffOnJob::getContractExpireTime, max.get().getContractEndTime()));
- }else {
- //璇ュ憳宸ュ睘浜庣鑱�
- staffOnJobMapper.update(null,Wrappers.<StaffOnJob>lambdaUpdate()
- .eq(StaffOnJob::getStaffNo, staffJoinLeaveRecord.getStaffNo())
- .set(StaffOnJob::getStaffState, 0));
- }
- }else {
- //濡傛灉娌℃湁绂昏亴淇℃伅閭ｄ箞灏辨瘮杈冨埌鏈熸棩鏈�,杩欓噷閫夌敤鍒版湡鏃ユ湡鏈�涔呯殑
- Optional<StaffJoinLeaveRecord> max = joinLeaveRecords.stream().max(Comparator.comparing(StaffJoinLeaveRecord::getContractEndTime));
- staffOnJobMapper.update(null,Wrappers.<StaffOnJob>lambdaUpdate()
- .eq(StaffOnJob::getStaffNo, staffJoinLeaveRecord.getStaffNo())
- .set(StaffOnJob::getContractTerm, max.get().getContractTerm())
- .set(StaffOnJob::getContractExpireTime, max.get().getContractEndTime()));
- }
- }else {
- staffOnJobMapper.delete(Wrappers.<StaffOnJob>lambdaQuery().eq(StaffOnJob::getStaffNo,staffJoinLeaveRecord.getStaffNo()));
- }
- }else {
- /*绂昏亴*/
- //鍏堟煡璇㈠湪鑱岃〃鏄惁鏈夎繖涓�,濡傛灉鏈�,灏卞皢璇ュ憳宸ョ殑鐘舵�佸彉鏇翠负鍦ㄨ亴
- List<StaffOnJob> staffOnJobs = staffOnJobMapper.selectList(Wrappers.<StaffOnJob>lambdaQuery().eq(StaffOnJob::getStaffNo, staffJoinLeaveRecord.getStaffNo()));
- if (staffOnJobs.size()>0){
- StaffOnJob staffOnJob = staffOnJobs.get(0);
- staffOnJob.setStaffState(1);
- staffOnJobMapper.updateById(staffOnJob);
- }else {
- throw new BaseException("娌℃湁鎵惧埌"+staffJoinLeaveRecord.getStaffNo()+"缂栧彿鐨勫憳宸�,璇锋鏌ユ槸鍚︽湁鑴忔暟鎹�!!!");
- }
- }
- staffJoinLeaveRecordMapper.deleteById(staffJoinLeaveRecord);
- }
- return 0;
- }
-
- //淇敼鍏ヨ亴/绂昏亴
- @Override
- public int updateStaffJoinLeaveRecord(StaffJoinLeaveRecord staffJoinLeaveRecord) {
- String[] ignoreProperties = {"id"};//鎺掗櫎id灞炴��
- List<StaffOnJob> staffOnJobs = staffOnJobMapper.selectList(Wrappers.<StaffOnJob>lambdaQuery().eq(StaffOnJob::getStaffNo, staffJoinLeaveRecord.getStaffNo()));
- if (staffJoinLeaveRecord.getStaffState()==1){
- /*鍏ヨ亴*/
- StaffOnJob job = staffOnJobMapper.selectList(Wrappers.<StaffOnJob>lambdaQuery()
- .eq(StaffOnJob::getStaffNo, staffJoinLeaveRecord.getStaffNo())).get(0);
- // 澧炲姞浜嗗悎鍚屾柟妗堟墍浠ュ幓鎺夎繖涓垽鏂�
- //濡傛灉鏇存敼鐨勫悎鍚屽埌鏈熸椂闂存洿涔呭垯鏇存柊,濡傛灉娌℃湁灏变笉鐢ㄦ洿鏂�
-// if (staffJoinLeaveRecord.getContractEndTime().compareTo(job.getContractExpireTime())>0) {
-// BeanUtils.copyProperties(staffJoinLeaveRecord,job,ignoreProperties);
-// staffOnJobMapper.updateById(job);
-// }
- if(job != null){
- BeanUtils.copyProperties(staffJoinLeaveRecord,job,ignoreProperties);
- staffOnJobMapper.updateById(job);
- }
- }else {
- /*绂昏亴*/
- //绂昏亴鐨勭紪杈戜笉浼氬奖鍝嶅湪鑱岃〃
- if (staffJoinLeaveRecord.getDimissionReason()==null){
- throw new BaseException("绂昏亴鍘熷洜涓嶈兘涓虹┖!!!");
- }
- }
- return staffJoinLeaveRecordMapper.updateById(staffJoinLeaveRecord);
- }
-}
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
index 20ec7be..2d30dc5 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
@@ -1,17 +1,13 @@
package com.ruoyi.staff.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.staff.dto.StaffLeaveDto;
-import com.ruoyi.staff.dto.StaffOnJobDto;
import com.ruoyi.staff.mapper.StaffLeaveMapper;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
-import com.ruoyi.staff.pojo.StaffContract;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.StaffLeaveService;
import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
index 21f4c2b..6fb0cd0 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
@@ -1,7 +1,6 @@
package com.ruoyi.staff.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,11 +12,9 @@
import com.ruoyi.project.system.mapper.SysPostMapper;
import com.ruoyi.staff.dto.StaffOnJobDto;
import com.ruoyi.staff.mapper.StaffContractMapper;
-import com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper;
import com.ruoyi.staff.mapper.StaffLeaveMapper;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffContract;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
import com.ruoyi.staff.pojo.StaffLeave;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.IStaffOnJobService;
@@ -47,7 +44,6 @@
private SysPostMapper sysPostMapper;
- private StaffJoinLeaveRecordMapper staffJoinLeaveRecordMapper;
private StaffContractMapper staffContractMapper;
private StaffLeaveMapper staffLeaveMapper;
@@ -149,6 +145,10 @@
@Override
public StaffOnJobDto staffOnJobDetail(Long id) {
StaffOnJob staffOnJob = staffOnJobMapper.selectById(id);
+ if (staffOnJob == null) {
+ throw new IllegalArgumentException("璇ュ憳宸ヤ笉瀛樺湪");
+ }
+
StaffOnJobDto staffOnJobDto = new StaffOnJobDto();
BeanUtils.copyProperties(staffOnJob, staffOnJobDto);
// 鏌ヨ宀椾綅鍚嶇О
@@ -177,8 +177,8 @@
}
@Override
- public List<StaffJoinLeaveRecord> staffOnJobList() {
- return staffJoinLeaveRecordMapper.staffOnJobList();
+ public List<StaffOnJobDto> staffOnJobList(StaffOnJob staffOnJob) {
+ return staffOnJobMapper.staffOnJobList(staffOnJob);
}
@Override
diff --git a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
deleted file mode 100644
index e51999b..0000000
--- a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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="com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper">
- <select id="staffJoinLeaveRecordListPage" resultType="com.ruoyi.staff.dto.StaffJoinLeaveRecordDto">
- SELECT
- staff_join_leave_record.*,
- sp.post_name as postName
- FROM staff_join_leave_record
- LEFT JOIN
- sys_post sp ON sp.post_id = staff_join_leave_record.sys_post_id
- where
- staff_state = #{staffJoinLeaveRecord.staffState}
- <if test="staffJoinLeaveRecord.staffName != null and staffJoinLeaveRecord.staffName != '' ">
- AND staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%')
- </if>
- <if test="staffJoinLeaveRecord.entryDateStart != null and staffJoinLeaveRecord.entryDateStart != '' ">
- and contract_start_time like concat('%',#{staffJoinLeaveRecord.entryDateStart},'%')
- </if>
- <if test="staffJoinLeaveRecord.entryDateEnd != null and staffJoinLeaveRecord.entryDateEnd != '' ">
- and contract_end_time like concat('%',#{staffJoinLeaveRecord.entryDateEnd},'%')
- </if>
- order by create_time desc
- </select>
- <select id="staffJoinLeaveRecordList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
- SELECT
- *
- FROM staff_join_leave_record
- where
- staff_state = #{staffJoinLeaveRecord.staffState}
- <if test="staffJoinLeaveRecord.staffName != null and staffJoinLeaveRecord.staffName != '' ">
- AND staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%')
- </if>
- </select>
- <select id="staffOnJobList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
- select *
- from (select *,
- ROW_NUMBER() over (PARTITION BY staff_no ORDER BY create_time DESC ) as rn
- from staff_join_leave_record
- where staff_state = 1) t
- where rn = 1
-
- </select>
-</mapper>
--
Gitblit v1.9.3