From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显
---
cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java
index 244e9fd..e2b8212 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java
@@ -20,7 +20,7 @@
* 澶栨潵浜哄憳鐧昏 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-19 07:17:35
*/
@Api(tags = "澶栨潵浜哄憳鐧昏")
@@ -33,14 +33,13 @@
/**
* 澶栨潵浜哄憳鐧昏鍒嗛〉鏌ヨ
- * @param data
+ * @param page
+ * @param foreignRegister
* @return
*/
@ApiOperation(value = "澶栨潵浜哄憳鐧昏鍒嗛〉鏌ヨ")
- @PostMapping("/pageForeignRegister")
- public Result<IPage<ForeignRegisterDto>> pageForeignRegister(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ForeignRegisterDto foreignRegister = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ForeignRegisterDto.class);
+ @GetMapping("/pageForeignRegister")
+ public Result<IPage<ForeignRegisterDto>> pageForeignRegister(Page page,ForeignRegisterDto foreignRegister) throws Exception {
return Result.success(foreignRegisterService.pageForeignRegister(page, foreignRegister));
}
@@ -69,7 +68,7 @@
* @return
*/
@ApiOperation(value = "澶栨潵浜哄憳鐧昏鍒犻櫎")
- @GetMapping("/delForeignRegister")
+ @DeleteMapping("/delForeignRegister")
public Result delForeignRegister(Integer registerId){
return Result.success(foreignRegisterService.removeById(registerId));
}
@@ -89,8 +88,8 @@
* @return
*/
@ApiOperation(value = "瀵煎嚭澶栨潵浜哄憳鐧昏")
- @PostMapping("/exportForeignRegister")
- public void exportForeignRegister(@RequestBody ForeignRegisterDto foreignRegister, HttpServletResponse response){
+ @GetMapping("/exportForeignRegister")
+ public void exportForeignRegister(ForeignRegisterDto foreignRegister, HttpServletResponse response){
foreignRegisterService.exportForeignRegister(foreignRegister, response);
}
--
Gitblit v1.9.3