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/ServiceDonatecompletioninfoController.java | 95 +++++++++++++++++------------------------------
1 files changed, 34 insertions(+), 61 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
index 2d52701..4d5a70c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
@@ -2,24 +2,25 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.UniqueCheck;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.OrganEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
+import com.ruoyi.project.domain.ServiceDonateorganBase;
import com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO;
-import com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
+import com.ruoyi.project.domain.vo.ServiceDonatecompletioninfoVO;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
import com.ruoyi.project.service.IServiceDonatecomporganService;
+import com.ruoyi.project.service.IServiceDonateorganBaseService;
import com.ruoyi.project.service.IServiceDonateorganService;
import freemarker.template.Configuration;
import freemarker.template.Template;
@@ -80,7 +81,7 @@
Integer totalCount = 0;
List<DonationCompletionBaseInfoDTO> total = serviceDonatecompletioninfoService.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);
if (!org.springframework.util.CollectionUtils.isEmpty(total)) totalCount = total.size();
- return getDataTable(donationCompletionBaseInfoDTOList,totalCount);
+ return getDataTable(donationCompletionBaseInfoDTOList, totalCount);
}
@@ -113,61 +114,39 @@
* 鏂板鎹愮尞瀹屾垚
*/
@ApiOperation("鏂板鎹愮尞瀹屾垚")
- //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
- @Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.INSERT)
+ @UniqueCheck(fields = {"infoid"},
+ entityClass = ServiceDonatecompletioninfoVO.class,
+ serviceClass = IServiceDonatecompletioninfoService.class,
+ message = "鏂板鎹愮尞瀹屾垚鐨刬nfoid宸插瓨鍦�,鏃犳硶淇濆瓨!")
@PostMapping("/add")
@RepeatSubmit(interval = 5000)
- public AjaxResult add(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
- log.info("鏂板鎹愮尞瀹屾垚锛歿}", serviceDonatecompletioninfo);
- serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(), serviceDonatecompletioninfo.getCreateBy());
- boolean save = serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo);
- log.info("鏂板鎹愮尞瀹屾垚serviceDonatecompletioninfo鐨処D锛歿}", serviceDonatecompletioninfo.getId());
- return AjaxResult.success(serviceDonatecompletioninfo);
+ public AjaxResult add(@RequestBody ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
+ log.info("鏂板鎹愮尞瀹屾垚锛歿}", serviceDonatecompletioninfoVO);
+ boolean save = serviceDonatecompletioninfoService.add(serviceDonatecompletioninfoVO);
+ return AjaxResult.success(save);
}
-// /**
-// * 鏂板鎹愮尞瀹屾垚璇︽儏
-// */
-// @ApiOperation("鏂板鎹愮尞瀹屾垚璇︽儏")
-// //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
-// @Log(title = "鏂板鎹愮尞瀹屾垚璇︽儏", businessType = BusinessType.INSERT)
-// @PostMapping
-// @RepeatSubmit(interval = 5000)
-// public AjaxResult addDetail(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
-// log.info("鏂板鎹愮尞瀹屾垚锛歿}", serviceDonatecompletioninfo);
-// serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(), serviceDonatecompletioninfo.getCreateBy());
-// //鏂板donatecomporgan鏁版嵁
-// if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfo.getServiceDonatecomporganList())) {
-// for (ServiceDonatecomporgan serviceDonatecomporgan : serviceDonatecompletioninfo.getServiceDonatecomporganList()) {
-// if (serviceDonatecomporgan.getInfoid() == null) {
-// throw new BaseException("璇锋鏌ユ崘鐚櫒瀹樼Щ妞嶄俊鎭紝鏄惁涓庢崘鐚熀纭�琛ㄨ繘琛屽叧鑱�");
-// }
-// serviceDonatecomporganService.save(serviceDonatecomporgan);
+//
+// @RepeatSubmit
+// @ApiOperation("鏂板鎴栦慨鏀规崘鐚畬鎴�")
+// //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
+// @Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.UPDATE)
+// @PostMapping("/saveOrUpdateDonatecompletioninfo")
+// public AjaxResult saveOrUpdateDonatecompletioninfo(@RequestBody List<ServiceDonatecompletioninfo> serviceDonatecompletioninfoList) {
+// if (CollectionUtils.isEmpty(serviceDonatecompletioninfoList)) {
+// throw new BaseException("璇锋鏌ラ渶瑕佹柊澧炴垨淇敼鐨勬崘鐚畬鎴愬弬鏁版槸鍚﹀畬鏁�");
+// }
+// Boolean i = null;
+// for (ServiceDonatecompletioninfo serviceDonatecompletioninfo : serviceDonatecompletioninfoList) {
+// log.info("鎹愮尞瀹屾垚id鏄惁涓虹┖ : {},鍩虹琛ㄧ殑id涓� : {}", serviceDonatecompletioninfo.getId(), serviceDonatecompletioninfo.getInfoid());
+// if (serviceDonatecompletioninfo.getId() == null) {
+// i = serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo);
+// } else {
+// i = serviceDonatecompletioninfoService.updateById(serviceDonatecompletioninfo);
// }
// }
-// return toAjax(serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo));
+// return toAjax(i);
// }
-
- @RepeatSubmit
- @ApiOperation("鏂板鎴栦慨鏀规崘鐚畬鎴�")
- //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
- @Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.UPDATE)
- @PostMapping("/saveOrUpdateDonatecompletioninfo")
- public AjaxResult saveOrUpdateDonatecompletioninfo(@RequestBody List<ServiceDonatecompletioninfo> serviceDonatecompletioninfoList) {
- if (CollectionUtils.isEmpty(serviceDonatecompletioninfoList)) {
- throw new BaseException("璇锋鏌ラ渶瑕佹柊澧炴垨淇敼鐨勬崘鐚畬鎴愬弬鏁版槸鍚﹀畬鏁�");
- }
- Boolean i = null;
- for (ServiceDonatecompletioninfo serviceDonatecompletioninfo : serviceDonatecompletioninfoList) {
- log.info("鎹愮尞瀹屾垚id鏄惁涓虹┖ : {},鍩虹琛ㄧ殑id涓� : {}", serviceDonatecompletioninfo.getId(), serviceDonatecompletioninfo.getInfoid());
- if (serviceDonatecompletioninfo.getId() == null) {
- i = serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo);
- } else {
- i = serviceDonatecompletioninfoService.updateById(serviceDonatecompletioninfo);
- }
- }
- return toAjax(i);
- }
/**
* 淇敼鎹愮尞瀹屾垚
@@ -177,15 +156,9 @@
//// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
@Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
- ServiceDonatecompletioninfo serviceDonatecompletioninfo1 = new ServiceDonatecompletioninfo();
- serviceDonatecompletioninfo1.setInfoid(serviceDonatecompletioninfo.getInfoid());
- List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo1);
- if (CollectionUtils.isEmpty(list)) {
- return error("妗堜緥ID锛屽搴旂殑瀹屾垚鐧昏淇℃伅涓虹┖");
- }
- serviceDonatecompletioninfo.setId(list.get(0).getId());
- return toAjax(serviceDonatecompletioninfoService.updateById(serviceDonatecompletioninfo));
+ public AjaxResult edit(@RequestBody ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
+ boolean edit = serviceDonatecompletioninfoService.edit(serviceDonatecompletioninfoVO);
+ return toAjax(edit);
}
/**
--
Gitblit v1.9.3