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 | 72 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 16 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 11e6aba..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
@@ -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,20 @@
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.VUserOrg;
-import com.ruoyi.project.service.IServiceDonatebaseinfoReportFileService;
-import com.ruoyi.project.service.IServiceDonatebaseinfoReportService;
-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;
import java.util.List;
import java.util.Map;
@@ -47,6 +48,13 @@
private ISysConfigService sysConfigService;
@Autowired
private IVUserOrgService vUserOrgService;
+ @Autowired
+ private IServiceTransportService serviceTransport;
+ @Autowired
+ private IGiLinkService linkService;
+ @Autowired
+ private ISysUserService userService;
+
/**
* 鏌ヨ鎹愮尞涓婃姤鍩虹鍒楄〃
@@ -54,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());
}
@@ -64,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");
@@ -103,6 +122,10 @@
serviceDonatebaseinfoReportFile.setDelFlag(0);
List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles = serviceDonatebaseinfoReportFileService.queryList(serviceDonatebaseinfoReportFile);
serviceDonatebaseinfoReport.setAnnexfilesList(serviceDonatebaseinfoReportFiles);
+ Map<String,Object> transportMap=new HashMap<>();
+ transportMap.put("report_id",serviceDonatebaseinfoReport.getId());
+ List<ServiceTransport> transports= serviceTransport.listByMap(transportMap);
+ serviceDonatebaseinfoReport.setServiceTransport(transports);
return AjaxResult.success(serviceDonatebaseinfoReport);
}
@@ -115,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();
@@ -131,8 +155,11 @@
boolean save = serviceDonatebaseinfoReportService.save(serviceDonatebaseinfoReport);
//灏嗙敓鎴愮殑鏂囦欢鍦板潃瀛樺偍鍒版暟鎹簱涓�
- if (save)
- serviceDonatebaseinfoReportFileService.addList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getCaseNo(), getNickName(), serviceDonatebaseinfoReport.getId());
+ if (save) {
+ linkService.SendReport(serviceDonatebaseinfoReport.getId(),serviceDonatebaseinfoReport.getCoordinatorNo(),serviceDonatebaseinfoReport.getToHospital());
+ boolean res= serviceDonatebaseinfoReportFileService.addList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getCaseNo(), getNickName(), serviceDonatebaseinfoReport.getId());
+
+ }
return toAjax(save);
}
@@ -150,7 +177,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);
}
@@ -165,9 +192,22 @@
@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));
+ }
+
+ /**
+ * 淇敼鎹愮尞涓婃姤鍩虹
+ */
+ @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