DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-07-07 18:07:23 +08:00
parent c0e06b6fad 4278c4eb26
commit 72a9371f5f
69 changed files with 1833 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-perf/src/main/java/com/klp/perf/controller/PerfAppraisalController.java
View File

@@ -61,7 +61,7 @@ public class PerfAppraisalController extends BaseController {
*/
@GetMapping("/{id}")
public R<PerfAppraisalVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable String[] ids) {
@PathVariable Long[] ids) {
return toAjax(iPerfAppraisalService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}

4
klp-perf/src/main/java/com/klp/perf/controller/PerfAppraisalDetailController.java
View File

@@ -61,7 +61,7 @@ public class PerfAppraisalDetailController extends BaseController {
*/
@GetMapping("/{id}")
public R<PerfAppraisalDetailVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable String[] ids) {
@PathVariable Long[] ids) {
return toAjax(iPerfAppraisalDetailService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}

4
klp-perf/src/main/java/com/klp/perf/controller/PerfCoeffRangeController.java
View File

@@ -61,7 +61,7 @@ public class PerfCoeffRangeController extends BaseController {
*/
@GetMapping("/{id}")
public R<PerfCoeffRangeVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable String[] ids) {
@PathVariable Long[] ids) {
return toAjax(iPerfCoeffRangeService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}

4
klp-perf/src/main/java/com/klp/perf/controller/PerfDeptConfigController.java
View File

@@ -61,7 +61,7 @@ public class PerfDeptConfigController extends BaseController {
*/
@GetMapping("/{id}")
public R<PerfDeptConfigVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable String[] ids) {
@PathVariable Long[] ids) {
return toAjax(iPerfDeptConfigService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}

4
klp-perf/src/main/java/com/klp/perf/controller/PerfDeptController.java
View File

@@ -61,7 +61,7 @@ public class PerfDeptController extends BaseController {
*/
@GetMapping("/{id}")
public R<PerfDeptVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable String[] ids) {
@PathVariable Long[] ids) {
return toAjax(iPerfDeptService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}

4
klp-perf/src/main/java/com/klp/perf/controller/PerfDeptItemConfigController.java
View File

@@ -61,7 +61,7 @@ public class PerfDeptItemConfigController extends BaseController {
*/
@GetMapping("/{id}")
public R<PerfDeptItemConfigVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable String[] ids) {
@PathVariable Long[] ids) {
return toAjax(iPerfDeptItemConfigService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}

4
klp-perf/src/main/java/com/klp/perf/controller/PerfDeptSummaryController.java
View File

@@ -61,7 +61,7 @@ public class PerfDeptSummaryController extends BaseController {
*/
@GetMapping("/{id}")
public R<PerfDeptSummaryVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable String[] ids) {
@PathVariable Long[] ids) {
return toAjax(iPerfDeptSummaryService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}

4
klp-perf/src/main/java/com/klp/perf/controller/PerfEmployeeInfoController.java
View File

@@ -61,7 +61,7 @@ public class PerfEmployeeInfoController extends BaseController {
*/
@GetMapping("/{id}")
public R<PerfEmployeeInfoVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable String[] ids) {
@PathVariable Long[] ids) {
return toAjax(iPerfEmployeeInfoService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}

4
klp-perf/src/main/java/com/klp/perf/controller/PerfPositionTemplateController.java
View File

@@ -61,7 +61,7 @@ public class PerfPositionTemplateController extends BaseController {
*/
@GetMapping("/{id}")
public R<PerfPositionTemplateVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable String[] ids) {
@PathVariable Long[] ids) {
return toAjax(iPerfPositionTemplateService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}

4
klp-perf/src/main/java/com/klp/perf/controller/PerfSalaryController.java
View File

@@ -61,7 +61,7 @@ public class PerfSalaryController extends BaseController {
*/
@GetMapping("/{id}")
public R<PerfSalaryVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable String[] ids) {
@PathVariable Long[] ids) {
return toAjax(iPerfSalaryService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}

4
klp-perf/src/main/java/com/klp/perf/controller/PerfTemplateDimensionController.java
View File

@@ -61,7 +61,7 @@ public class PerfTemplateDimensionController extends BaseController {
*/
@GetMapping("/{id}")
public R<PerfTemplateDimensionVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable String[] ids) {
@PathVariable Long[] ids) {
return toAjax(iPerfTemplateDimensionService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}

12
klp-perf/src/main/java/com/klp/perf/domain/PerfAppraisal.java
View File

@@ -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=已删除）
*/

6
klp-perf/src/main/java/com/klp/perf/domain/PerfAppraisalDetail.java
View File

@@ -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;
/**
* 序号(从模板快照)
*/

2
klp-perf/src/main/java/com/klp/perf/domain/PerfCoeffRange.java
View File

@@ -24,7 +24,7 @@ public class PerfCoeffRange extends BaseEntity {
* 主键
*/
@TableId(value = "id")
private String id;
private Long id;
/**
* 等级标识 S/A/B/C/D
*/

4
klp-perf/src/main/java/com/klp/perf/domain/PerfDept.java
View File

@@ -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;
/**
* 部门/车间名称 如:酸轧车间/技术部
*/

6
klp-perf/src/main/java/com/klp/perf/domain/PerfDeptConfig.java
View File

@@ -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)
*/

6
klp-perf/src/main/java/com/klp/perf/domain/PerfDeptItemConfig.java
View File

@@ -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=奖励项目
*/

6
klp-perf/src/main/java/com/klp/perf/domain/PerfDeptSummary.java
View File

@@ -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
*/

8
klp-perf/src/main/java/com/klp/perf/domain/PerfEmployeeInfo.java
View File

@@ -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;
/**
* 岗位/工种
*/

6
klp-perf/src/main/java/com/klp/perf/domain/PerfPositionTemplate.java
View File

@@ -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;
/**
* 岗位名称 (与员工表岗位字段匹配)
*/

12
klp-perf/src/main/java/com/klp/perf/domain/PerfSalary.java
View File

@@ -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=已删除）
*/

4
klp-perf/src/main/java/com/klp/perf/domain/PerfTemplateDimension.java
View File

@@ -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;
/**
* 序号
*/

12
klp-perf/src/main/java/com/klp/perf/domain/bo/PerfAppraisalBo.java
View File

@@ -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;
/**
* 备注

6
klp-perf/src/main/java/com/klp/perf/domain/bo/PerfAppraisalDetailBo.java
View File

@@ -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;
/**
* 序号(从模板快照)

2
klp-perf/src/main/java/com/klp/perf/domain/bo/PerfCoeffRangeBo.java
View File

@@ -21,7 +21,7 @@ public class PerfCoeffRangeBo extends BaseEntity {
/**
* 主键
*/
private String id;
private Long id;
/**
* 等级标识 S/A/B/C/D

4
klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptBo.java
View File

@@ -18,9 +18,9 @@ import javax.validation.constraints.*;
public class PerfDeptBo extends BaseEntity {
/**
* 主键(UUID)
* 主键
*/
private String id;
private Long id;
/**
* 部门/车间名称 如:酸轧车间/技术部

6
klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptConfigBo.java
View File

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

6
klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptItemConfigBo.java
View File

@@ -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=奖励项目

6
klp-perf/src/main/java/com/klp/perf/domain/bo/PerfDeptSummaryBo.java
View File

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

8
klp-perf/src/main/java/com/klp/perf/domain/bo/PerfEmployeeInfoBo.java
View File

@@ -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;
/**
* 岗位/工种

6
klp-perf/src/main/java/com/klp/perf/domain/bo/PerfPositionTemplateBo.java
View File

@@ -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;
/**
* 岗位名称 (与员工表岗位字段匹配)

12
klp-perf/src/main/java/com/klp/perf/domain/bo/PerfSalaryBo.java
View File

@@ -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;
/**
* 备注

4
klp-perf/src/main/java/com/klp/perf/domain/bo/PerfTemplateDimensionBo.java
View File

@@ -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;
/**
* 序号

6
klp-perf/src/main/java/com/klp/perf/domain/vo/PerfAppraisalDetailVo.java
View File

@@ -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;
/**
* 序号(从模板快照)

14
klp-perf/src/main/java/com/klp/perf/domain/vo/PerfAppraisalVo.java
View File

@@ -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;
/**
* 备注

2
klp-perf/src/main/java/com/klp/perf/domain/vo/PerfCoeffRangeVo.java
View File

@@ -24,7 +24,7 @@ public class PerfCoeffRangeVo {
* 主键
*/
@ExcelProperty(value = "主键")
private String id;
private Long id;
/**
* 等级标识 S/A/B/C/D

8
klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptConfigVo.java
View File

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

8
klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptItemConfigVo.java
View File

@@ -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=奖励项目

8
klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptSummaryVo.java
View File

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

6
klp-perf/src/main/java/com/klp/perf/domain/vo/PerfDeptVo.java
View File

@@ -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;
/**
* 部门/车间名称 如:酸轧车间/技术部

10
klp-perf/src/main/java/com/klp/perf/domain/vo/PerfEmployeeInfoVo.java
View File

@@ -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;
/**
* 岗位/工种

8
klp-perf/src/main/java/com/klp/perf/domain/vo/PerfPositionTemplateVo.java
View File

@@ -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;
/**
* 岗位名称 (与员工表岗位字段匹配)

16
klp-perf/src/main/java/com/klp/perf/domain/vo/PerfSalaryVo.java
View File

@@ -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;
/**
* 备注

4
klp-perf/src/main/java/com/klp/perf/domain/vo/PerfTemplateDimensionVo.java
View File

@@ -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;
/**
* 序号

4
klp-perf/src/main/java/com/klp/perf/service/IPerfAppraisalDetailService.java
View File

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

4
klp-perf/src/main/java/com/klp/perf/service/IPerfAppraisalService.java
View File

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

4
klp-perf/src/main/java/com/klp/perf/service/IPerfCoeffRangeService.java
View File

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

4
klp-perf/src/main/java/com/klp/perf/service/IPerfDeptConfigService.java
View File

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

4
klp-perf/src/main/java/com/klp/perf/service/IPerfDeptItemConfigService.java
View File

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

4
klp-perf/src/main/java/com/klp/perf/service/IPerfDeptService.java
View File

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

4
klp-perf/src/main/java/com/klp/perf/service/IPerfDeptSummaryService.java
View File

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

4
klp-perf/src/main/java/com/klp/perf/service/IPerfEmployeeInfoService.java
View File

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

4
klp-perf/src/main/java/com/klp/perf/service/IPerfPositionTemplateService.java
View File

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

4
klp-perf/src/main/java/com/klp/perf/service/IPerfSalaryService.java
View File

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

4
klp-perf/src/main/java/com/klp/perf/service/IPerfTemplateDimensionService.java
View File

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

8
klp-perf/src/main/java/com/klp/perf/service/impl/PerfAppraisalDetailServiceImpl.java
View File

@@ -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 做一些业务上的校验,判断是否需要校验
}

12
klp-perf/src/main/java/com/klp/perf/service/impl/PerfAppraisalServiceImpl.java
View File

@@ -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 做一些业务上的校验,判断是否需要校验
}

4
klp-perf/src/main/java/com/klp/perf/service/impl/PerfCoeffRangeServiceImpl.java
View File

@@ -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 做一些业务上的校验,判断是否需要校验
}

6
klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptConfigServiceImpl.java
View File

@@ -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 做一些业务上的校验,判断是否需要校验
}

6
klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptItemConfigServiceImpl.java
View File

@@ -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 做一些业务上的校验,判断是否需要校验
}

4
klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptServiceImpl.java
View File

@@ -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 做一些业务上的校验,判断是否需要校验
}

6
klp-perf/src/main/java/com/klp/perf/service/impl/PerfDeptSummaryServiceImpl.java
View File

@@ -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 做一些业务上的校验,判断是否需要校验
}

8
klp-perf/src/main/java/com/klp/perf/service/impl/PerfEmployeeInfoServiceImpl.java
View File

@@ -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 做一些业务上的校验,判断是否需要校验
}

6
klp-perf/src/main/java/com/klp/perf/service/impl/PerfPositionTemplateServiceImpl.java
View File

@@ -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 做一些业务上的校验,判断是否需要校验
}

12
klp-perf/src/main/java/com/klp/perf/service/impl/PerfSalaryServiceImpl.java
View File

@@ -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 做一些业务上的校验,判断是否需要校验
}

6
klp-perf/src/main/java/com/klp/perf/service/impl/PerfTemplateDimensionServiceImpl.java
View File

@@ -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 做一些业务上的校验,判断是否需要校验
}

1615
klp-ui/src/components/HomeModules/QuickAccessGroup.vue Normal file
View File

File diff suppressed because it is too large Load Diff

15
klp-ui/src/layout/components/Sidebar/index.vue
View File

@@ -23,7 +23,7 @@
<span class="top-menu-title">{{ (menu.meta && menu.meta.title) || menu.name }}</span>
</div>
</div>
<div slot="reference" class="sidebar-section-title" :class="{ 'is-collapse': isCollapse }">
<div ref="topMenuTrigger" slot="reference" class="sidebar-section-title" :class="{ 'is-collapse': isCollapse }" tabindex="0">
<div class="section-title-inner">
<div class="section-icon">
<svg-icon v-if="activeTopMenuIcon" :icon-class="activeTopMenuIcon" />
@@ -141,6 +141,11 @@ export default {
}
},
watch: {
sectionPopoverVisible: {
handler(val) {
if (!val) this.releasePopoverFocus()
}
},
$route: {
immediate: true,
handler(newRoute) {
@@ -165,8 +170,16 @@ export default {
this.$router.push('/')
this.$nextTick(() => {
this.sectionPopoverVisible = false
this.releasePopoverFocus()
})
},
releasePopoverFocus() {
if (typeof document === 'undefined') return
const el = document.activeElement
if (el && typeof el.blur === 'function') el.blur()
const trigger = this.$refs && this.$refs.topMenuTrigger
if (trigger && typeof trigger.focus === 'function') trigger.focus()
},
autoSelectTopMenu(currentPath) {
const topMenus = this.$store.state.permission.topMenuList
if (topMenus.length === 0) return

10
klp-ui/src/views/index.vue
View File

@@ -19,7 +19,7 @@
</p>
</div>
<statistic-group />
<quick-access-group />
</el-col>
<!-- 右栏 -->
@@ -37,10 +37,6 @@
</el-row>
</div>
<!-- <div>
<statistic-group />
</div> -->
<!-- <AllApplications />
<el-row :gutter="10">
<el-col :span="18">
@@ -54,7 +50,7 @@
</template>
<script>
import StatisticGroup from '@/components/HomeModules/StatisticGroup.vue'
import QuickAccessGroup from '@/components/HomeModules/QuickAccessGroup.vue'
// import AllApplications from '@/components/HomeModules/AllApplications.vue'
// import MiniCalendar from '@/components/HomeModules/MiniCalendar.vue'
@@ -62,7 +58,7 @@ export default {
name: 'Index',
components: {
// PanelGroup,
StatisticGroup,
QuickAccessGroup,
// AllApplications,
// MiniCalendar,
},