From e36e342b4a7bc01de70e47a7926a2e6372dd0970 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 20 八月 2025 13:19:00 +0800
Subject: [PATCH] yys 修改劳保管理模块
---
src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java b/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
index d188d91..abac6a7 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.device.dto.DeviceLedgerDto;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -11,8 +12,10 @@
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -26,13 +29,13 @@
@ApiModelProperty("璁惧鍙拌处鍒楄〃")
@GetMapping("/page")
- public AjaxResult page(Page page , DeviceLedger deviceLedger) {
+ public AjaxResult page(Page page , DeviceLedgerDto deviceLedger) {
return AjaxResult.success(deviceLedgerService.queryPage(page,deviceLedger));
}
@PostMapping()
@ApiModelProperty("娣诲姞璁惧鍙拌处")
- public AjaxResult add(DeviceLedger deviceLedger) {
+ public AjaxResult add(@RequestBody DeviceLedger deviceLedger) {
return deviceLedgerService.saveDeviceLedger(deviceLedger);
}
@@ -45,14 +48,13 @@
@PutMapping ()
@ApiModelProperty("淇敼璁惧鍙拌处")
- public AjaxResult update(DeviceLedger deviceLedger) {
-
+ public AjaxResult update(@RequestBody DeviceLedger deviceLedger) {
return deviceLedgerService.updateDeviceLedger(deviceLedger);
}
- @DeleteMapping("/{id}")
+ @DeleteMapping("/{ids}")
@ApiModelProperty("鍒犻櫎璁惧鍙拌处")
- public AjaxResult delete(@PathVariable ArrayList<Long> ids) {
+ public AjaxResult delete(@PathVariable("ids") ArrayList<Long> ids) {
boolean b = deviceLedgerService.removeBatchByIds(ids);
if (!b) {
return AjaxResult.error("鍒犻櫎澶辫触");
@@ -66,6 +68,17 @@
deviceLedgerService.export(response, ids);
}
+ @PostMapping("import")
+ @ApiModelProperty("瀵煎叆璁惧鍙拌处")
+ public AjaxResult importData(MultipartFile file) throws IOException {
+ Boolean b = deviceLedgerService.importData(file);
+ if (b) {
+ return AjaxResult.success("瀵煎叆鎴愬姛");
+ }
+ return AjaxResult.error("瀵煎叆澶辫触");
+ }
+
+
@GetMapping("getDeviceLedger")
@ApiModelProperty("鑾峰彇璁惧鍙拌处")
public AjaxResult getDeviceLedger( ) {
--
Gitblit v1.9.3