From b542bb002d9dc8e12cf4bd8bb54dc4aa0b4bb67d Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 01 六月 2026 14:02:54 +0800
Subject: [PATCH] 新境上报发送短信、专家发送短信、外链相关接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 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..6de9a8d 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
@@ -5,6 +5,7 @@
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.base.BaseException;
@@ -12,20 +13,17 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.common.IdGeneratorUtils;
-import com.ruoyi.project.domain.ServiceDonatebaseinfoReport;
-import com.ruoyi.project.domain.ServiceDonatebaseinfoReportFile;
-import com.ruoyi.project.domain.ServiceTransport;
-import com.ruoyi.project.domain.VUserOrg;
-import com.ruoyi.project.service.IServiceDonatebaseinfoReportFileService;
-import com.ruoyi.project.service.IServiceDonatebaseinfoReportService;
-import com.ruoyi.project.service.IServiceTransportService;
-import com.ruoyi.project.service.IVUserOrgService;
+import com.ruoyi.project.domain.*;
+import com.ruoyi.project.service.*;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
@@ -52,6 +50,8 @@
private IVUserOrgService vUserOrgService;
@Autowired
private IServiceTransportService serviceTransport;
+ @Autowired
+ private IGiLinkService linkService;
/**
@@ -141,8 +141,12 @@
boolean save = serviceDonatebaseinfoReportService.save(serviceDonatebaseinfoReport);
//灏嗙敓鎴愮殑鏂囦欢鍦板潃瀛樺偍鍒版暟鎹簱涓�
- if (save)
- serviceDonatebaseinfoReportFileService.addList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getCaseNo(), getNickName(), serviceDonatebaseinfoReport.getId());
+ if (save) {
+ boolean res= serviceDonatebaseinfoReportFileService.addList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getCaseNo(), getNickName(), serviceDonatebaseinfoReport.getId());
+ if(res){
+ linkService.SendReport(serviceDonatebaseinfoReport.getId(),serviceDonatebaseinfoReport.getCoordinatorNo(),serviceDonatebaseinfoReport.getToHospital());
+ }
+ }
return toAjax(save);
}
@@ -160,7 +164,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)) {
//濡傛灉鍚屾剰涓婃姤锛岄偅灏卞彲浠ュ缓妗ｄ簡锛堝線 ServiceDonatebaseinfo鏂板锛�
serviceDonatebaseinfoReportService.createDocument(serviceDonatebaseinfoReport);
}
@@ -180,4 +184,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