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 | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
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 762f2e5..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
@@ -5,12 +5,14 @@
import com.ruoyi.common.annotation.Log;
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.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceTransport;
import com.ruoyi.project.domain.ServiceTransportFile;
import com.ruoyi.project.service.IServiceTransportService;
import com.ruoyi.project.service.impl.ServiceTransportFileServiceImpl;
+import com.ruoyi.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +38,9 @@
@Autowired
private ServiceTransportFileServiceImpl serviceTransportFileService;
+ @Autowired
+ private ISysUserService userService;
+
/**
* 鏌ヨ渚涜�呰浆杩愮櫥璁板垪琛�
*/
@@ -43,8 +48,29 @@
// @PreAuthorize("@ss.hasPermi('system:transport:list')")
@PostMapping("/list")
public Map<String, Object> list(@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());
+ }
Page<ServiceTransport> serviceTransportPage = serviceTransportService.queryList(serviceTransport);
return getDataTable(serviceTransportPage.getRecords(), (int) serviceTransportPage.getTotal());
+ }
+
+ /**
+ * 鏌ヨ渚涜�呰浆杩愮櫥璁板垪琛�
+ */
+ @ApiOperation("杞繍鐧昏鐘舵�佺粺璁�")
+ // @PreAuthorize("@ss.hasPermi('system:transport:list')")
+ @PostMapping("/totalServiceTransportState")
+ 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 AjaxResult.success(serviceTransportService.totalState(serviceTransport));
}
/**
@@ -55,6 +81,11 @@
@Log(title = "渚涜�呰浆杩愮櫥璁�", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceTransport serviceTransport) {
+ Long userId= getUserId();
+ SysUser user = userService.selectUserById(userId);
+ if(user!=null&&user.getUserType()!=null&&!user.getUserType().equals("00")){
+ serviceTransport.setNotAdminId(user.getUserId()+"");
+ }
List<ServiceTransport> list = serviceTransportService.queryList(serviceTransport).getRecords();
ExcelUtil<ServiceTransport> util = new ExcelUtil<ServiceTransport>(ServiceTransport.class);
return util.exportExcel(list, "渚涜�呰浆杩愮櫥璁版暟鎹�");
@@ -73,7 +104,6 @@
ServiceTransportFile serviceTransportFile = new ServiceTransportFile();
serviceTransportFile.setDelFlag(0);
serviceTransportFile.setTransportId(transport.getId());
- serviceTransportFile.setCaseNo(transport.getCaseNo());
List<ServiceTransportFile> serviceTransportFiles = serviceTransportFileService.queryList(serviceTransportFile);
transport.setAnnexfilesList(serviceTransportFiles);
}
@@ -107,7 +137,7 @@
public AjaxResult edit(@RequestBody ServiceTransport serviceTransport) {
boolean b = serviceTransportService.updateById(serviceTransport);
if (b) {
- serviceTransportFileService.updateList(serviceTransport.getAnnexfilesList(), serviceTransport.getReportId(), serviceTransport.getCaseNo(), getNickName());
+ serviceTransportFileService.updateList(serviceTransport.getAnnexfilesList(), serviceTransport.getId(), serviceTransport.getCaseNo(), getNickName());
}
return toAjax(b);
}
--
Gitblit v1.9.3