From e43cbc27e70376092c4751c775c64d55acecd160 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 19 五月 2026 16:04:29 +0800
Subject: [PATCH] yxh,java1.8适配
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
index 2373c8f..e160595 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
@@ -160,7 +160,7 @@
boolean b = serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport);
if (b) {
serviceDonatebaseinfoReportFileService.updateList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getId(), serviceDonatebaseinfoReport.getCaseNo(), getNickName());
- if (serviceDonatebaseinfoReport.getReportStatus().equals("3")) {
+ if (serviceDonatebaseinfoReport.getReportStatus().equals("3")&&serviceDonatebaseinfoReport.getIsDonate().equals(1)) {
//濡傛灉鍚屾剰涓婃姤锛岄偅灏卞彲浠ュ缓妗d簡锛堝線 ServiceDonatebaseinfo鏂板锛�
serviceDonatebaseinfoReportService.createDocument(serviceDonatebaseinfoReport);
}
@@ -180,4 +180,20 @@
serviceDonatebaseinfoReport.setDelFlag(1);
return toAjax(serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport));
}
+
+ /**
+ * 淇敼鎹愮尞涓婃姤鍩虹
+ */
+ @ApiOperation("涓婃姤")
+ @Log(title = "涓婃姤", businessType = BusinessType.UPDATE)
+ @PostMapping("/report")
+ @RepeatSubmit
+ public AjaxResult report(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
+ if (StringUtils.isEmpty(serviceDonatebaseinfoReport.getCaseNo())) {
+ throw new BaseException("妗堜緥缂栧彿涓虹┖锛岃妫�鏌ュ悗鍐嶄慨鏀�");
+ }
+ boolean b = serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport);
+
+ return toAjax(b);
+ }
}
--
Gitblit v1.9.3