From a56a0008b94476ecd33fa02f98190edc36bdd8ea Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 7 Jul 2026 16:39:37 +0800 Subject: [PATCH] =?UTF-8?q?refactor(perf):=20=E5=B0=86ID=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BB=8EString=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BALong?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改所有实体类中的ID字段类型从String改为Long - 更新所有服务接口和实现类的方法参数类型 - 调整控制器中的路径变量类型以匹配新的ID类型 - 修正查询条件判断逻辑，从字符串非空检查改为数值非空检查 - 更新数据传输对象中的ID字段类型保持一致性 --- .../perf/controller/PerfAppraisalController.java | 4 ++-- .../PerfAppraisalDetailController.java | 4 ++-- .../controller/PerfCoeffRangeController.java | 4 ++-- .../controller/PerfDeptConfigController.java | 4 ++-- .../klp/perf/controller/PerfDeptController.java | 4 ++-- .../controller/PerfDeptItemConfigController.java | 4 ++-- .../controller/PerfDeptSummaryController.java | 4 ++-- .../controller/PerfEmployeeInfoController.java | 4 ++-- .../PerfPositionTemplateController.java | 4 ++-- .../perf/controller/PerfSalaryController.java | 4 ++-- .../PerfTemplateDimensionController.java | 4 ++-- .../java/com/klp/perf/domain/PerfAppraisal.java | 12 ++++++------ .../com/klp/perf/domain/PerfAppraisalDetail.java | 6 +++--- .../java/com/klp/perf/domain/PerfCoeffRange.java | 2 +- .../main/java/com/klp/perf/domain/PerfDept.java | 4 ++-- .../java/com/klp/perf/domain/PerfDeptConfig.java | 6 +++--- .../com/klp/perf/domain/PerfDeptItemConfig.java | 6 +++--- .../com/klp/perf/domain/PerfDeptSummary.java | 6 +++--- .../com/klp/perf/domain/PerfEmployeeInfo.java | 8 ++++---- .../klp/perf/domain/PerfPositionTemplate.java | 6 +++--- .../java/com/klp/perf/domain/PerfSalary.java | 12 ++++++------ .../klp/perf/domain/PerfTemplateDimension.java | 4 ++-- .../com/klp/perf/domain/bo/PerfAppraisalBo.java | 12 ++++++------ .../perf/domain/bo/PerfAppraisalDetailBo.java | 6 +++--- .../com/klp/perf/domain/bo/PerfCoeffRangeBo.java | 2 +- .../java/com/klp/perf/domain/bo/PerfDeptBo.java | 4 ++-- .../com/klp/perf/domain/bo/PerfDeptConfigBo.java | 6 +++--- .../klp/perf/domain/bo/PerfDeptItemConfigBo.java | 6 +++--- .../klp/perf/domain/bo/PerfDeptSummaryBo.java | 6 +++--- .../klp/perf/domain/bo/PerfEmployeeInfoBo.java | 8 ++++---- .../perf/domain/bo/PerfPositionTemplateBo.java | 6 +++--- .../com/klp/perf/domain/bo/PerfSalaryBo.java | 12 ++++++------ .../perf/domain/bo/PerfTemplateDimensionBo.java | 4 ++-- .../perf/domain/vo/PerfAppraisalDetailVo.java | 6 +++--- .../com/klp/perf/domain/vo/PerfAppraisalVo.java | 14 +++++++------- .../com/klp/perf/domain/vo/PerfCoeffRangeVo.java | 2 +- .../com/klp/perf/domain/vo/PerfDeptConfigVo.java | 8 ++++---- .../klp/perf/domain/vo/PerfDeptItemConfigVo.java | 8 ++++---- .../klp/perf/domain/vo/PerfDeptSummaryVo.java | 8 ++++---- .../java/com/klp/perf/domain/vo/PerfDeptVo.java | 6 +++--- .../klp/perf/domain/vo/PerfEmployeeInfoVo.java | 10 +++++----- .../perf/domain/vo/PerfPositionTemplateVo.java | 8 ++++---- .../com/klp/perf/domain/vo/PerfSalaryVo.java | 16 ++++++++-------- .../perf/domain/vo/PerfTemplateDimensionVo.java | 4 ++-- .../service/IPerfAppraisalDetailService.java | 4 ++-- .../klp/perf/service/IPerfAppraisalService.java | 4 ++-- .../klp/perf/service/IPerfCoeffRangeService.java | 4 ++-- .../klp/perf/service/IPerfDeptConfigService.java | 4 ++-- .../perf/service/IPerfDeptItemConfigService.java | 4 ++-- .../com/klp/perf/service/IPerfDeptService.java | 4 ++-- .../perf/service/IPerfDeptSummaryService.java | 4 ++-- .../perf/service/IPerfEmployeeInfoService.java | 4 ++-- .../service/IPerfPositionTemplateService.java | 4 ++-- .../com/klp/perf/service/IPerfSalaryService.java | 4 ++-- .../service/IPerfTemplateDimensionService.java | 4 ++-- .../impl/PerfAppraisalDetailServiceImpl.java | 8 ++++---- .../service/impl/PerfAppraisalServiceImpl.java | 12 ++++++------ .../service/impl/PerfCoeffRangeServiceImpl.java | 4 ++-- .../service/impl/PerfDeptConfigServiceImpl.java | 6 +++--- .../impl/PerfDeptItemConfigServiceImpl.java | 6 +++--- .../perf/service/impl/PerfDeptServiceImpl.java | 4 ++-- .../service/impl/PerfDeptSummaryServiceImpl.java | 6 +++--- .../impl/PerfEmployeeInfoServiceImpl.java | 8 ++++---- .../impl/PerfPositionTemplateServiceImpl.java | 6 +++--- .../perf/service/impl/PerfSalaryServiceImpl.java | 12 ++++++------ .../impl/PerfTemplateDimensionServiceImpl.java | 6 +++--- 66 files changed, 200 insertions(+), 200 deletions(-) diff --git a/klp-perf/src/main/java/com/klp/perf/controller/PerfAppraisalController.java b/klp-perf/src/main/java/com/klp/perf/controller/PerfAppraisalController.java index a613230b6..6904fc9e3 100644 --- a/klp-perf/src/main/java/com/klp/perf/controller/PerfAppraisalController.java +++ b/klp-perf/src/main/java/com/klp/perf/controller/PerfAppraisalController.java @@ -61,7 +61,7 @@ public class PerfAppraisalController extends BaseController { */ @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable String id) { + @PathVariable Long id) { return R.ok(iPerfAppraisalService.queryById(id)); } @@ -93,7 +93,7 @@ public class PerfAppraisalController extends BaseController { @Log(title = "月度绩效考核记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable String[] ids) { + @PathVariable Long[] ids) { return toAjax(iPerfAppraisalService.deleteWithValidByIds(Arrays.asList(ids), true)); } } diff --git a/klp-perf/src/main/java/com/klp/perf/controller/PerfAppraisalDetailController.java b/klp-perf/src/main/java/com/klp/perf/controller/PerfAppraisalDetailController.java index 8d227187e..d35b90601 100644 --- a/klp-perf/src/main/java/com/klp/perf/controller/PerfAppraisalDetailController.java +++ b/klp-perf/src/main/java/com/klp/perf/controller/PerfAppraisalDetailController.java @@ -61,7 +61,7 @@ public class PerfAppraisalDetailController extends BaseController { */ @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable String id) { + @PathVariable Long id) { return R.ok(iPerfAppraisalDetailService.queryById(id)); } @@ -93,7 +93,7 @@ public class PerfAppraisalDetailController extends BaseController { @Log(title = "考核维度评分明细", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable String[] ids) { + @PathVariable Long[] ids) { return toAjax(iPerfAppraisalDetailService.deleteWithValidByIds(Arrays.asList(ids), true)); } } diff --git a/klp-perf/src/main/java/com/klp/perf/controller/PerfCoeffRangeController.java b/klp-perf/src/main/java/com/klp/perf/controller/PerfCoeffRangeController.java index 6459736a2..1cc520bc8 100644 --- a/klp-perf/src/main/java/com/klp/perf/controller/PerfCoeffRangeController.java +++ b/klp-perf/src/main/java/com/klp/perf/controller/PerfCoeffRangeController.java @@ -61,7 +61,7 @@ public class PerfCoeffRangeController extends BaseController { */ @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable String id) { + @PathVariable Long id) { return R.ok(iPerfCoeffRangeService.queryById(id)); } @@ -93,7 +93,7 @@ public class PerfCoeffRangeController extends BaseController { @Log(title = "绩效系数换算", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable String[] ids) { + @PathVariable Long[] ids) { return toAjax(iPerfCoeffRangeService.deleteWithValidByIds(Arrays.asList(ids), true)); } } diff --git a/klp-perf/src/main/java/com/klp/perf/controller/PerfDeptConfigController.java b/klp-perf/src/main/java/com/klp/perf/controller/PerfDeptConfigController.java index 36171783a..5ed8a8b9e 100644 --- a/klp-perf/src/main/java/com/klp/perf/controller/PerfDeptConfigController.java +++ b/klp-perf/src/main/java/com/klp/perf/controller/PerfDeptConfigController.java @@ -61,7 +61,7 @@ public class PerfDeptConfigController extends BaseController { */ @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable String id) { + @PathVariable Long id) { return R.ok(iPerfDeptConfigService.queryById(id)); } @@ -93,7 +93,7 @@ public class PerfDeptConfigController extends BaseController { @Log(title = "车间考核参数配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable String[] ids) { + @PathVariable Long[] ids) { return toAjax(iPerfDeptConfigService.deleteWithValidByIds(Arrays.asList(ids), true)); } } diff --git a/klp-perf/src/main/java/com/klp/perf/controller/PerfDeptController.java b/klp-perf/src/main/java/com/klp/perf/controller/PerfDeptController.java index 6a0f14147..b58b43dee 100644 --- a/klp-perf/src/main/java/com/klp/perf/controller/PerfDeptController.java +++ b/klp-perf/src/main/java/com/klp/perf/controller/PerfDeptController.java @@ -61,7 +61,7 @@ public class PerfDeptController extends BaseController { */ @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable String id) { + @PathVariable Long id) { return R.ok(iPerfDeptService.queryById(id)); } @@ -93,7 +93,7 @@ public class PerfDeptController extends BaseController { @Log(title = "绩效系统部门", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable String[] ids) { + @PathVariable Long[] ids) { return toAjax(iPerfDeptService.deleteWithValidByIds(Arrays.asList(ids), true)); } } diff --git a/klp-perf/src/main/java/com/klp/perf/controller/PerfDeptItemConfigController.java b/klp-perf/src/main/java/com/klp/perf/controller/PerfDeptItemConfigController.java index 7096cea61..9e632b78b 100644 --- a/klp-perf/src/main/java/com/klp/perf/controller/PerfDeptItemConfigController.java +++ b/klp-perf/src/main/java/com/klp/perf/controller/PerfDeptItemConfigController.java @@ -61,7 +61,7 @@ public class PerfDeptItemConfigController extends BaseController { */ @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable String id) { + @PathVariable Long id) { return R.ok(iPerfDeptItemConfigService.queryById(id)); } @@ -93,7 +93,7 @@ public class PerfDeptItemConfigController extends BaseController { @Log(title = "车间扣款/奖励项目配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable String[] ids) { + @PathVariable Long[] ids) { return toAjax(iPerfDeptItemConfigService.deleteWithValidByIds(Arrays.asList(ids), true)); } } diff --git a/klp-perf/src/main/java/com/klp/perf/controller/PerfDeptSummaryController.java b/klp-perf/src/main/java/com/klp/perf/controller/PerfDeptSummaryController.java index 75a89445e..609c40ea5 100644 --- a/klp-perf/src/main/java/com/klp/perf/controller/PerfDeptSummaryController.java +++ b/klp-perf/src/main/java/com/klp/perf/controller/PerfDeptSummaryController.java @@ -61,7 +61,7 @@ public class PerfDeptSummaryController extends BaseController { */ @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable String id) { + @PathVariable Long id) { return R.ok(iPerfDeptSummaryService.queryById(id)); } @@ -93,7 +93,7 @@ public class PerfDeptSummaryController extends BaseController { @Log(title = "车间月度汇总", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable String[] ids) { + @PathVariable Long[] ids) { return toAjax(iPerfDeptSummaryService.deleteWithValidByIds(Arrays.asList(ids), true)); } } diff --git a/klp-perf/src/main/java/com/klp/perf/controller/PerfEmployeeInfoController.java b/klp-perf/src/main/java/com/klp/perf/controller/PerfEmployeeInfoController.java index c627f99fe..5d18464cc 100644 --- a/klp-perf/src/main/java/com/klp/perf/controller/PerfEmployeeInfoController.java +++ b/klp-perf/src/main/java/com/klp/perf/controller/PerfEmployeeInfoController.java @@ -61,7 +61,7 @@ public class PerfEmployeeInfoController extends BaseController { */ @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable String id) { + @PathVariable Long id) { return R.ok(iPerfEmployeeInfoService.queryById(id)); } @@ -93,7 +93,7 @@ public class PerfEmployeeInfoController extends BaseController { @Log(title = "员工绩效薪资基本信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable String[] ids) { + @PathVariable Long[] ids) { return toAjax(iPerfEmployeeInfoService.deleteWithValidByIds(Arrays.asList(ids), true)); } } diff --git a/klp-perf/src/main/java/com/klp/perf/controller/PerfPositionTemplateController.java b/klp-perf/src/main/java/com/klp/perf/controller/PerfPositionTemplateController.java index 604ce080a..9a266bb7d 100644 --- a/klp-perf/src/main/java/com/klp/perf/controller/PerfPositionTemplateController.java +++ b/klp-perf/src/main/java/com/klp/perf/controller/PerfPositionTemplateController.java @@ -61,7 +61,7 @@ public class PerfPositionTemplateController extends BaseController { */ @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable String id) { + @PathVariable Long id) { return R.ok(iPerfPositionTemplateService.queryById(id)); } @@ -93,7 +93,7 @@ public class PerfPositionTemplateController extends BaseController { @Log(title = "岗位绩效考核模板", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable String[] ids) { + @PathVariable Long[] ids) { return toAjax(iPerfPositionTemplateService.deleteWithValidByIds(Arrays.asList(ids), true)); } } diff --git a/klp-perf/src/main/java/com/klp/perf/controller/PerfSalaryController.java b/klp-perf/src/main/java/com/klp/perf/controller/PerfSalaryController.java index 63cf97931..55d783204 100644 --- a/klp-perf/src/main/java/com/klp/perf/controller/PerfSalaryController.java +++ b/klp-perf/src/main/java/com/klp/perf/controller/PerfSalaryController.java @@ -61,7 +61,7 @@ public class PerfSalaryController extends BaseController { */ @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable String id) { + @PathVariable Long id) { return R.ok(iPerfSalaryService.queryById(id)); } @@ -93,7 +93,7 @@ public class PerfSalaryController extends BaseController { @Log(title = "月度薪资计算记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable String[] ids) { + @PathVariable Long[] ids) { return toAjax(iPerfSalaryService.deleteWithValidByIds(Arrays.asList(ids), true)); } } diff --git a/klp-perf/src/main/java/com/klp/perf/controller/PerfTemplateDimensionController.java b/klp-perf/src/main/java/com/klp/perf/controller/PerfTemplateDimensionController.java index ef243af19..5298ae3ba 100644 --- a/klp-perf/src/main/java/com/klp/perf/controller/PerfTemplateDimensionController.java +++ b/klp-perf/src/main/java/com/klp/perf/controller/PerfTemplateDimensionController.java @@ -61,7 +61,7 @@ public class PerfTemplateDimensionController extends BaseController { */ @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable String id) { + @PathVariable Long id) { return R.ok(iPerfTemplateDimensionService.queryById(id)); } @@ -93,7 +93,7 @@ public class PerfTemplateDimensionController extends BaseController { @Log(title = "考核维度明细", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable String[] ids) { + @PathVariable Long[] ids) { return toAjax(iPerfTemplateDimensionService.deleteWithValidByIds(Arrays.asList(ids), true)); } } diff --git a/klp-perf/src/main/java/com/klp/perf/domain/PerfAppraisal.java b/klp-perf/src/main/java/com/klp/perf/domain/PerfAppraisal.java index 6315adb6e..26083df80 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/PerfAppraisal.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/PerfAppraisal.java @@ -26,19 +26,19 @@ public class PerfAppraisal extends BaseEntity { * */ @TableId(value = "id") - private String id; + private Long id; /** * 关联现有员工表主键 */ - private String employeeId; + private Long employeeId; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - private String deptId; + private Long deptId; /** * 关联 perf_position_template.id (当月使用的模板) */ - private String templateId; + private Long templateId; /** * 考核周期 YYYY-MM */ @@ -78,7 +78,7 @@ public class PerfAppraisal extends BaseEntity { /** * 确认人 */ - private String confirmedBy; + private Long confirmedBy; /** * 删除标志（0=正常，1=已删除） */ diff --git a/klp-perf/src/main/java/com/klp/perf/domain/PerfAppraisalDetail.java b/klp-perf/src/main/java/com/klp/perf/domain/PerfAppraisalDetail.java index d1e57b7c4..78cc67259 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/PerfAppraisalDetail.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/PerfAppraisalDetail.java @@ -24,15 +24,15 @@ public class PerfAppraisalDetail extends BaseEntity { * */ @TableId(value = "id") - private String id; + private Long id; /** * 关联 perf_appraisal.id */ - private String appraisalId; + private Long appraisalId; /** * 关联 perf_template_dimension.id */ - private String dimensionId; + private Long dimensionId; /** * 序号(从模板快照) */ diff --git a/klp-perf/src/main/java/com/klp/perf/domain/PerfCoeffRange.java b/klp-perf/src/main/java/com/klp/perf/domain/PerfCoeffRange.java index f9e29d531..f81c5f5c8 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/PerfCoeffRange.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/PerfCoeffRange.java @@ -24,7 +24,7 @@ public class PerfCoeffRange extends BaseEntity { * 主键 */ @TableId(value = "id") - private String id; + private Long id; /** * 等级标识 S/A/B/C/D */ diff --git a/klp-perf/src/main/java/com/klp/perf/domain/PerfDept.java b/klp-perf/src/main/java/com/klp/perf/domain/PerfDept.java index da4b6c0c6..105cb377d 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/PerfDept.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/PerfDept.java @@ -20,10 +20,10 @@ public class PerfDept extends BaseEntity { private static final long serialVersionUID=1L; /** - * 主键(UUID) + * 主键 */ @TableId(value = "id") - private String id; + private Long id; /** * 部门/车间名称 如:酸轧车间/技术部 */ diff --git a/klp-perf/src/main/java/com/klp/perf/domain/PerfDeptConfig.java b/klp-perf/src/main/java/com/klp/perf/domain/PerfDeptConfig.java index 4f63b60ac..67b813bf5 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/PerfDeptConfig.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/PerfDeptConfig.java @@ -26,11 +26,11 @@ public class PerfDeptConfig extends BaseEntity { * */ @TableId(value = "id") - private String id; + private Long id; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - private String deptId; + private Long deptId; /** * 月产量目标(吨) 或 月产长度目标(m) */ diff --git a/klp-perf/src/main/java/com/klp/perf/domain/PerfDeptItemConfig.java b/klp-perf/src/main/java/com/klp/perf/domain/PerfDeptItemConfig.java index 85309d310..aa42a22f1 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/PerfDeptItemConfig.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/PerfDeptItemConfig.java @@ -25,11 +25,11 @@ public class PerfDeptItemConfig extends BaseEntity { * */ @TableId(value = "id") - private String id; + private Long id; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - private String deptId; + private Long deptId; /** * 类型: 1=扣款项目 2=奖励项目 */ diff --git a/klp-perf/src/main/java/com/klp/perf/domain/PerfDeptSummary.java b/klp-perf/src/main/java/com/klp/perf/domain/PerfDeptSummary.java index 9d1b2b39e..8bd930cf0 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/PerfDeptSummary.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/PerfDeptSummary.java @@ -24,11 +24,11 @@ public class PerfDeptSummary extends BaseEntity { * */ @TableId(value = "id") - private String id; + private Long id; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - private String deptId; + private Long deptId; /** * 周期 YYYY-MM */ diff --git a/klp-perf/src/main/java/com/klp/perf/domain/PerfEmployeeInfo.java b/klp-perf/src/main/java/com/klp/perf/domain/PerfEmployeeInfo.java index 63a16aa36..64d05d1f7 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/PerfEmployeeInfo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/PerfEmployeeInfo.java @@ -24,15 +24,15 @@ public class PerfEmployeeInfo extends BaseEntity { * */ @TableId(value = "id") - private String id; + private Long id; /** * 关联现有员工表主键 */ - private String employeeId; + private Long employeeId; /** - * 关联 wms_dept.id (冗余,便于按部门查询) + * 关联 perf_dept.id (冗余,便于按部门查询) */ - private String deptId; + private Long deptId; /** * 岗位/工种 */ diff --git a/klp-perf/src/main/java/com/klp/perf/domain/PerfPositionTemplate.java b/klp-perf/src/main/java/com/klp/perf/domain/PerfPositionTemplate.java index d2f8c6c62..5f15b47b5 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/PerfPositionTemplate.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/PerfPositionTemplate.java @@ -23,11 +23,11 @@ public class PerfPositionTemplate extends BaseEntity { * */ @TableId(value = "id") - private String id; + private Long id; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - private String deptId; + private Long deptId; /** * 岗位名称 (与员工表岗位字段匹配) */ diff --git a/klp-perf/src/main/java/com/klp/perf/domain/PerfSalary.java b/klp-perf/src/main/java/com/klp/perf/domain/PerfSalary.java index d448bf9f1..650c5dcb8 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/PerfSalary.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/PerfSalary.java @@ -26,19 +26,19 @@ public class PerfSalary extends BaseEntity { * */ @TableId(value = "id") - private String id; + private Long id; /** * 关联现有员工表主键 */ - private String employeeId; + private Long employeeId; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - private String deptId; + private Long deptId; /** * 关联 perf_appraisal.id (可为空=未考核) */ - private String appraisalId; + private Long appraisalId; /** * 薪资周期 YYYY-MM */ @@ -142,7 +142,7 @@ public class PerfSalary extends BaseEntity { /** * */ - private String confirmedBy; + private Long confirmedBy; /** * 删除标志（0=正常，1=已删除） */ diff --git a/klp-perf/src/main/java/com/klp/perf/domain/PerfTemplateDimension.java b/klp-perf/src/main/java/com/klp/perf/domain/PerfTemplateDimension.java index 4478ba48b..f87e86d13 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/PerfTemplateDimension.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/PerfTemplateDimension.java @@ -23,11 +23,11 @@ public class PerfTemplateDimension extends BaseEntity { * */ @TableId(value = "id") - private String id; + private Long id; /** * 关联 perf_position_template.id */ - private String templateId; + private Long templateId; /** * 序号 */ diff --git a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfAppraisalBo.java b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfAppraisalBo.java index fa1a2e2f0..efb7ff490 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfAppraisalBo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfAppraisalBo.java @@ -23,22 +23,22 @@ public class PerfAppraisalBo extends BaseEntity { /** * */ - private String id; + private Long id; /** * 关联现有员工表主键 */ - private String employeeId; + private Long employeeId; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - private String deptId; + private Long deptId; /** * 关联 perf_position_template.id (当月使用的模板) */ - private String templateId; + private Long templateId; /** * 考核周期 YYYY-MM @@ -88,7 +88,7 @@ public class PerfAppraisalBo extends BaseEntity { /** * 确认人 */ - private String confirmedBy; + private Long confirmedBy; /** * 备注 diff --git a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfAppraisalDetailBo.java b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfAppraisalDetailBo.java index 210f4d2fe..e565dafc9 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfAppraisalDetailBo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfAppraisalDetailBo.java @@ -21,17 +21,17 @@ public class PerfAppraisalDetailBo extends BaseEntity { /** * */ - private String id; + private Long id; /** * 关联 perf_appraisal.id */ - private String appraisalId; + private Long appraisalId; /** * 关联 perf_template_dimension.id */ - private String dimensionId; + private Long dimensionId; /** * 序号(从模板快照) diff --git a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfCoeffRangeBo.java b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfCoeffRangeBo.java index 8fb23d2aa..3ce828ac4 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfCoeffRangeBo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfCoeffRangeBo.java @@ -21,7 +21,7 @@ public class PerfCoeffRangeBo extends BaseEntity { /** * 主键 */ - private String id; + private Long id; /** * 等级标识 S/A/B/C/D diff --git a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptBo.java b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptBo.java index b95d43b93..aab7b048c 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptBo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptBo.java @@ -18,9 +18,9 @@ import javax.validation.constraints.*; public class PerfDeptBo extends BaseEntity { /** - * 主键(UUID) + * 主键 */ - private String id; + private Long id; /** * 部门/车间名称 如:酸轧车间/技术部 diff --git a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptConfigBo.java b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptConfigBo.java index f05387667..442cb4b1b 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptConfigBo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptConfigBo.java @@ -23,12 +23,12 @@ public class PerfDeptConfigBo extends BaseEntity { /** * */ - private String id; + private Long id; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - private String deptId; + private Long deptId; /** * 月产量目标(吨) 或 月产长度目标(m) diff --git a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptItemConfigBo.java b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptItemConfigBo.java index b0c5f6b6c..5371efa47 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptItemConfigBo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptItemConfigBo.java @@ -22,12 +22,12 @@ public class PerfDeptItemConfigBo extends BaseEntity { /** * */ - private String id; + private Long id; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - private String deptId; + private Long deptId; /** * 类型: 1=扣款项目 2=奖励项目 diff --git a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptSummaryBo.java b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptSummaryBo.java index 99e61b024..5c216715e 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptSummaryBo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptSummaryBo.java @@ -21,12 +21,12 @@ public class PerfDeptSummaryBo extends BaseEntity { /** * */ - private String id; + private Long id; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - private String deptId; + private Long deptId; /** * 周期 YYYY-MM diff --git a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfEmployeeInfoBo.java b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfEmployeeInfoBo.java index b997d73bc..ed01261b7 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfEmployeeInfoBo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfEmployeeInfoBo.java @@ -21,17 +21,17 @@ public class PerfEmployeeInfoBo extends BaseEntity { /** * */ - private String id; + private Long id; /** * 关联现有员工表主键 */ - private String employeeId; + private Long employeeId; /** - * 关联 wms_dept.id (冗余,便于按部门查询) + * 关联 perf_dept.id (冗余,便于按部门查询) */ - private String deptId; + private Long deptId; /** * 岗位/工种 diff --git a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfPositionTemplateBo.java b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfPositionTemplateBo.java index e1813c232..766ffaeab 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfPositionTemplateBo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfPositionTemplateBo.java @@ -20,12 +20,12 @@ public class PerfPositionTemplateBo extends BaseEntity { /** * */ - private String id; + private Long id; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - private String deptId; + private Long deptId; /** * 岗位名称 (与员工表岗位字段匹配) diff --git a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfSalaryBo.java b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfSalaryBo.java index 6da57e97e..81db7bf20 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfSalaryBo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfSalaryBo.java @@ -23,22 +23,22 @@ public class PerfSalaryBo extends BaseEntity { /** * */ - private String id; + private Long id; /** * 关联现有员工表主键 */ - private String employeeId; + private Long employeeId; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - private String deptId; + private Long deptId; /** * 关联 perf_appraisal.id (可为空=未考核) */ - private String appraisalId; + private Long appraisalId; /** * 薪资周期 YYYY-MM @@ -168,7 +168,7 @@ public class PerfSalaryBo extends BaseEntity { /** * */ - private String confirmedBy; + private Long confirmedBy; /** * 备注 diff --git a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfTemplateDimensionBo.java b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfTemplateDimensionBo.java index a926a64ee..a33ada3a8 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfTemplateDimensionBo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/bo/PerfTemplateDimensionBo.java @@ -20,12 +20,12 @@ public class PerfTemplateDimensionBo extends BaseEntity { /** * */ - private String id; + private Long id; /** * 关联 perf_position_template.id */ - private String templateId; + private Long templateId; /** * 序号 diff --git a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfAppraisalDetailVo.java b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfAppraisalDetailVo.java index 861c93b2b..d7a624a4f 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfAppraisalDetailVo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfAppraisalDetailVo.java @@ -24,19 +24,19 @@ public class PerfAppraisalDetailVo { * */ @ExcelProperty(value = "") - private String id; + private Long id; /** * 关联 perf_appraisal.id */ @ExcelProperty(value = "关联 perf_appraisal.id") - private String appraisalId; + private Long appraisalId; /** * 关联 perf_template_dimension.id */ @ExcelProperty(value = "关联 perf_template_dimension.id") - private String dimensionId; + private Long dimensionId; /** * 序号(从模板快照) diff --git a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfAppraisalVo.java b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfAppraisalVo.java index 63d7ab9ce..08d565adf 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfAppraisalVo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfAppraisalVo.java @@ -26,25 +26,25 @@ public class PerfAppraisalVo { * */ @ExcelProperty(value = "") - private String id; + private Long id; /** * 关联现有员工表主键 */ @ExcelProperty(value = "关联现有员工表主键") - private String employeeId; + private Long employeeId; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - @ExcelProperty(value = "关联 wms_dept.id") - private String deptId; + @ExcelProperty(value = "关联 perf_dept.id") + private Long deptId; /** * 关联 perf_position_template.id (当月使用的模板) */ @ExcelProperty(value = "关联 perf_position_template.id (当月使用的模板)") - private String templateId; + private Long templateId; /** * 考核周期 YYYY-MM @@ -104,7 +104,7 @@ public class PerfAppraisalVo { * 确认人 */ @ExcelProperty(value = "确认人") - private String confirmedBy; + private Long confirmedBy; /** * 备注 diff --git a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfCoeffRangeVo.java b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfCoeffRangeVo.java index d6754127e..2bc9c1e2d 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfCoeffRangeVo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfCoeffRangeVo.java @@ -24,7 +24,7 @@ public class PerfCoeffRangeVo { * 主键 */ @ExcelProperty(value = "主键") - private String id; + private Long id; /** * 等级标识 S/A/B/C/D diff --git a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptConfigVo.java b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptConfigVo.java index ff5202fc5..1e1a01a44 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptConfigVo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptConfigVo.java @@ -26,13 +26,13 @@ public class PerfDeptConfigVo { * */ @ExcelProperty(value = "") - private String id; + private Long id; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - @ExcelProperty(value = "关联 wms_dept.id") - private String deptId; + @ExcelProperty(value = "关联 perf_dept.id") + private Long deptId; /** * 月产量目标(吨) 或 月产长度目标(m) diff --git a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptItemConfigVo.java b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptItemConfigVo.java index 5760320fc..b8be79555 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptItemConfigVo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptItemConfigVo.java @@ -25,13 +25,13 @@ public class PerfDeptItemConfigVo { * */ @ExcelProperty(value = "") - private String id; + private Long id; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - @ExcelProperty(value = "关联 wms_dept.id") - private String deptId; + @ExcelProperty(value = "关联 perf_dept.id") + private Long deptId; /** * 类型: 1=扣款项目 2=奖励项目 diff --git a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptSummaryVo.java b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptSummaryVo.java index 488cbaffd..ede2b56f7 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptSummaryVo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptSummaryVo.java @@ -24,13 +24,13 @@ public class PerfDeptSummaryVo { * */ @ExcelProperty(value = "") - private String id; + private Long id; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - @ExcelProperty(value = "关联 wms_dept.id") - private String deptId; + @ExcelProperty(value = "关联 perf_dept.id") + private Long deptId; /** * 周期 YYYY-MM diff --git a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptVo.java b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptVo.java index 7cbd8acf3..e0f32c0b4 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptVo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptVo.java @@ -20,10 +20,10 @@ public class PerfDeptVo { private static final long serialVersionUID = 1L; /** - * 主键(UUID) + * 主键 */ - @ExcelProperty(value = "主键(UUID)") - private String id; + @ExcelProperty(value = "主键") + private Long id; /** * 部门/车间名称 如:酸轧车间/技术部 diff --git a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfEmployeeInfoVo.java b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfEmployeeInfoVo.java index 3c1cd0987..86aa50faa 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfEmployeeInfoVo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfEmployeeInfoVo.java @@ -24,19 +24,19 @@ public class PerfEmployeeInfoVo { * */ @ExcelProperty(value = "") - private String id; + private Long id; /** * 关联现有员工表主键 */ @ExcelProperty(value = "关联现有员工表主键") - private String employeeId; + private Long employeeId; /** - * 关联 wms_dept.id (冗余,便于按部门查询) + * 关联 perf_dept.id (冗余,便于按部门查询) */ - @ExcelProperty(value = "关联 wms_dept.id (冗余,便于按部门查询)") - private String deptId; + @ExcelProperty(value = "关联 perf_dept.id (冗余,便于按部门查询)") + private Long deptId; /** * 岗位/工种 diff --git a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfPositionTemplateVo.java b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfPositionTemplateVo.java index d02818209..1f68d98b8 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfPositionTemplateVo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfPositionTemplateVo.java @@ -23,13 +23,13 @@ public class PerfPositionTemplateVo { * */ @ExcelProperty(value = "") - private String id; + private Long id; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - @ExcelProperty(value = "关联 wms_dept.id") - private String deptId; + @ExcelProperty(value = "关联 perf_dept.id") + private Long deptId; /** * 岗位名称 (与员工表岗位字段匹配) diff --git a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfSalaryVo.java b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfSalaryVo.java index 0bf762895..ae34c92bf 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfSalaryVo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfSalaryVo.java @@ -26,25 +26,25 @@ public class PerfSalaryVo { * */ @ExcelProperty(value = "") - private String id; + private Long id; /** * 关联现有员工表主键 */ @ExcelProperty(value = "关联现有员工表主键") - private String employeeId; + private Long employeeId; /** - * 关联 wms_dept.id + * 关联 perf_dept.id */ - @ExcelProperty(value = "关联 wms_dept.id") - private String deptId; + @ExcelProperty(value = "关联 perf_dept.id") + private Long deptId; /** * 关联 perf_appraisal.id (可为空=未考核) */ @ExcelProperty(value = "关联 perf_appraisal.id (可为空=未考核)") - private String appraisalId; + private Long appraisalId; /** * 薪资周期 YYYY-MM @@ -133,7 +133,7 @@ public class PerfSalaryVo { /** * 奖励明细 {"节能奖励":0,...} */ - @ExcelProperty(value = "奖励明细 ") + @ExcelProperty(value = "奖励明细") private String bonusesJson; /** @@ -200,7 +200,7 @@ public class PerfSalaryVo { * */ @ExcelProperty(value = "") - private String confirmedBy; + private Long confirmedBy; /** * 备注 diff --git a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfTemplateDimensionVo.java b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfTemplateDimensionVo.java index 47d1d0425..4e0da61c4 100644 --- a/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfTemplateDimensionVo.java +++ b/klp-perf/src/main/java/com/klp/perf/domain/vo/PerfTemplateDimensionVo.java @@ -23,13 +23,13 @@ public class PerfTemplateDimensionVo { * */ @ExcelProperty(value = "") - private String id; + private Long id; /** * 关联 perf_position_template.id */ @ExcelProperty(value = "关联 perf_position_template.id") - private String templateId; + private Long templateId; /** * 序号 diff --git a/klp-perf/src/main/java/com/klp/perf/service/IPerfAppraisalDetailService.java b/klp-perf/src/main/java/com/klp/perf/service/IPerfAppraisalDetailService.java index 250edc600..90b3b779e 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/IPerfAppraisalDetailService.java +++ b/klp-perf/src/main/java/com/klp/perf/service/IPerfAppraisalDetailService.java @@ -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 ids, Boolean isValid); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); } diff --git a/klp-perf/src/main/java/com/klp/perf/service/IPerfAppraisalService.java b/klp-perf/src/main/java/com/klp/perf/service/IPerfAppraisalService.java index 3eb027634..d6a65f218 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/IPerfAppraisalService.java +++ b/klp-perf/src/main/java/com/klp/perf/service/IPerfAppraisalService.java @@ -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 ids, Boolean isValid); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); } diff --git a/klp-perf/src/main/java/com/klp/perf/service/IPerfCoeffRangeService.java b/klp-perf/src/main/java/com/klp/perf/service/IPerfCoeffRangeService.java index df9646da2..f589a113b 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/IPerfCoeffRangeService.java +++ b/klp-perf/src/main/java/com/klp/perf/service/IPerfCoeffRangeService.java @@ -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 ids, Boolean isValid); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); } diff --git a/klp-perf/src/main/java/com/klp/perf/service/IPerfDeptConfigService.java b/klp-perf/src/main/java/com/klp/perf/service/IPerfDeptConfigService.java index e3123e34b..69d713892 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/IPerfDeptConfigService.java +++ b/klp-perf/src/main/java/com/klp/perf/service/IPerfDeptConfigService.java @@ -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 ids, Boolean isValid); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); } diff --git a/klp-perf/src/main/java/com/klp/perf/service/IPerfDeptItemConfigService.java b/klp-perf/src/main/java/com/klp/perf/service/IPerfDeptItemConfigService.java index ab590509a..b72673527 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/IPerfDeptItemConfigService.java +++ b/klp-perf/src/main/java/com/klp/perf/service/IPerfDeptItemConfigService.java @@ -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 ids, Boolean isValid); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); } diff --git a/klp-perf/src/main/java/com/klp/perf/service/IPerfDeptService.java b/klp-perf/src/main/java/com/klp/perf/service/IPerfDeptService.java index f0f24ae40..443eaa518 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/IPerfDeptService.java +++ b/klp-perf/src/main/java/com/klp/perf/service/IPerfDeptService.java @@ -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 ids, Boolean isValid); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); } diff --git a/klp-perf/src/main/java/com/klp/perf/service/IPerfDeptSummaryService.java b/klp-perf/src/main/java/com/klp/perf/service/IPerfDeptSummaryService.java index 956abdee8..517e6e983 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/IPerfDeptSummaryService.java +++ b/klp-perf/src/main/java/com/klp/perf/service/IPerfDeptSummaryService.java @@ -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 ids, Boolean isValid); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); } diff --git a/klp-perf/src/main/java/com/klp/perf/service/IPerfEmployeeInfoService.java b/klp-perf/src/main/java/com/klp/perf/service/IPerfEmployeeInfoService.java index fde95e435..9c76f822c 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/IPerfEmployeeInfoService.java +++ b/klp-perf/src/main/java/com/klp/perf/service/IPerfEmployeeInfoService.java @@ -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 ids, Boolean isValid); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); } diff --git a/klp-perf/src/main/java/com/klp/perf/service/IPerfPositionTemplateService.java b/klp-perf/src/main/java/com/klp/perf/service/IPerfPositionTemplateService.java index f3cec7de6..3c29e50d2 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/IPerfPositionTemplateService.java +++ b/klp-perf/src/main/java/com/klp/perf/service/IPerfPositionTemplateService.java @@ -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 ids, Boolean isValid); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); } diff --git a/klp-perf/src/main/java/com/klp/perf/service/IPerfSalaryService.java b/klp-perf/src/main/java/com/klp/perf/service/IPerfSalaryService.java index a936dc01e..73bdffddc 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/IPerfSalaryService.java +++ b/klp-perf/src/main/java/com/klp/perf/service/IPerfSalaryService.java @@ -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 ids, Boolean isValid); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); } diff --git a/klp-perf/src/main/java/com/klp/perf/service/IPerfTemplateDimensionService.java b/klp-perf/src/main/java/com/klp/perf/service/IPerfTemplateDimensionService.java index 3b2df0bc4..78f613ce9 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/IPerfTemplateDimensionService.java +++ b/klp-perf/src/main/java/com/klp/perf/service/IPerfTemplateDimensionService.java @@ -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 ids, Boolean isValid); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); } diff --git a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfAppraisalDetailServiceImpl.java b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfAppraisalDetailServiceImpl.java index eba26d299..962bb5b28 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfAppraisalDetailServiceImpl.java +++ b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfAppraisalDetailServiceImpl.java @@ -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 buildQueryWrapper(PerfAppraisalDetailBo bo) { Map params = bo.getParams(); LambdaQueryWrapper 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 ids, Boolean isValid) { + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } diff --git a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfAppraisalServiceImpl.java b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfAppraisalServiceImpl.java index 126ba9e39..563cbbabd 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfAppraisalServiceImpl.java +++ b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfAppraisalServiceImpl.java @@ -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 buildQueryWrapper(PerfAppraisalBo bo) { Map params = bo.getParams(); LambdaQueryWrapper 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 ids, Boolean isValid) { + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } diff --git a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfCoeffRangeServiceImpl.java b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfCoeffRangeServiceImpl.java index e88d1a4fe..29c8d8658 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfCoeffRangeServiceImpl.java +++ b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfCoeffRangeServiceImpl.java @@ -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 ids, Boolean isValid) { + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } diff --git a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptConfigServiceImpl.java b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptConfigServiceImpl.java index f31d98c97..c5c86017f 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptConfigServiceImpl.java +++ b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptConfigServiceImpl.java @@ -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 buildQueryWrapper(PerfDeptConfigBo bo) { Map params = bo.getParams(); LambdaQueryWrapper 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 ids, Boolean isValid) { + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } diff --git a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptItemConfigServiceImpl.java b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptItemConfigServiceImpl.java index b434b7592..2de36f9c0 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptItemConfigServiceImpl.java +++ b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptItemConfigServiceImpl.java @@ -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 buildQueryWrapper(PerfDeptItemConfigBo bo) { Map params = bo.getParams(); LambdaQueryWrapper 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 ids, Boolean isValid) { + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } diff --git a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptServiceImpl.java b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptServiceImpl.java index c09f76110..2e40e7183 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptServiceImpl.java +++ b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptServiceImpl.java @@ -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 ids, Boolean isValid) { + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } diff --git a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptSummaryServiceImpl.java b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptSummaryServiceImpl.java index 8dc60ce99..2b0e9a243 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptSummaryServiceImpl.java +++ b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptSummaryServiceImpl.java @@ -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 buildQueryWrapper(PerfDeptSummaryBo bo) { Map params = bo.getParams(); LambdaQueryWrapper 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 ids, Boolean isValid) { + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } diff --git a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfEmployeeInfoServiceImpl.java b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfEmployeeInfoServiceImpl.java index 51e2628a7..58ce5e835 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfEmployeeInfoServiceImpl.java +++ b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfEmployeeInfoServiceImpl.java @@ -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 buildQueryWrapper(PerfEmployeeInfoBo bo) { Map params = bo.getParams(); LambdaQueryWrapper 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 ids, Boolean isValid) { + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } diff --git a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfPositionTemplateServiceImpl.java b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfPositionTemplateServiceImpl.java index b385d1126..f3221a8b8 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfPositionTemplateServiceImpl.java +++ b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfPositionTemplateServiceImpl.java @@ -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 buildQueryWrapper(PerfPositionTemplateBo bo) { Map params = bo.getParams(); LambdaQueryWrapper 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 ids, Boolean isValid) { + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } diff --git a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfSalaryServiceImpl.java b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfSalaryServiceImpl.java index a2ce47ab0..d6d65bcc4 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfSalaryServiceImpl.java +++ b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfSalaryServiceImpl.java @@ -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 buildQueryWrapper(PerfSalaryBo bo) { Map params = bo.getParams(); LambdaQueryWrapper 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 ids, Boolean isValid) { + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } diff --git a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfTemplateDimensionServiceImpl.java b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfTemplateDimensionServiceImpl.java index 4fd81b947..eb6ff8784 100644 --- a/klp-perf/src/main/java/com/klp/perf/service/impl/PerfTemplateDimensionServiceImpl.java +++ b/klp-perf/src/main/java/com/klp/perf/service/impl/PerfTemplateDimensionServiceImpl.java @@ -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 buildQueryWrapper(PerfTemplateDimensionBo bo) { Map params = bo.getParams(); LambdaQueryWrapper 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 ids, Boolean isValid) { + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 }