From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
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