feat(wms): 添加员工转正接口
- 在员工异动类型中新增转正选项(类型值为2) - 更新数据库实体和业务对象中的异动类型定义 - 实现员工转正业务逻辑,包括状态验证和数据更新 - 添加转正API接口和相应的控制器方法 - 更新相关注释和文档以反映新的转正功能 - 修改Excel导出功能以支持转正类型的显示
This commit is contained in:
@@ -23,7 +23,7 @@ import com.klp.service.IWmsEmployeeChangeService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 员工异动(入职/离职)
|
||||
* 员工异动(入职/离职/转正)
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-03-14
|
||||
@@ -37,7 +37,7 @@ public class WmsEmployeeChangeController extends BaseController {
|
||||
private final IWmsEmployeeChangeService iWmsEmployeeChangeService;
|
||||
|
||||
/**
|
||||
* 查询员工异动(入职/离职)列表
|
||||
* 查询员工异动(入职/离职/转正)列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsEmployeeChangeVo> list(WmsEmployeeChangeBo bo, PageQuery pageQuery) {
|
||||
@@ -45,17 +45,17 @@ public class WmsEmployeeChangeController extends BaseController {
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出员工异动(入职/离职)列表
|
||||
* 导出员工异动(入职/离职/转正)列表
|
||||
*/
|
||||
@Log(title = "员工异动(入职/离职)", businessType = BusinessType.EXPORT)
|
||||
@Log(title = "员工异动(入职/离职/转正)", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsEmployeeChangeBo bo, HttpServletResponse response) {
|
||||
List<WmsEmployeeChangeVo> list = iWmsEmployeeChangeService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "员工异动(入职/离职)", WmsEmployeeChangeVo.class, response);
|
||||
ExcelUtil.exportExcel(list, "员工异动(入职/离职/转正)", WmsEmployeeChangeVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取员工异动(入职/离职)详细信息
|
||||
* 获取员工异动(入职/离职/转正)详细信息
|
||||
*
|
||||
* @param changeId 主键
|
||||
*/
|
||||
@@ -66,9 +66,9 @@ public class WmsEmployeeChangeController extends BaseController {
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增员工异动(入职/离职)
|
||||
* 新增员工异动(入职/离职/转正)
|
||||
*/
|
||||
@Log(title = "员工异动(入职/离职)", businessType = BusinessType.INSERT)
|
||||
@Log(title = "员工异动(入职/离职/转正)", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsEmployeeChangeBo bo) {
|
||||
@@ -76,9 +76,9 @@ public class WmsEmployeeChangeController extends BaseController {
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改员工异动(入职/离职)
|
||||
* 修改员工异动(入职/离职/转正)
|
||||
*/
|
||||
@Log(title = "员工异动(入职/离职)", businessType = BusinessType.UPDATE)
|
||||
@Log(title = "员工异动(入职/离职/转正)", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsEmployeeChangeBo bo) {
|
||||
@@ -86,11 +86,11 @@ public class WmsEmployeeChangeController extends BaseController {
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除员工异动(入职/离职)
|
||||
* 删除员工异动(入职/离职/转正)
|
||||
*
|
||||
* @param changeIds 主键串
|
||||
*/
|
||||
@Log(title = "员工异动(入职/离职)", businessType = BusinessType.DELETE)
|
||||
@Log(title = "员工异动(入职/离职/转正)", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{changeIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] changeIds) {
|
||||
@@ -116,4 +116,14 @@ public class WmsEmployeeChangeController extends BaseController {
|
||||
public R<Void> leave(@Validated(AddGroup.class) @RequestBody WmsEmployeeChangeBo bo) {
|
||||
return toAjax(iWmsEmployeeChangeService.employeeLeave(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 员工转正
|
||||
*/
|
||||
@Log(title = "员工转正", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/regular")
|
||||
public R<Void> regular(@Validated(AddGroup.class) @RequestBody WmsEmployeeChangeBo bo) {
|
||||
return toAjax(iWmsEmployeeChangeService.employeeRegular(bo));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user