refactor(perf): 将ID字段从String类型改为Long类型
- 修改所有实体类中的ID字段类型从String改为Long - 更新所有服务接口和实现类的方法参数类型 - 调整控制器中的路径变量类型以匹配新的ID类型 - 修正查询条件判断逻辑,从字符串非空检查改为数值非空检查 - 更新数据传输对象中的ID字段类型保持一致性
This commit is contained in:
@@ -20,7 +20,7 @@ public interface IPerfAppraisalDetailService {
|
||||
/**
|
||||
* 查询考核维度评分明细
|
||||
*/
|
||||
PerfAppraisalDetailVo queryById(String id);
|
||||
PerfAppraisalDetailVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 查询考核维度评分明细列表
|
||||
@@ -45,5 +45,5 @@ public interface IPerfAppraisalDetailService {
|
||||
/**
|
||||
* 校验并批量删除考核维度评分明细信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ public interface IPerfAppraisalService {
|
||||
/**
|
||||
* 查询月度绩效考核记录
|
||||
*/
|
||||
PerfAppraisalVo queryById(String id);
|
||||
PerfAppraisalVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 查询月度绩效考核记录列表
|
||||
@@ -45,5 +45,5 @@ public interface IPerfAppraisalService {
|
||||
/**
|
||||
* 校验并批量删除月度绩效考核记录信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ public interface IPerfCoeffRangeService {
|
||||
/**
|
||||
* 查询绩效系数换算
|
||||
*/
|
||||
PerfCoeffRangeVo queryById(String id);
|
||||
PerfCoeffRangeVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 查询绩效系数换算列表
|
||||
@@ -45,5 +45,5 @@ public interface IPerfCoeffRangeService {
|
||||
/**
|
||||
* 校验并批量删除绩效系数换算信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ public interface IPerfDeptConfigService {
|
||||
/**
|
||||
* 查询车间考核参数配置
|
||||
*/
|
||||
PerfDeptConfigVo queryById(String id);
|
||||
PerfDeptConfigVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 查询车间考核参数配置列表
|
||||
@@ -45,5 +45,5 @@ public interface IPerfDeptConfigService {
|
||||
/**
|
||||
* 校验并批量删除车间考核参数配置信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ public interface IPerfDeptItemConfigService {
|
||||
/**
|
||||
* 查询车间扣款/奖励项目配置
|
||||
*/
|
||||
PerfDeptItemConfigVo queryById(String id);
|
||||
PerfDeptItemConfigVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 查询车间扣款/奖励项目配置列表
|
||||
@@ -45,5 +45,5 @@ public interface IPerfDeptItemConfigService {
|
||||
/**
|
||||
* 校验并批量删除车间扣款/奖励项目配置信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ public interface IPerfDeptService {
|
||||
/**
|
||||
* 查询绩效系统部门
|
||||
*/
|
||||
PerfDeptVo queryById(String id);
|
||||
PerfDeptVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 查询绩效系统部门列表
|
||||
@@ -45,5 +45,5 @@ public interface IPerfDeptService {
|
||||
/**
|
||||
* 校验并批量删除绩效系统部门信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ public interface IPerfDeptSummaryService {
|
||||
/**
|
||||
* 查询车间月度汇总
|
||||
*/
|
||||
PerfDeptSummaryVo queryById(String id);
|
||||
PerfDeptSummaryVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 查询车间月度汇总列表
|
||||
@@ -45,5 +45,5 @@ public interface IPerfDeptSummaryService {
|
||||
/**
|
||||
* 校验并批量删除车间月度汇总信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ public interface IPerfEmployeeInfoService {
|
||||
/**
|
||||
* 查询员工绩效薪资基本信息
|
||||
*/
|
||||
PerfEmployeeInfoVo queryById(String id);
|
||||
PerfEmployeeInfoVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 查询员工绩效薪资基本信息列表
|
||||
@@ -45,5 +45,5 @@ public interface IPerfEmployeeInfoService {
|
||||
/**
|
||||
* 校验并批量删除员工绩效薪资基本信息信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ public interface IPerfPositionTemplateService {
|
||||
/**
|
||||
* 查询岗位绩效考核模板
|
||||
*/
|
||||
PerfPositionTemplateVo queryById(String id);
|
||||
PerfPositionTemplateVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 查询岗位绩效考核模板列表
|
||||
@@ -45,5 +45,5 @@ public interface IPerfPositionTemplateService {
|
||||
/**
|
||||
* 校验并批量删除岗位绩效考核模板信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ public interface IPerfSalaryService {
|
||||
/**
|
||||
* 查询月度薪资计算记录
|
||||
*/
|
||||
PerfSalaryVo queryById(String id);
|
||||
PerfSalaryVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 查询月度薪资计算记录列表
|
||||
@@ -45,5 +45,5 @@ public interface IPerfSalaryService {
|
||||
/**
|
||||
* 校验并批量删除月度薪资计算记录信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ public interface IPerfTemplateDimensionService {
|
||||
/**
|
||||
* 查询考核维度明细
|
||||
*/
|
||||
PerfTemplateDimensionVo queryById(String id);
|
||||
PerfTemplateDimensionVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 查询考核维度明细列表
|
||||
@@ -45,5 +45,5 @@ public interface IPerfTemplateDimensionService {
|
||||
/**
|
||||
* 校验并批量删除考核维度明细信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public class PerfAppraisalDetailServiceImpl implements IPerfAppraisalDetailServi
|
||||
* 查询考核维度评分明细
|
||||
*/
|
||||
@Override
|
||||
public PerfAppraisalDetailVo queryById(String id){
|
||||
public PerfAppraisalDetailVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
@@ -61,8 +61,8 @@ public class PerfAppraisalDetailServiceImpl implements IPerfAppraisalDetailServi
|
||||
private LambdaQueryWrapper<PerfAppraisalDetail> buildQueryWrapper(PerfAppraisalDetailBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<PerfAppraisalDetail> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getAppraisalId()), PerfAppraisalDetail::getAppraisalId, bo.getAppraisalId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getDimensionId()), PerfAppraisalDetail::getDimensionId, bo.getDimensionId());
|
||||
lqw.eq(bo.getAppraisalId() != null, PerfAppraisalDetail::getAppraisalId, bo.getAppraisalId());
|
||||
lqw.eq(bo.getDimensionId() != null, PerfAppraisalDetail::getDimensionId, bo.getDimensionId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSeq()), PerfAppraisalDetail::getSeq, bo.getSeq());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getDimName()), PerfAppraisalDetail::getDimName, bo.getDimName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getWeight()), PerfAppraisalDetail::getWeight, bo.getWeight());
|
||||
@@ -111,7 +111,7 @@ public class PerfAppraisalDetailServiceImpl implements IPerfAppraisalDetailServi
|
||||
* 批量删除考核维度评分明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public class PerfAppraisalServiceImpl implements IPerfAppraisalService {
|
||||
* 查询月度绩效考核记录
|
||||
*/
|
||||
@Override
|
||||
public PerfAppraisalVo queryById(String id){
|
||||
public PerfAppraisalVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
@@ -61,9 +61,9 @@ public class PerfAppraisalServiceImpl implements IPerfAppraisalService {
|
||||
private LambdaQueryWrapper<PerfAppraisal> buildQueryWrapper(PerfAppraisalBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<PerfAppraisal> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getEmployeeId()), PerfAppraisal::getEmployeeId, bo.getEmployeeId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getDeptId()), PerfAppraisal::getDeptId, bo.getDeptId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getTemplateId()), PerfAppraisal::getTemplateId, bo.getTemplateId());
|
||||
lqw.eq(bo.getEmployeeId() != null, PerfAppraisal::getEmployeeId, bo.getEmployeeId());
|
||||
lqw.eq(bo.getDeptId() != null, PerfAppraisal::getDeptId, bo.getDeptId());
|
||||
lqw.eq(bo.getTemplateId() != null, PerfAppraisal::getTemplateId, bo.getTemplateId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getPeriod()), PerfAppraisal::getPeriod, bo.getPeriod());
|
||||
lqw.eq(bo.getWeightedScore() != null, PerfAppraisal::getWeightedScore, bo.getWeightedScore());
|
||||
lqw.eq(bo.getBonusScore() != null, PerfAppraisal::getBonusScore, bo.getBonusScore());
|
||||
@@ -73,7 +73,7 @@ public class PerfAppraisalServiceImpl implements IPerfAppraisalService {
|
||||
lqw.eq(bo.getPerfCoeff() != null, PerfAppraisal::getPerfCoeff, bo.getPerfCoeff());
|
||||
lqw.eq(bo.getStatus() != null, PerfAppraisal::getStatus, bo.getStatus());
|
||||
lqw.eq(bo.getConfirmedAt() != null, PerfAppraisal::getConfirmedAt, bo.getConfirmedAt());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getConfirmedBy()), PerfAppraisal::getConfirmedBy, bo.getConfirmedBy());
|
||||
lqw.eq(bo.getConfirmedBy() != null, PerfAppraisal::getConfirmedBy, bo.getConfirmedBy());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
@@ -112,7 +112,7 @@ public class PerfAppraisalServiceImpl implements IPerfAppraisalService {
|
||||
* 批量删除月度绩效考核记录
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public class PerfCoeffRangeServiceImpl implements IPerfCoeffRangeService {
|
||||
* 查询绩效系数换算
|
||||
*/
|
||||
@Override
|
||||
public PerfCoeffRangeVo queryById(String id){
|
||||
public PerfCoeffRangeVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
@@ -106,7 +106,7 @@ public class PerfCoeffRangeServiceImpl implements IPerfCoeffRangeService {
|
||||
* 批量删除绩效系数换算
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public class PerfDeptConfigServiceImpl implements IPerfDeptConfigService {
|
||||
* 查询车间考核参数配置
|
||||
*/
|
||||
@Override
|
||||
public PerfDeptConfigVo queryById(String id){
|
||||
public PerfDeptConfigVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ public class PerfDeptConfigServiceImpl implements IPerfDeptConfigService {
|
||||
private LambdaQueryWrapper<PerfDeptConfig> buildQueryWrapper(PerfDeptConfigBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<PerfDeptConfig> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getDeptId()), PerfDeptConfig::getDeptId, bo.getDeptId());
|
||||
lqw.eq(bo.getDeptId() != null, PerfDeptConfig::getDeptId, bo.getDeptId());
|
||||
lqw.eq(bo.getMonthlyProductionTarget() != null, PerfDeptConfig::getMonthlyProductionTarget, bo.getMonthlyProductionTarget());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getProductionUnit()), PerfDeptConfig::getProductionUnit, bo.getProductionUnit());
|
||||
lqw.eq(bo.getPerfUnitPrice() != null, PerfDeptConfig::getPerfUnitPrice, bo.getPerfUnitPrice());
|
||||
@@ -111,7 +111,7 @@ public class PerfDeptConfigServiceImpl implements IPerfDeptConfigService {
|
||||
* 批量删除车间考核参数配置
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public class PerfDeptItemConfigServiceImpl implements IPerfDeptItemConfigService
|
||||
* 查询车间扣款/奖励项目配置
|
||||
*/
|
||||
@Override
|
||||
public PerfDeptItemConfigVo queryById(String id){
|
||||
public PerfDeptItemConfigVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ public class PerfDeptItemConfigServiceImpl implements IPerfDeptItemConfigService
|
||||
private LambdaQueryWrapper<PerfDeptItemConfig> buildQueryWrapper(PerfDeptItemConfigBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<PerfDeptItemConfig> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getDeptId()), PerfDeptItemConfig::getDeptId, bo.getDeptId());
|
||||
lqw.eq(bo.getDeptId() != null, PerfDeptItemConfig::getDeptId, bo.getDeptId());
|
||||
lqw.eq(bo.getItemType() != null, PerfDeptItemConfig::getItemType, bo.getItemType());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getItemName()), PerfDeptItemConfig::getItemName, bo.getItemName());
|
||||
lqw.eq(bo.getSortOrder() != null, PerfDeptItemConfig::getSortOrder, bo.getSortOrder());
|
||||
@@ -105,7 +105,7 @@ public class PerfDeptItemConfigServiceImpl implements IPerfDeptItemConfigService
|
||||
* 批量删除车间扣款/奖励项目配置
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public class PerfDeptServiceImpl implements IPerfDeptService {
|
||||
* 查询绩效系统部门
|
||||
*/
|
||||
@Override
|
||||
public PerfDeptVo queryById(String id){
|
||||
public PerfDeptVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
@@ -103,7 +103,7 @@ public class PerfDeptServiceImpl implements IPerfDeptService {
|
||||
* 批量删除绩效系统部门
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public class PerfDeptSummaryServiceImpl implements IPerfDeptSummaryService {
|
||||
* 查询车间月度汇总
|
||||
*/
|
||||
@Override
|
||||
public PerfDeptSummaryVo queryById(String id){
|
||||
public PerfDeptSummaryVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ public class PerfDeptSummaryServiceImpl implements IPerfDeptSummaryService {
|
||||
private LambdaQueryWrapper<PerfDeptSummary> buildQueryWrapper(PerfDeptSummaryBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<PerfDeptSummary> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getDeptId()), PerfDeptSummary::getDeptId, bo.getDeptId());
|
||||
lqw.eq(bo.getDeptId() != null, PerfDeptSummary::getDeptId, bo.getDeptId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getPeriod()), PerfDeptSummary::getPeriod, bo.getPeriod());
|
||||
lqw.eq(bo.getTotalEmployees() != null, PerfDeptSummary::getTotalEmployees, bo.getTotalEmployees());
|
||||
lqw.eq(bo.getTotalCoeffSum() != null, PerfDeptSummary::getTotalCoeffSum, bo.getTotalCoeffSum());
|
||||
@@ -115,7 +115,7 @@ public class PerfDeptSummaryServiceImpl implements IPerfDeptSummaryService {
|
||||
* 批量删除车间月度汇总
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public class PerfEmployeeInfoServiceImpl implements IPerfEmployeeInfoService {
|
||||
* 查询员工绩效薪资基本信息
|
||||
*/
|
||||
@Override
|
||||
public PerfEmployeeInfoVo queryById(String id){
|
||||
public PerfEmployeeInfoVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
@@ -61,8 +61,8 @@ public class PerfEmployeeInfoServiceImpl implements IPerfEmployeeInfoService {
|
||||
private LambdaQueryWrapper<PerfEmployeeInfo> buildQueryWrapper(PerfEmployeeInfoBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<PerfEmployeeInfo> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getEmployeeId()), PerfEmployeeInfo::getEmployeeId, bo.getEmployeeId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getDeptId()), PerfEmployeeInfo::getDeptId, bo.getDeptId());
|
||||
lqw.eq(bo.getEmployeeId() != null, PerfEmployeeInfo::getEmployeeId, bo.getEmployeeId());
|
||||
lqw.eq(bo.getDeptId() != null, PerfEmployeeInfo::getDeptId, bo.getDeptId());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getPositionName()), PerfEmployeeInfo::getPositionName, bo.getPositionName());
|
||||
lqw.eq(bo.getBaseSalary() != null, PerfEmployeeInfo::getBaseSalary, bo.getBaseSalary());
|
||||
lqw.eq(bo.getPerfBase() != null, PerfEmployeeInfo::getPerfBase, bo.getPerfBase());
|
||||
@@ -106,7 +106,7 @@ public class PerfEmployeeInfoServiceImpl implements IPerfEmployeeInfoService {
|
||||
* 批量删除员工绩效薪资基本信息
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public class PerfPositionTemplateServiceImpl implements IPerfPositionTemplateSer
|
||||
* 查询岗位绩效考核模板
|
||||
*/
|
||||
@Override
|
||||
public PerfPositionTemplateVo queryById(String id){
|
||||
public PerfPositionTemplateVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ public class PerfPositionTemplateServiceImpl implements IPerfPositionTemplateSer
|
||||
private LambdaQueryWrapper<PerfPositionTemplate> buildQueryWrapper(PerfPositionTemplateBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<PerfPositionTemplate> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getDeptId()), PerfPositionTemplate::getDeptId, bo.getDeptId());
|
||||
lqw.eq(bo.getDeptId() != null, PerfPositionTemplate::getDeptId, bo.getDeptId());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getPositionName()), PerfPositionTemplate::getPositionName, bo.getPositionName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getTitle()), PerfPositionTemplate::getTitle, bo.getTitle());
|
||||
lqw.eq(bo.getIsEnabled() != null, PerfPositionTemplate::getIsEnabled, bo.getIsEnabled());
|
||||
@@ -103,7 +103,7 @@ public class PerfPositionTemplateServiceImpl implements IPerfPositionTemplateSer
|
||||
* 批量删除岗位绩效考核模板
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public class PerfSalaryServiceImpl implements IPerfSalaryService {
|
||||
* 查询月度薪资计算记录
|
||||
*/
|
||||
@Override
|
||||
public PerfSalaryVo queryById(String id){
|
||||
public PerfSalaryVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
@@ -61,9 +61,9 @@ public class PerfSalaryServiceImpl implements IPerfSalaryService {
|
||||
private LambdaQueryWrapper<PerfSalary> buildQueryWrapper(PerfSalaryBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<PerfSalary> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getEmployeeId()), PerfSalary::getEmployeeId, bo.getEmployeeId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getDeptId()), PerfSalary::getDeptId, bo.getDeptId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getAppraisalId()), PerfSalary::getAppraisalId, bo.getAppraisalId());
|
||||
lqw.eq(bo.getEmployeeId() != null, PerfSalary::getEmployeeId, bo.getEmployeeId());
|
||||
lqw.eq(bo.getDeptId() != null, PerfSalary::getDeptId, bo.getDeptId());
|
||||
lqw.eq(bo.getAppraisalId() != null, PerfSalary::getAppraisalId, bo.getAppraisalId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getPeriod()), PerfSalary::getPeriod, bo.getPeriod());
|
||||
lqw.eq(bo.getBaseSalary() != null, PerfSalary::getBaseSalary, bo.getBaseSalary());
|
||||
lqw.eq(bo.getPerfBase() != null, PerfSalary::getPerfBase, bo.getPerfBase());
|
||||
@@ -89,7 +89,7 @@ public class PerfSalaryServiceImpl implements IPerfSalaryService {
|
||||
lqw.eq(bo.getTotalSalaryRef() != null, PerfSalary::getTotalSalaryRef, bo.getTotalSalaryRef());
|
||||
lqw.eq(bo.getStatus() != null, PerfSalary::getStatus, bo.getStatus());
|
||||
lqw.eq(bo.getConfirmedAt() != null, PerfSalary::getConfirmedAt, bo.getConfirmedAt());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getConfirmedBy()), PerfSalary::getConfirmedBy, bo.getConfirmedBy());
|
||||
lqw.eq(bo.getConfirmedBy() != null, PerfSalary::getConfirmedBy, bo.getConfirmedBy());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
@@ -128,7 +128,7 @@ public class PerfSalaryServiceImpl implements IPerfSalaryService {
|
||||
* 批量删除月度薪资计算记录
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public class PerfTemplateDimensionServiceImpl implements IPerfTemplateDimensionS
|
||||
* 查询考核维度明细
|
||||
*/
|
||||
@Override
|
||||
public PerfTemplateDimensionVo queryById(String id){
|
||||
public PerfTemplateDimensionVo queryById(Long id){
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ public class PerfTemplateDimensionServiceImpl implements IPerfTemplateDimensionS
|
||||
private LambdaQueryWrapper<PerfTemplateDimension> buildQueryWrapper(PerfTemplateDimensionBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<PerfTemplateDimension> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getTemplateId()), PerfTemplateDimension::getTemplateId, bo.getTemplateId());
|
||||
lqw.eq(bo.getTemplateId() != null, PerfTemplateDimension::getTemplateId, bo.getTemplateId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSeq()), PerfTemplateDimension::getSeq, bo.getSeq());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getDimName()), PerfTemplateDimension::getDimName, bo.getDimName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getWeight()), PerfTemplateDimension::getWeight, bo.getWeight());
|
||||
@@ -108,7 +108,7 @@ public class PerfTemplateDimensionServiceImpl implements IPerfTemplateDimensionS
|
||||
* 批量删除考核维度明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user