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/ServiceDonatebaseinfoReportController.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 6de9a8d..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
@@ -52,6 +52,8 @@
private IServiceTransportService serviceTransport;
@Autowired
private IGiLinkService linkService;
+ @Autowired
+ private ISysUserService userService;
/**
@@ -60,6 +62,11 @@
@ApiOperation("鏌ヨ鎹愮尞涓婃姤鍩虹鍒楄〃")
@PostMapping("/list")
public Map<String, Object> list(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
+ Long userId= getUserId();
+ SysUser user = userService.selectUserById(userId);
+ if(user!=null&&user.getUserType()!=null&&!user.getUserType().equals("00")){
+ serviceDonatebaseinfoReport.setNotAdminId(user.getUserName());
+ }
Page<ServiceDonatebaseinfoReport> serviceDonatebaseinfoReportPage = serviceDonatebaseinfoReportService.queryList(serviceDonatebaseinfoReport);
return getDataTable(serviceDonatebaseinfoReportPage.getRecords(), (int) serviceDonatebaseinfoReportPage.getTotal());
}
@@ -70,6 +77,12 @@
@ApiOperation("鑾峰彇鍚勭被鍨嬬殑鎬绘暟")
@PostMapping("/getTotal")
public Map<String, Object> getTotal(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
+
+ Long userId= getUserId();
+ SysUser user = userService.selectUserById(userId);
+ if(user!=null&&user.getUserType()!=null&&!user.getUserType().equals("00")){
+ serviceDonatebaseinfoReport.setNotAdminId(user.getUserName());
+ }
//鍘婚厤缃枃浠朵腑锛岃幏鍙栦笂鎶ョ被鍨�
SysConfig config = new SysConfig();
config.setConfigKey("sys.report.type");
@@ -125,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();
@@ -142,10 +156,9 @@
boolean save = serviceDonatebaseinfoReportService.save(serviceDonatebaseinfoReport);
//灏嗙敓鎴愮殑鏂囦欢鍦板潃瀛樺偍鍒版暟鎹簱涓�
if (save) {
+ linkService.SendReport(serviceDonatebaseinfoReport.getId(),serviceDonatebaseinfoReport.getCoordinatorNo(),serviceDonatebaseinfoReport.getToHospital());
boolean res= serviceDonatebaseinfoReportFileService.addList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getCaseNo(), getNickName(), serviceDonatebaseinfoReport.getId());
- if(res){
- linkService.SendReport(serviceDonatebaseinfoReport.getId(),serviceDonatebaseinfoReport.getCoordinatorNo(),serviceDonatebaseinfoReport.getToHospital());
- }
+
}
return toAjax(save);
}
@@ -179,10 +192,7 @@
@ApiOperation("鍒犻櫎鎹愮尞涓婃姤鍩虹")
@GetMapping("/remove/{id}")
public AjaxResult remove(@PathVariable Long id) {
- ServiceDonatebaseinfoReport serviceDonatebaseinfoReport = new ServiceDonatebaseinfoReport();
- serviceDonatebaseinfoReport.setId(id);
- serviceDonatebaseinfoReport.setDelFlag(1);
- return toAjax(serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport));
+ return toAjax(serviceDonatebaseinfoReportService.removeById(id));
}
/**
--
Gitblit v1.9.3