From 9d2111fb2449f3d2e357fe6f5dea6ceeaaed0deb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 29 四月 2026 10:35:26 +0800
Subject: [PATCH] fix(staff): 修改试用月份字段的数据类型
---
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
index 4230695..9f77d87 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -1,17 +1,17 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.StaffOnJobDto;
import com.ruoyi.staff.pojo.StaffOnJob;
-import com.ruoyi.staff.service.IStaffJoinLeaveRecordService;
import com.ruoyi.staff.service.IStaffOnJobService;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
-import java.util.List;
/**
* 鍛樺伐鍙拌处/鍚堝悓绠＄悊
@@ -53,6 +53,18 @@
public AjaxResult staffOnJobDetail(String staffNo) {
return AjaxResult.success(staffOnJobService.staffOnJobDetail(staffNo));
}
+ /**
+ * 鍦ㄨ亴鍛樺伐瀵煎叆
+ */
+ @PostMapping("/import")
+ @Log(title = "鍦ㄨ亴鍛樺伐瀵煎叆", businessType = BusinessType.IMPORT)
+ public AjaxResult importData(@RequestPart("file") MultipartFile file) {
+ Boolean b = staffOnJobService.importData(file);
+ if (b) {
+ return AjaxResult.success("瀵煎叆鎴愬姛");
+ }
+ return AjaxResult.error("瀵煎叆澶辫触");
+ }
/**
* 鍦ㄨ亴鍛樺伐瀵煎嚭
@@ -64,5 +76,25 @@
staffOnJobService.staffOnJobExport(response, staffOnJob);
}
+ /**
+ * 鍛樺伐杞
+ * @param staffOnJob
+ * @return
+ */
+ @PostMapping("/regularize")
+ public AjaxResult regularize(@RequestBody StaffOnJob staffOnJob) {
+ return AjaxResult.success(staffOnJobService.updateById(staffOnJob));
+ }
+
+ /**
+ * 鍛樺伐璋冨矖
+ * @param staffOnJobDto
+ * @return
+ */
+ @PostMapping("/transferPost")
+ public AjaxResult transferPost(@RequestBody StaffOnJobDto staffOnJobDto) {
+ return AjaxResult.success(staffOnJobService.transferPost(staffOnJobDto));
+ }
+
}
--
Gitblit v1.9.3