From 57a6735173d59feb6cfd95c9a8ec76d6f87bc578 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 22 四月 2024 12:46:28 +0800
Subject: [PATCH] PDF合并，BUG修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java
index 3e3ea5d..d1a0c52 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java
@@ -7,6 +7,7 @@
import com.ruoyi.project.domain.vo.DonateAnnexVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -34,6 +35,7 @@
* @author ruoyi
* @date 2021-11-11
*/
+@Slf4j
@Api("闄勪欢绠＄悊")
@RestController
@RequestMapping("/project/donateannex")
@@ -48,6 +50,7 @@
//@PreAuthorize("@ss.hasPermi('project:donateannex:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonateannex serviceDonateannex) {
+ log.info("闄勪欢绠＄悊鍒楄〃锛歿}", serviceDonateannex);
startPage();
List<ServiceDonateannex> list = serviceDonateannexService.queryList(serviceDonateannex);
return getDataTable(list);
@@ -55,6 +58,7 @@
@GetMapping("/listnew")
public TableDataInfo listnew(DonateAnnexVO donateAnnexVO) {
+ log.info("listnew鐨勫叆鍙傦細{}", donateAnnexVO);
startPage();
List<DonateAnnexVO> list = serviceDonateannexService.selectVOList(donateAnnexVO);
return getDataTable(list);
@@ -69,6 +73,7 @@
@Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonateannex serviceDonateannex) {
+ log.info("瀵煎嚭鎹愮尞闄勪欢鍒楄〃锛歿}", serviceDonateannex);
List<ServiceDonateannex> list = serviceDonateannexService.queryList(serviceDonateannex);
ExcelUtil<ServiceDonateannex> util = new ExcelUtil<ServiceDonateannex>(ServiceDonateannex.class);
return util.exportExcel(list, "鎹愮尞闄勪欢鏁版嵁");
@@ -81,6 +86,7 @@
//@PreAuthorize("@ss.hasPermi('project:donateannex:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("閫氳繃id鑾峰緱鎹愮尞闄勪欢淇℃伅锛歿}", id);
return AjaxResult.success(serviceDonateannexService.getById(id));
}
@@ -92,8 +98,9 @@
@Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody List<ServiceDonateannex> serviceDonateannexs) {
- return toAjax(serviceDonateannexService.saveData(serviceDonateannexs));
+ public TableDataInfo add(@RequestBody List<ServiceDonateannex> serviceDonateannexs) {
+ log.info("鏂板鎹愮尞闄勪欢淇℃伅锛歿}", serviceDonateannexs.size());
+ return getDataTable(serviceDonateannexService.saveData(serviceDonateannexs));
}
/**
@@ -105,6 +112,7 @@
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceDonateannex serviceDonateannex) {
+ log.info("淇敼鎹愮尞闄勪欢淇℃伅锛歿}", serviceDonateannex);
return toAjax(serviceDonateannexService.updateById(serviceDonateannex));
}
@@ -118,6 +126,7 @@
@PostMapping("/editannexfiles")
@RepeatSubmit
public AjaxResult editannexfiles(@RequestBody List<ServiceDonateannex> serviceDonateannexs) {
+ log.info("淇敼娼滃湪鎹愮尞銆佷鸡鐞嗗鏌ャ�佸畬鎴愮櫥璁般�佸尰瀛﹁瘎浼伴檮浠朵俊鎭細{}", serviceDonateannexs.size());
return toAjax(serviceDonateannexService.updateOrSave(serviceDonateannexs));
}
@@ -129,6 +138,7 @@
@Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎鎹愮尞鏂囦欢淇℃伅锛歿}", ids);
return toAjax(serviceDonateannexService.removeByIds(Arrays.asList(ids)));
}
--
Gitblit v1.9.3