From 9ff5a9b1a3ce92b7bf4fcd3a8fdabbb1739cfe4b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 05 二月 2026 17:39:07 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java | 90 +++++++++++++++++----------------------------
1 files changed, 34 insertions(+), 56 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
index e862b61..0159101 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
@@ -4,20 +4,18 @@
import java.text.SimpleDateFormat;
import java.util.*;
-import com.ruoyi.common.annotation.NotRepeatCommit;
+import com.ruoyi.common.annotation.UniqueCheck;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.enums.OrganEnum;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.bean.DtoConversionUtils;
-import com.ruoyi.project.domain.ServiceDonatebaseinfo;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.project.domain.vo.ServiceDonationwitnessVO;
+import com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO;
import com.ruoyi.project.domain.ServiceDonateorgan;
-import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
+import com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
-import com.ruoyi.project.service.IBaseOnlyvalueService;
-import com.ruoyi.project.service.IServiceDonatebaseinfoService;
-import com.ruoyi.project.service.IServiceDonateorganService;
+import com.ruoyi.project.service.*;
import com.ruoyi.web.controller.common.OnlyValueCommon;
import freemarker.template.Configuration;
import freemarker.template.Template;
@@ -39,9 +37,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.project.domain.ServiceDonationwitness;
-import com.ruoyi.project.service.IServiceDonationwitnessService;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
/**
* 鎹愮尞瑙佽瘉Controller
@@ -77,24 +73,20 @@
configuration.setDefaultEncoding("utf-8");
}
- /**
- * 鏌ヨ鎹愮尞瑙佽瘉鍒楄〃
- */
- @ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃")
- //// @PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
- @GetMapping("/list")
- public TableDataInfo list(ServiceDonationwitness serviceDonationwitness) {
- startPage();
- List<ServiceDonationwitness> list = serviceDonationwitnessService.queryList(serviceDonationwitness);
- return getDataTable(list);
- }
- @ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃-鏂�")
- @GetMapping("/listnew")
- public TableDataInfo listnew(DonationWitnessVO donationWitnessVO) {
- startPage();
- List<DonationWitnessVO> list = serviceDonationwitnessService.selectVOList(donationWitnessVO);
- return getDataTable(list);
+ @ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍩烘湰淇℃伅(鍣ㄥ畼鑾峰彇)")
+ @PostMapping("/getDonationwitnessBaseInfo")
+ public Map<String, Object> getDonationwitnessBaseInfo(@RequestBody DonationwitnessBaseInfoVO donationwitnessBaseInfoVO) {
+ Integer offset = PageUtils.getOffset(donationwitnessBaseInfoVO.getPageNum(), donationwitnessBaseInfoVO.getPageSize());
+ donationwitnessBaseInfoVO.setPageNum(offset);
+ List<DonationwitnessBaseInfoDTO> donationwitnessBaseInfo = serviceDonationwitnessService.getDonationwitnessBaseInfo(donationwitnessBaseInfoVO);
+
+ donationwitnessBaseInfoVO.setPageNum(null);
+ donationwitnessBaseInfoVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<DonationwitnessBaseInfoDTO> total = serviceDonationwitnessService.getDonationwitnessBaseInfo(donationwitnessBaseInfoVO);
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(donationwitnessBaseInfo, totalCount);
}
@@ -116,7 +108,7 @@
*/
@ApiOperation("閫氳繃id鑾峰彇瑙佽瘉淇℃伅")
//// @PreAuthorize("@ss.hasPermi('project:donationwitness:query')")
- @GetMapping(value = "/{id}")
+ @GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonationwitnessService.getById(id));
}
@@ -125,23 +117,18 @@
* 鏂板鎹愮尞瑙佽瘉
*/
@ApiOperation("鏂板鎹愮尞瑙佽瘉")
- //// @PreAuthorize("@ss.hasPermi('project:donationwitness:add')")
- @Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.INSERT)
+ @UniqueCheck(
+ fields = {"infoid"},
+ entityClass = ServiceDonationwitnessVO.class,
+ serviceClass = IServiceDonationwitnessService.class,
+ message = "鏂板鎹愮尞瑙佽瘉鐨刬nfoid宸插瓨鍦�,鏃犳硶淇濆瓨!"
+ )
@PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceDonationwitness serviceDonationwitness) {
- boolean save = serviceDonationwitnessService.save(serviceDonationwitness);
- log.info("鏂板鎹愮尞瑙佽瘉鏄惁鎴愬姛锛歿},id涓猴細{},infoId涓猴細{}", save, serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
-// if (save) {
-// //鐢熸垚鈥滄崘鐚�呯紪鍙封��
-// ServiceDonatebaseinfo serviceDonatebaseinfo = serviceDonatebaseinfoService.getById(serviceDonationwitness.getInfoid());
-// log.info("serviceDonatebaseinfo鐨勪俊鎭负{}", serviceDonatebaseinfo);
-// String donorno = serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo);
-// log.info("鐢熸垚鐨勬崘鐚�呯紪鍙蜂负:{}", donorno);
-// serviceDonatebaseinfo.setDonorno(donorno);
-// serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo);
-// }
- return AjaxResult.success(serviceDonationwitness);
+ public AjaxResult add(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO) {
+ boolean save = serviceDonationwitnessService.add(serviceDonationwitnessVO);
+ log.info("鏂板鎹愮尞瑙佽瘉鏄惁鎴愬姛锛歿},id涓猴細{},infoId涓猴細{}", save, serviceDonationwitnessVO.getId(), serviceDonationwitnessVO.getInfoid());
+ return AjaxResult.success(save);
}
/**
@@ -152,19 +139,10 @@
@Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceDonationwitness serviceDonationwitness) {
- log.info("鏂板鎹愮尞瑙佽瘉id涓猴細{},infoId涓猴細{}", serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
-
- int last = -1;
- if (StringUtils.isNotEmpty(serviceDonationwitness.getDonorno())) {
- last = serviceDonationwitness.getDonorno().lastIndexOf("*");
- }
- //鎹愮尞鑰呯紪鍙锋渶鍚庝竴浣嶆槸 * ,鎵嶅彲浠ュ線鍞竴閲岃〃鍔犳暟鎹�
- if (last == serviceDonationwitness.getDonorno().length()) {
- onlyValueCommon.addOnlyValue("donationwitness");
- }
-
- return toAjax(serviceDonationwitnessService.updateById(serviceDonationwitness));
+ public AjaxResult edit(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO) {
+ log.info("鏂板鎹愮尞瑙佽瘉id涓猴細{},infoId涓猴細{}", serviceDonationwitnessVO.getId(), serviceDonationwitnessVO.getInfoid());
+ Boolean edit = serviceDonationwitnessService.edit(serviceDonationwitnessVO);
+ return toAjax(edit);
}
/**
--
Gitblit v1.9.3