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

办公V3

Browse Source
This commit is contained in:
86156
2025-12-30 13:47:53 +08:00
parent f1637501b2
commit a623c5673f
137 changed files with 11031 additions and 4043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
klp-hrm/src/main/java/com/klp/hrm/controller/HrmCertificateController.java
View File

@@ -27,40 +27,35 @@ public class HrmCertificateController extends BaseController {
private final IHrmCertificateService service;
@SaCheckPermission("hrm:certificate:list")
@GetMapping("/list")
public TableDataInfo<HrmCertificateVo> list(HrmCertificateBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:certificate:query")
@GetMapping("/{certId}")
public R<HrmCertificateVo> getInfo(@PathVariable @NotNull Long certId) {
return R.ok(service.queryById(certId));
}
@SaCheckPermission("hrm:certificate:add")
@Log(title = "证书", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmCertificateBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:certificate:edit")
@Log(title = "证书", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmCertificateBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:certificate:remove")
@Log(title = "证书", businessType = BusinessType.DELETE)
@DeleteMapping("/{certIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] certIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(certIds), true));
}
@SaCheckPermission("hrm:certificate:list")
@GetMapping("/all")
public R<List<HrmCertificateVo>> all(HrmCertificateBo bo) {
return R.ok(service.queryList(bo));

6
klp-hrm/src/main/java/com/klp/hrm/controller/HrmContractController.java
View File

@@ -27,40 +27,34 @@ public class HrmContractController extends BaseController {
private final IHrmContractService service;
@SaCheckPermission("hrm:contract:list")
@GetMapping("/list")
public TableDataInfo<HrmContractVo> list(HrmContractBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:contract:query")
@GetMapping("/{contractId}")
public R<HrmContractVo> getInfo(@PathVariable @NotNull Long contractId) {
return R.ok(service.queryById(contractId));
}
@SaCheckPermission("hrm:contract:add")
@Log(title = "劳动合同", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmContractBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:contract:edit")
@Log(title = "劳动合同", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmContractBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:contract:remove")
@Log(title = "劳动合同", businessType = BusinessType.DELETE)
@DeleteMapping("/{contractIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] contractIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(contractIds), true));
}
@SaCheckPermission("hrm:contract:list")
@GetMapping("/all")
public R<List<HrmContractVo>> all(HrmContractBo bo) {
return R.ok(service.queryList(bo));

6
klp-hrm/src/main/java/com/klp/hrm/controller/HrmEmpOrgPositionController.java
View File

@@ -27,40 +27,34 @@ public class HrmEmpOrgPositionController extends BaseController {
private final IHrmEmpOrgPositionService service;
@SaCheckPermission("hrm:emporg:list")
@GetMapping("/list")
public TableDataInfo<HrmEmpOrgPositionVo> list(HrmEmpOrgPositionBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:emporg:query")
@GetMapping("/{relId}")
public R<HrmEmpOrgPositionVo> getInfo(@PathVariable @NotNull Long relId) {
return R.ok(service.queryById(relId));
}
@SaCheckPermission("hrm:emporg:add")
@Log(title = "员工组织岗位关系", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmEmpOrgPositionBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:emporg:edit")
@Log(title = "员工组织岗位关系", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmEmpOrgPositionBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:emporg:remove")
@Log(title = "员工组织岗位关系", businessType = BusinessType.DELETE)
@DeleteMapping("/{relIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] relIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(relIds), true));
}
@SaCheckPermission("hrm:emporg:list")
@GetMapping("/all")
public R<List<HrmEmpOrgPositionVo>> all(HrmEmpOrgPositionBo bo) {
return R.ok(service.queryList(bo));

20
klp-hrm/src/main/java/com/klp/hrm/controller/HrmEmployeeController.java
View File

@@ -27,42 +27,50 @@ public class HrmEmployeeController extends BaseController {
private final IHrmEmployeeService service;
@SaCheckPermission("hrm:employee:list")
@GetMapping("/list")
public TableDataInfo<HrmEmployeeVo> list(HrmEmployeeBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:employee:query")
@GetMapping("/{empId}")
public R<HrmEmployeeVo> getInfo(@PathVariable @NotNull Long empId) {
return R.ok(service.queryById(empId));
}
@SaCheckPermission("hrm:employee:add")
@Log(title = "员工管理", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmEmployeeBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:employee:edit")
@Log(title = "员工管理", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmEmployeeBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:employee:remove")
@Log(title = "员工管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{empIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] empIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(empIds), true));
}
@SaCheckPermission("hrm:employee:list")
@GetMapping("/all")
public R<List<HrmEmployeeVo>> all(HrmEmployeeBo bo) {
return R.ok(service.queryList(bo));
}
/**
* 根据用户ID获取员工信息
*/
@GetMapping("/byUserId/{userId}")
public R<HrmEmployeeVo> getByUserId(@PathVariable @NotNull Long userId) {
HrmEmployeeBo bo = new HrmEmployeeBo();
bo.setUserId(userId);
List<HrmEmployeeVo> list = service.queryList(bo);
if (list != null && !list.isEmpty()) {
return R.ok(list.get(0));
}
return R.fail("未找到该用户对应的员工信息");
}
}

2
klp-hrm/src/main/java/com/klp/hrm/controller/HrmFlowActionController.java
View File

@@ -25,13 +25,11 @@ public class HrmFlowActionController extends BaseController {
private final IHrmFlowActionService service;
@SaCheckPermission("hrm:flow:list")
@GetMapping("/list")
public TableDataInfo<HrmFlowActionVo> list(HrmFlowActionBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:flow:query")
@GetMapping("/{actionId}")
public R<HrmFlowActionVo> getInfo(@PathVariable @NotNull Long actionId) {
return R.ok(service.queryById(actionId));

70
klp-hrm/src/main/java/com/klp/hrm/controller/HrmFlowCcController.java Normal file
View File

@@ -0,0 +1,70 @@
package com.klp.hrm.controller;
import cn.dev33.satoken.stp.StpUtil;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.page.TableDataInfo;
import com.klp.hrm.domain.bo.HrmFlowCcBo;
import com.klp.hrm.domain.vo.HrmFlowCcVo;
import com.klp.hrm.service.IHrmFlowCcService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/hrm/flow/cc")
public class HrmFlowCcController extends BaseController {
private final IHrmFlowCcService service;
/**
* 抄送我的
*/
@GetMapping("/my")
public TableDataInfo<HrmFlowCcVo> my(@RequestParam(required = false) Long ccUserId, PageQuery pageQuery) {
Long uid = ccUserId;
if (uid == null) {
try {
uid = StpUtil.getLoginIdAsLong();
} catch (Exception e) {
uid = null;
}
}
HrmFlowCcBo bo = new HrmFlowCcBo();
bo.setCcUserId(uid);
return service.queryPageList(bo, pageQuery);
}
@GetMapping("/list")
public TableDataInfo<HrmFlowCcVo> list(HrmFlowCcBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
/**
* 手动抄送（支持批量）
*/
@PostMapping
public R<Void> add(@RequestBody HrmFlowCcBo bo) {
return toAjax(service.insertBatch(bo));
}
/**
* 标记抄送已读
*/
@PostMapping("/{ccId}/read")
public R<Void> read(@PathVariable Long ccId) {
Long uid = StpUtil.getLoginIdAsLong();
return toAjax(service.markRead(ccId, uid));
}
@GetMapping("/ping")
public R<String> ping(@RequestParam @NotNull String x) {
return R.ok(x);
}
}

2
klp-hrm/src/main/java/com/klp/hrm/controller/HrmFlowFormDataController.java
View File

@@ -25,13 +25,11 @@ public class HrmFlowFormDataController extends BaseController {
private final IHrmFormDataService service;
@SaCheckPermission("hrm:flow:list")
@GetMapping("/list")
public TableDataInfo<HrmFormDataVo> list(HrmFormDataBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:flow:query")
@GetMapping("/{formId}")
public R<HrmFormDataVo> getInfo(@PathVariable @NotNull Long formId) {
return R.ok(service.queryById(formId));

15
klp-hrm/src/main/java/com/klp/hrm/controller/HrmFlowInstanceController.java
View File

@@ -28,47 +28,48 @@ public class HrmFlowInstanceController extends BaseController {
private final IHrmFlowInstanceService service;
@SaCheckPermission("hrm:flow:list")
@GetMapping("/list")
public TableDataInfo<HrmFlowInstanceVo> list(HrmFlowInstanceBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:flow:query")
/**
* 查询我的申请列表
*/
@GetMapping("/myList")
public TableDataInfo<HrmFlowInstanceVo> myList(HrmFlowInstanceBo bo, PageQuery pageQuery) {
return service.queryMyInstancePageList(bo, pageQuery);
}
@GetMapping("/{instId}")
public R<HrmFlowInstanceVo> getInfo(@PathVariable @NotNull Long instId) {
return R.ok(service.queryById(instId));
}
@SaCheckPermission("hrm:flow:add")
@Log(title = "流程实例", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmFlowInstanceBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:flow:edit")
@Log(title = "流程实例", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmFlowInstanceBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:flow:remove")
@Log(title = "流程实例", businessType = BusinessType.DELETE)
@DeleteMapping("/{instIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] instIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(instIds), true));
}
@SaCheckPermission("hrm:flow:add")
@Log(title = "流程实例启动", businessType = BusinessType.INSERT)
@PostMapping("/start")
public R<Long> start(@Validated @RequestBody HrmFlowStartBo bo) {
return R.ok(service.startInstance(bo));
}
@SaCheckPermission("hrm:flow:list")
@GetMapping("/all")
public R<List<HrmFlowInstanceVo>> all(HrmFlowInstanceBo bo) {
return R.ok(service.queryList(bo));

6
klp-hrm/src/main/java/com/klp/hrm/controller/HrmFlowNodeController.java
View File

@@ -27,40 +27,34 @@ public class HrmFlowNodeController extends BaseController {
private final IHrmFlowNodeService service;
@SaCheckPermission("hrm:flow:list")
@GetMapping("/list")
public TableDataInfo<HrmFlowNodeVo> list(HrmFlowNodeBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:flow:query")
@GetMapping("/{nodeId}")
public R<HrmFlowNodeVo> getInfo(@PathVariable @NotNull Long nodeId) {
return R.ok(service.queryById(nodeId));
}
@SaCheckPermission("hrm:flow:add")
@Log(title = "流程节点", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmFlowNodeBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:flow:edit")
@Log(title = "流程节点", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmFlowNodeBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:flow:remove")
@Log(title = "流程节点", businessType = BusinessType.DELETE)
@DeleteMapping("/{nodeIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] nodeIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(nodeIds), true));
}
@SaCheckPermission("hrm:flow:list")
@GetMapping("/all")
public R<List<HrmFlowNodeVo>> all(HrmFlowNodeBo bo) {
return R.ok(service.queryList(bo));

42
klp-hrm/src/main/java/com/klp/hrm/controller/HrmFlowTaskController.java
View File

@@ -1,7 +1,5 @@
package com.klp.hrm.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.stp.StpUtil;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
@@ -9,6 +7,7 @@ import com.klp.common.core.domain.R;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.enums.BusinessType;
import com.klp.hrm.domain.bo.HrmFlowTaskBo;
import com.klp.hrm.domain.bo.HrmFlowTaskApproveBo;
import com.klp.hrm.domain.bo.HrmSealStampBo;
import com.klp.hrm.domain.vo.HrmFlowTaskVo;
import com.klp.hrm.service.IHrmFlowTaskService;
@@ -29,59 +28,66 @@ public class HrmFlowTaskController extends BaseController {
private final IHrmFlowTaskService service;
@SaCheckPermission("hrm:flow:list")
@GetMapping("/list")
public TableDataInfo<HrmFlowTaskVo> list(HrmFlowTaskBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:flow:list")
@GetMapping("/todo")
public R<List<HrmFlowTaskVo>> todo(@RequestParam(required = false) Long assigneeUserId) {
HrmFlowTaskBo bo = new HrmFlowTaskBo();
bo.setAssigneeUserId(assigneeUserId != null ? assigneeUserId : StpUtil.getLoginIdAsLong());
bo.setAssigneeUserId(assigneeUserId);
bo.setStatus("pending");
return R.ok(service.queryList(bo));
}
/**
* 详情页使用：按 bizType + bizId 查询当前用户的待办任务（pending）
*/
@GetMapping("/todoByBiz")
public R<HrmFlowTaskVo> todoByBiz(@RequestParam @NotNull String bizType,
@RequestParam @NotNull Long bizId,
@RequestParam(required = false) Long assigneeUserId) {
return R.ok(service.queryTodoByBiz(bizType, bizId, assigneeUserId));
}
@SaCheckPermission("hrm:flow:query")
@GetMapping("/{taskId}")
public R<HrmFlowTaskVo> getInfo(@PathVariable @NotNull Long taskId) {
return R.ok(service.queryById(taskId));
}
@SaCheckPermission("hrm:flow:add")
@Log(title = "流程任务", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmFlowTaskBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:flow:edit")
@Log(title = "流程任务", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmFlowTaskBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:flow:remove")
@Log(title = "流程任务", businessType = BusinessType.DELETE)
@DeleteMapping("/{taskIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] taskIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(taskIds), true));
}
@SaCheckPermission("hrm:flow:edit")
@Log(title = "流程任务审批通过", businessType = BusinessType.UPDATE)
@PostMapping("/{taskId}/approve")
public R<Void> approve(@PathVariable @NotNull Long taskId,
@RequestParam(required = false) Long actionUserId,
@RequestParam(required = false) String remark,
@RequestBody(required = false) HrmSealStampBo stampBo) {
@RequestBody(required = false) HrmFlowTaskApproveBo approveBo) {
String remark = approveBo != null ? approveBo.getRemark() : null;
HrmSealStampBo stampBo = approveBo != null ? approveBo.getStampBo() : null;
return toAjax(service.approve(taskId, actionUserId, remark, stampBo));
}
@SaCheckPermission("hrm:flow:edit")
@Log(title = "流程任务审批驳回", businessType = BusinessType.UPDATE)
@PostMapping("/{taskId}/reject")
public R<Void> reject(@PathVariable @NotNull Long taskId,
@@ -90,7 +96,6 @@ public class HrmFlowTaskController extends BaseController {
return toAjax(service.reject(taskId, actionUserId, remark));
}
@SaCheckPermission("hrm:flow:edit")
@Log(title = "流程任务撤回", businessType = BusinessType.UPDATE)
@PostMapping("/{taskId}/withdraw")
public R<Void> withdraw(@PathVariable @NotNull Long taskId,
@@ -98,4 +103,13 @@ public class HrmFlowTaskController extends BaseController {
@RequestParam(required = false) String remark) {
return toAjax(service.withdraw(taskId, actionUserId, remark));
}
@Log(title = "流程任务转发", businessType = BusinessType.UPDATE)
@PostMapping("/{taskId}/transfer")
public R<Void> transfer(@PathVariable @NotNull Long taskId,
@RequestParam @NotNull Long newAssigneeUserId,
@RequestParam(required = false) Long actionUserId,
@RequestParam(required = false) String remark) {
return toAjax(service.transfer(taskId, newAssigneeUserId, actionUserId, remark));
}
}

6
klp-hrm/src/main/java/com/klp/hrm/controller/HrmFlowTemplateController.java
View File

@@ -27,40 +27,34 @@ public class HrmFlowTemplateController extends BaseController {
private final IHrmFlowTemplateService service;
@SaCheckPermission("hrm:flow:list")
@GetMapping("/list")
public TableDataInfo<HrmFlowTemplateVo> list(HrmFlowTemplateBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:flow:query")
@GetMapping("/{tplId}")
public R<HrmFlowTemplateVo> getInfo(@PathVariable @NotNull Long tplId) {
return R.ok(service.queryById(tplId));
}
@SaCheckPermission("hrm:flow:add")
@Log(title = "流程模板", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmFlowTemplateBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:flow:edit")
@Log(title = "流程模板", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmFlowTemplateBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:flow:remove")
@Log(title = "流程模板", businessType = BusinessType.DELETE)
@DeleteMapping("/{tplIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] tplIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(tplIds), true));
}
@SaCheckPermission("hrm:flow:list")
@GetMapping("/all")
public R<List<HrmFlowTemplateVo>> all(HrmFlowTemplateBo bo) {
return R.ok(service.queryList(bo));

68
klp-hrm/src/main/java/com/klp/hrm/controller/HrmGradeController.java
View File

@@ -1,68 +0,0 @@
package com.klp.hrm.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.enums.BusinessType;
import com.klp.hrm.domain.bo.HrmGradeBo;
import com.klp.hrm.domain.vo.HrmGradeVo;
import com.klp.hrm.service.IHrmGradeService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.List;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/hrm/grade")
public class HrmGradeController extends BaseController {
private final IHrmGradeService service;
@SaCheckPermission("hrm:grade:list")
@GetMapping("/list")
public TableDataInfo<HrmGradeVo> list(HrmGradeBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:grade:query")
@GetMapping("/{gradeId}")
public R<HrmGradeVo> getInfo(@PathVariable @NotNull Long gradeId) {
return R.ok(service.queryById(gradeId));
}
@SaCheckPermission("hrm:grade:add")
@Log(title = "职级管理", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmGradeBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:grade:edit")
@Log(title = "职级管理", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmGradeBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:grade:remove")
@Log(title = "职级管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{gradeIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] gradeIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(gradeIds), true));
}
@SaCheckPermission("hrm:grade:list")
@GetMapping("/all")
public R<List<HrmGradeVo>> all(HrmGradeBo bo) {
return R.ok(service.queryList(bo));
}
}

6
klp-hrm/src/main/java/com/klp/hrm/controller/HrmHeadcountPlanController.java
View File

@@ -27,40 +27,34 @@ public class HrmHeadcountPlanController extends BaseController {
private final IHrmHeadcountPlanService service;
@SaCheckPermission("hrm:headcount:list")
@GetMapping("/list")
public TableDataInfo<HrmHeadcountPlanVo> list(HrmHeadcountPlanBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:headcount:query")
@GetMapping("/{planId}")
public R<HrmHeadcountPlanVo> getInfo(@PathVariable @NotNull Long planId) {
return R.ok(service.queryById(planId));
}
@SaCheckPermission("hrm:headcount:add")
@Log(title = "编制管理", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmHeadcountPlanBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:headcount:edit")
@Log(title = "编制管理", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmHeadcountPlanBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:headcount:remove")
@Log(title = "编制管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{planIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] planIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(planIds), true));
}
@SaCheckPermission("hrm:headcount:list")
@GetMapping("/all")
public R<List<HrmHeadcountPlanVo>> all(HrmHeadcountPlanBo bo) {
return R.ok(service.queryList(bo));

6
klp-hrm/src/main/java/com/klp/hrm/controller/HrmLeaveBalanceController.java
View File

@@ -27,40 +27,34 @@ public class HrmLeaveBalanceController extends BaseController {
private final IHrmLeaveBalanceService service;
@SaCheckPermission("hrm:leavebal:list")
@GetMapping("/list")
public TableDataInfo<HrmLeaveBalanceVo> list(HrmLeaveBalanceBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:leavebal:query")
@GetMapping("/{balId}")
public R<HrmLeaveBalanceVo> getInfo(@PathVariable @NotNull Long balId) {
return R.ok(service.queryById(balId));
}
@SaCheckPermission("hrm:leavebal:add")
@Log(title = "假期余额", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmLeaveBalanceBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:leavebal:edit")
@Log(title = "假期余额", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmLeaveBalanceBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:leavebal:remove")
@Log(title = "假期余额", businessType = BusinessType.DELETE)
@DeleteMapping("/{balIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] balIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(balIds), true));
}
@SaCheckPermission("hrm:leavebal:list")
@GetMapping("/all")
public R<List<HrmLeaveBalanceVo>> all(HrmLeaveBalanceBo bo) {
return R.ok(service.queryList(bo));

6
klp-hrm/src/main/java/com/klp/hrm/controller/HrmLeaveReqController.java
View File

@@ -27,40 +27,34 @@ public class HrmLeaveReqController extends BaseController {
private final IHrmLeaveReqService service;
@SaCheckPermission("hrm:leave:req:list")
@GetMapping("/list")
public TableDataInfo<HrmLeaveReqVo> list(HrmLeaveReqBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:leave:req:query")
@GetMapping("/{bizId}")
public R<HrmLeaveReqVo> getInfo(@PathVariable @NotNull Long bizId) {
return R.ok(service.queryById(bizId));
}
@SaCheckPermission("hrm:leave:req:add")
@Log(title = "请假单", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmLeaveReqBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:leave:req:edit")
@Log(title = "请假单", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmLeaveReqBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:leave:req:remove")
@Log(title = "请假单", businessType = BusinessType.DELETE)
@DeleteMapping("/{bizIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] bizIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(bizIds), true));
}
@SaCheckPermission("hrm:leave:req:list")
@GetMapping("/all")
public R<List<HrmLeaveReqVo>> all(HrmLeaveReqBo bo) {
return R.ok(service.queryList(bo));

68
klp-hrm/src/main/java/com/klp/hrm/controller/HrmOrgController.java
View File

@@ -1,68 +0,0 @@
package com.klp.hrm.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.enums.BusinessType;
import com.klp.hrm.domain.bo.HrmOrgBo;
import com.klp.hrm.domain.vo.HrmOrgVo;
import com.klp.hrm.service.IHrmOrgService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.List;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/hrm/org")
public class HrmOrgController extends BaseController {
private final IHrmOrgService service;
@SaCheckPermission("hrm:org:list")
@GetMapping("/list")
public TableDataInfo<HrmOrgVo> list(HrmOrgBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:org:query")
@GetMapping("/{orgId}")
public R<HrmOrgVo> getInfo(@PathVariable @NotNull Long orgId) {
return R.ok(service.queryById(orgId));
}
@SaCheckPermission("hrm:org:add")
@Log(title = "组织管理", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmOrgBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:org:edit")
@Log(title = "组织管理", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmOrgBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:org:remove")
@Log(title = "组织管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{orgIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] orgIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(orgIds), true));
}
@SaCheckPermission("hrm:org:list")
@GetMapping("/all")
public R<List<HrmOrgVo>> all(HrmOrgBo bo) {
return R.ok(service.queryList(bo));
}
}

68
klp-hrm/src/main/java/com/klp/hrm/controller/HrmPositionController.java
View File

@@ -1,68 +0,0 @@
package com.klp.hrm.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.enums.BusinessType;
import com.klp.hrm.domain.bo.HrmPositionBo;
import com.klp.hrm.domain.vo.HrmPositionVo;
import com.klp.hrm.service.IHrmPositionService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.List;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/hrm/position")
public class HrmPositionController extends BaseController {
private final IHrmPositionService service;
@SaCheckPermission("hrm:position:list")
@GetMapping("/list")
public TableDataInfo<HrmPositionVo> list(HrmPositionBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:position:query")
@GetMapping("/{positionId}")
public R<HrmPositionVo> getInfo(@PathVariable @NotNull Long positionId) {
return R.ok(service.queryById(positionId));
}
@SaCheckPermission("hrm:position:add")
@Log(title = "岗位管理", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmPositionBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:position:edit")
@Log(title = "岗位管理", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmPositionBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:position:remove")
@Log(title = "岗位管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{positionIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] positionIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(positionIds), true));
}
@SaCheckPermission("hrm:position:list")
@GetMapping("/all")
public R<List<HrmPositionVo>> all(HrmPositionBo bo) {
return R.ok(service.queryList(bo));
}
}

6
klp-hrm/src/main/java/com/klp/hrm/controller/HrmPunchController.java
View File

@@ -27,40 +27,34 @@ public class HrmPunchController extends BaseController {
private final IHrmPunchService service;
@SaCheckPermission("hrm:punch:list")
@GetMapping("/list")
public TableDataInfo<HrmPunchVo> list(HrmPunchBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:punch:query")
@GetMapping("/{punchId}")
public R<HrmPunchVo> getInfo(@PathVariable @NotNull Long punchId) {
return R.ok(service.queryById(punchId));
}
@SaCheckPermission("hrm:punch:add")
@Log(title = "打卡记录", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmPunchBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:punch:edit")
@Log(title = "打卡记录", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmPunchBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:punch:remove")
@Log(title = "打卡记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{punchIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] punchIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(punchIds), true));
}
@SaCheckPermission("hrm:punch:list")
@GetMapping("/all")
public R<List<HrmPunchVo>> all(HrmPunchBo bo) {
return R.ok(service.queryList(bo));

31
klp-hrm/src/main/java/com/klp/hrm/controller/HrmOvertimeReqController.java → klp-hrm/src/main/java/com/klp/hrm/controller/HrmReimburseReqController.java
View File

@@ -6,9 +6,9 @@ import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.enums.BusinessType;
import com.klp.hrm.domain.bo.HrmOvertimeReqBo;
import com.klp.hrm.domain.vo.HrmOvertimeReqVo;
import com.klp.hrm.service.IHrmOvertimeReqService;
import com.klp.hrm.domain.bo.HrmReimburseReqBo;
import com.klp.hrm.domain.vo.HrmReimburseReqVo;
import com.klp.hrm.service.IHrmReimburseReqService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -19,46 +19,47 @@ import java.util.Arrays;
import java.util.List;
/**
* 加班单（按用户要求：不做鉴权）
* 日常报销申请
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/hrm/overtime")
public class HrmOvertimeReqController extends BaseController {
@RequestMapping("/hrm/reimburse")
public class HrmReimburseReqController extends BaseController {
private final IHrmOvertimeReqService service;
private final IHrmReimburseReqService service;
@GetMapping("/list")
public TableDataInfo<HrmOvertimeReqVo> list(HrmOvertimeReqBo bo, PageQuery pageQuery) {
public TableDataInfo<HrmReimburseReqVo> list(HrmReimburseReqBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@GetMapping("/{bizId}")
public R<HrmOvertimeReqVo> getInfo(@PathVariable @NotNull Long bizId) {
public R<HrmReimburseReqVo> getInfo(@PathVariable @NotNull Long bizId) {
return R.ok(service.queryById(bizId));
}
@Log(title = "加班单", businessType = BusinessType.INSERT)
@Log(title = "日常报销单", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmOvertimeReqBo bo) {
public R<Void> add(@Validated @RequestBody HrmReimburseReqBo bo) {
return toAjax(service.insertByBo(bo));
}
@Log(title = "加班单", businessType = BusinessType.UPDATE)
@Log(title = "日常报销单", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmOvertimeReqBo bo) {
public R<Void> edit(@Validated @RequestBody HrmReimburseReqBo bo) {
return toAjax(service.updateByBo(bo));
}
@Log(title = "加班单", businessType = BusinessType.DELETE)
@Log(title = "日常报销单", businessType = BusinessType.DELETE)
@DeleteMapping("/{bizIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] bizIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(bizIds), true));
}
@GetMapping("/all")
public R<List<HrmOvertimeReqVo>> all(HrmOvertimeReqBo bo) {
public R<List<HrmReimburseReqVo>> all(HrmReimburseReqBo bo) {
return R.ok(service.queryList(bo));
}
}

6
klp-hrm/src/main/java/com/klp/hrm/controller/HrmScheduleController.java
View File

@@ -27,40 +27,34 @@ public class HrmScheduleController extends BaseController {
private final IHrmScheduleService service;
@SaCheckPermission("hrm:schedule:list")
@GetMapping("/list")
public TableDataInfo<HrmScheduleVo> list(HrmScheduleBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:schedule:query")
@GetMapping("/{schedId}")
public R<HrmScheduleVo> getInfo(@PathVariable @NotNull Long schedId) {
return R.ok(service.queryById(schedId));
}
@SaCheckPermission("hrm:schedule:add")
@Log(title = "排班", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmScheduleBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:schedule:edit")
@Log(title = "排班", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmScheduleBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:schedule:remove")
@Log(title = "排班", businessType = BusinessType.DELETE)
@DeleteMapping("/{schedIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] schedIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(schedIds), true));
}
@SaCheckPermission("hrm:schedule:list")
@GetMapping("/all")
public R<List<HrmScheduleVo>> all(HrmScheduleBo bo) {
return R.ok(service.queryList(bo));

19
klp-hrm/src/main/java/com/klp/hrm/controller/HrmSealReqController.java
View File

@@ -12,6 +12,7 @@ import com.klp.hrm.domain.bo.HrmSealStampBo;
import com.klp.hrm.domain.vo.HrmSealReqVo;
import com.klp.hrm.service.IHrmSealReqService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -21,6 +22,7 @@ import javax.validation.constraints.NotNull;
/**
* 用印申请
*/
@Slf4j
@Validated
@RequiredArgsConstructor
@RestController
@@ -29,68 +31,65 @@ public class HrmSealReqController extends BaseController {
private final IHrmSealReqService service;
@SaCheckPermission("hrm:seal:list")
@GetMapping("/list")
public TableDataInfo<HrmSealReqVo> list(HrmSealReqBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:seal:query")
@GetMapping("/{bizId}")
public R<HrmSealReqVo> getInfo(@PathVariable @NotNull Long bizId) {
return R.ok(service.queryById(bizId));
}
@SaCheckPermission("hrm:seal:add")
@Log(title = "用印申请", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmSealReqBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:seal:edit")
@Log(title = "用印申请", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmSealReqBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:seal:remove")
@Log(title = "用印申请", businessType = BusinessType.DELETE)
@DeleteMapping("/{bizIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] bizIds) {
return toAjax(service.deleteWithValidByIds(java.util.Arrays.asList(bizIds), true));
}
@SaCheckPermission("hrm:seal:approve")
@Log(title = "用印申请", businessType = BusinessType.UPDATE)
@PostMapping("/{bizId}/approve")
public R<Void> approve(@PathVariable @NotNull Long bizId) {
return toAjax(service.updateStatus(bizId, "approved"));
}
@SaCheckPermission("hrm:seal:reject")
@Log(title = "用印申请", businessType = BusinessType.UPDATE)
@PostMapping("/{bizId}/reject")
public R<Void> reject(@PathVariable @NotNull Long bizId) {
return toAjax(service.updateStatus(bizId, "rejected"));
}
@SaCheckPermission("hrm:seal:cancel")
@Log(title = "用印申请", businessType = BusinessType.UPDATE)
@PostMapping("/{bizId}/cancel")
public R<Void> cancel(@PathVariable @NotNull Long bizId) {
return toAjax(service.updateStatus(bizId, "canceled"));
}
@SaCheckPermission("hrm:seal:stamp")
@Log(title = "用印盖章(Java)", businessType = BusinessType.UPDATE)
@PostMapping("/{bizId}/stamp/java")
public R<String> stampJava(@PathVariable @NotNull Long bizId, @Validated @RequestBody HrmSealStampBo bo) {
// 添加日志，检查接收到的数据
log.info("收到盖章请求 - bizId: {}, yPx: {}, xPx: {}, pageNo: {}, yPx类型: {}",
bizId, bo.getYPx(), bo.getXPx(), bo.getPageNo(),
bo.getYPx() != null ? bo.getYPx().getClass().getName() : "null");
if (bo.getYPx() == null) {
log.error("yPx 为 null！接收到的 bo 对象: {}", bo);
}
return R.ok(service.stampWithJava(bizId, bo));
}
@SaCheckPermission("hrm:seal:stamp")
@Log(title = "用印盖章(Python)", businessType = BusinessType.UPDATE)
@PostMapping("/{bizId}/stamp/python")
public R<String> stampPython(@PathVariable @NotNull Long bizId, @Validated @RequestBody HrmSealStampBo bo) {

6
klp-hrm/src/main/java/com/klp/hrm/controller/HrmShiftController.java
View File

@@ -27,40 +27,34 @@ public class HrmShiftController extends BaseController {
private final IHrmShiftService service;
@SaCheckPermission("hrm:shift:list")
@GetMapping("/list")
public TableDataInfo<HrmShiftVo> list(HrmShiftBo bo, PageQuery pageQuery) {
return service.queryPageList(bo, pageQuery);
}
@SaCheckPermission("hrm:shift:query")
@GetMapping("/{shiftId}")
public R<HrmShiftVo> getInfo(@PathVariable @NotNull Long shiftId) {
return R.ok(service.queryById(shiftId));
}
@SaCheckPermission("hrm:shift:add")
@Log(title = "班次", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody HrmShiftBo bo) {
return toAjax(service.insertByBo(bo));
}
@SaCheckPermission("hrm:shift:edit")
@Log(title = "班次", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody HrmShiftBo bo) {
return toAjax(service.updateByBo(bo));
}
@SaCheckPermission("hrm:shift:remove")
@Log(title = "班次", businessType = BusinessType.DELETE)
@DeleteMapping("/{shiftIds}")
public R<Void> remove(@PathVariable @NotEmpty Long[] shiftIds) {
return toAjax(service.deleteWithValidByIds(Arrays.asList(shiftIds), true));
}
@SaCheckPermission("hrm:shift:list")
@GetMapping("/all")
public R<List<HrmShiftVo>> all(HrmShiftBo bo) {
return R.ok(service.queryList(bo));