From 8b79668682581fa6de34cb4239b726c1c90b05c0 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 15 七月 2026 15:57:32 +0800
Subject: [PATCH] 上报短信不用附件
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java | 4 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java | 7 ++++---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java | 2 ++
3 files changed, 8 insertions(+), 5 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 1f58c86..1540f62 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
@@ -138,9 +138,10 @@
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
//鐢熸垚妗堜緥涓婃姤ID
- String caseNo = String.valueOf(IdGeneratorUtils.nextId());
- serviceDonatebaseinfoReport.setCaseNo(caseNo);
-
+ if(ObjectUtils.isEmpty(serviceDonatebaseinfoReport.getCaseNo())) {
+ String caseNo = String.valueOf(IdGeneratorUtils.nextId());
+ serviceDonatebaseinfoReport.setCaseNo(caseNo);
+ }
//鑾峰彇鍗忚皟鍛樹俊鎭�
LoginUser loginUser = SecurityUtils.getLoginUser();
String userName = loginUser.getUser().getUserName();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java
index 99e7a37..9e06f50 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java
@@ -63,14 +63,14 @@
@ApiOperation("杞繍鐧昏鐘舵�佺粺璁�")
// @PreAuthorize("@ss.hasPermi('system:transport:list')")
@PostMapping("/totalServiceTransportState")
- public List<Map<String,Object>> totalState(@RequestBody ServiceTransport serviceTransport) {
+ public AjaxResult totalState(@RequestBody ServiceTransport serviceTransport) {
Long userId= getUserId();
SysUser user = userService.selectUserById(userId);
if(user!=null&&user.getUserType()!=null&&!user.getUserType().equals("00")){
serviceTransport.setNotAdminId(user.getUserName());
}
- return serviceTransportService.totalState(serviceTransport);
+ return AjaxResult.success(serviceTransportService.totalState(serviceTransport));
}
/**
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
index 093b26a..9b7a4d6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
@@ -141,6 +141,8 @@
serviceDonatebaseinfo1.setRegisterprovincename(serviceDonatebaseinfoReport.getRegisterprovincename());
serviceDonatebaseinfo1.setRegistercityname(serviceDonatebaseinfoReport.getRegistercityname());
serviceDonatebaseinfo1.setRegistertown(serviceDonatebaseinfoReport.getRegistertownname());
+ serviceDonatebaseinfo1.setReportHospital(serviceDonatebaseinfoReport.getToHospital());
+ serviceDonatebaseinfo1.setFirstDept(serviceDonatebaseinfoReport.getDeptName());
//鍏堥�氳繃caseNo鏌ヨ鏄惁瀛樺湪
ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
--
Gitblit v1.9.3