From 4497f5b1e322eba5ec519ebc1955317ed656aa8e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:31:15 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordCheckController.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordCheckController.java b/cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordCheckController.java
index 33db343..68a5f08 100644
--- a/cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordCheckController.java
+++ b/cnas-manage/src/main/java/com/yuanchu/mom/controller/ManageRecordCheckController.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.controller;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.CustomClazzName;
import com.yuanchu.mom.annotation.ValueAuth;
@@ -10,10 +11,7 @@
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -83,10 +81,16 @@
@ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎嚭鏂囦欢瀹℃壒璁板綍")
- @PostMapping("/exportOutManageRecordCheck")
- public Result exportOutManageRecordCheck(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
- ManageRecordCheck manageRecordCheck = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordCheck.class);
- return Result.success(manageRecordCheckService.exportOutManageRecordCheck(manageRecordCheck,response));
+ @GetMapping("/exportOutManageRecordCheck")
+ public void exportOutManageRecordCheck(String documentName,String documentCode, HttpServletResponse response) throws Exception {
+ ManageRecordCheck manageRecordCheck = new ManageRecordCheck();
+ if (ObjectUtils.isNotEmpty(documentName)) {
+ manageRecordCheck.setDocumentName(documentName);
+ }
+ if (ObjectUtils.isNotEmpty(documentCode)) {
+ manageRecordCheck.setDocumentCode(documentCode);
+ }
+ manageRecordCheckService.exportOutManageRecordCheck(manageRecordCheck,response);
}
@ValueClassify(value = "璁板綍鐨勬帶鍒�")
--
Gitblit v1.9.3