From 2d107e5c57fccb1ae1bfcc8b59389fbd0e2c67a5 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 29 四月 2026 15:44:02 +0800
Subject: [PATCH] feat(staff): 添加在职员工导入功能
---
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java | 74 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
index ea8119f..561b076 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -1,12 +1,14 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
+import com.ruoyi.staff.dto.StaffOnJobImportDto;
+import com.ruoyi.staff.dto.StaffOnJobDto;
+import com.ruoyi.staff.pojo.StaffContract;
import com.ruoyi.staff.pojo.StaffOnJob;
-import com.ruoyi.staff.service.IStaffJoinLeaveRecordService;
import com.ruoyi.staff.service.IStaffOnJobService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -24,7 +26,7 @@
*/
@RestController
@RequestMapping("/staff/staffOnJob")
-@Api(tags = "鍛樺伐鍙拌处/鍚堝悓绠＄悊")
+@Api(tags = "鍛樺伐鍙拌处")
public class StaffOnJobController {
@Resource
@@ -47,22 +49,74 @@
* @return
*/
@GetMapping("/list")
- public AjaxResult staffOnJobList() {
- return AjaxResult.success(staffOnJobService.staffOnJobList());
+ public AjaxResult staffOnJobList(StaffOnJob staffOnJob) {
+ return AjaxResult.success(staffOnJobService.staffOnJobList(staffOnJob));
+ }
+
+ /**
+ * 鏂板鍏ヨ亴
+ * @param staffOnJob
+ * @return
+ */
+ @PostMapping("")
+ public AjaxResult add(@RequestBody StaffOnJobDto staffOnJob) {
+ return AjaxResult.success(staffOnJobService.add(staffOnJob));
+ }
+
+ /**
+ * 鏇存柊鍏ヨ亴淇℃伅
+ * @param staffOnJobDto
+ * @return
+ */
+ @PutMapping("/{id}")
+ public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
+ return AjaxResult.success(staffOnJobService.update(id, staffOnJobDto));
+ }
+
+ /**
+ * 鍒犻櫎鍏ヨ亴
+ * @param ids
+ * @return
+ */
+ @DeleteMapping("/del")
+ public AjaxResult delStaffOnJobs(@RequestBody List<Integer> ids) {
+ if(CollectionUtils.isEmpty(ids)){
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ return AjaxResult.success(staffOnJobService.delStaffOnJobs(ids));
}
/**
* 鍦ㄨ亴鍛樺伐璇︽儏
- * @param staffNo
+ * @param id
* @return
*/
- @GetMapping("/staffNo")
- public AjaxResult staffOnJobDetail(String staffNo) {
- return AjaxResult.success(staffOnJobService.staffOnJobDetail(staffNo));
+ @GetMapping("/{id}")
+ public AjaxResult staffOnJobDetail(@PathVariable("id") Long id) {
+ return AjaxResult.success(staffOnJobService.staffOnJobDetail(id));
}
+
+ /**
+ * 缁鍚堝悓
+ * @param id
+ * @param staffContract
+ * @return
+ */
+ @PostMapping("/renewContract/{id}")
+ public AjaxResult renewContract(@PathVariable("id") Long id, @RequestBody StaffContract staffContract) {
+ return AjaxResult.success(staffOnJobService.renewContract(id, staffContract));
+ }
+
/**
* 鍦ㄨ亴鍛樺伐瀵煎叆
*/
+ @PostMapping("/downloadTemplate")
+ @Log(title = "鍦ㄨ亴鍛樺伐瀵煎叆妯℃澘涓嬭浇", businessType = BusinessType.EXPORT)
+ public void downloadTemplate(HttpServletResponse response) {
+ ExcelUtil<StaffOnJobImportDto> util = new ExcelUtil<>(StaffOnJobImportDto.class);
+ util.importTemplateExcel(response, "鍦ㄨ亴鍛樺伐瀵煎叆妯℃澘");
+ }
+
@PostMapping("/import")
@Log(title = "鍦ㄨ亴鍛樺伐瀵煎叆", businessType = BusinessType.IMPORT)
public AjaxResult importData(@RequestPart("file") MultipartFile file) {
@@ -90,7 +144,7 @@
*/
@PostMapping("/exportCopy")
@ApiOperation("word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭")
- public AjaxResult exportCopy(HttpServletResponse response, StaffOnJob staffOnJob) throws Exception{
+ public AjaxResult exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
return AjaxResult.success(staffOnJobService.exportCopy(response, staffOnJob));
}
--
Gitblit v1.9.3