From 7d2f250b0aaeff2497e581e2a89643f93ffaba68 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 13 七月 2026 17:19:15 +0800
Subject: [PATCH] 新增非管理员数据过滤
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java | 7 +++
ruoyi-project/src/main/resources/mapper/project/ServiceTransportMapper.xml | 8 ++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java | 13 ++++++
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceTransportMapper.java | 9 ++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceTransport.java | 7 +++
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 2 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java | 31 +++++++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceTransportService.java | 9 ++++
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 16 ++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java | 13 ++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java | 5 ++
11 files changed, 120 insertions(+), 0 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..ecd5332 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");
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 d444ab8..99e7a37 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 List<Map<String,Object>> 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);
}
/**
@@ -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, "渚涜�呰浆杩愮櫥璁版暟鎹�");
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 176d0b2..9250167 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -57,6 +57,12 @@
private String nickName;
/**
+ * 鐢ㄦ埛绫诲瀷锛�00绠＄悊鍛橈級
+ */
+ @Excel(name = "鐢ㄦ埛绫诲瀷锛�00绠＄悊鍛橈級")
+ private String userType;
+
+ /**
* 鐢ㄦ埛閭
*/
@Excel(name = "鐢ㄦ埛閭")
@@ -278,6 +284,16 @@
this.userName = userName;
}
+
+
+ public String getUserType() {
+ return userType;
+ }
+
+ public void setUserType(String userType) {
+ this.userType = userType;
+ }
+
@Email(message = "閭鏍煎紡涓嶆纭�")
@Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
public String getEmail() {
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
index 5efa1c1..720bebd 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
@@ -456,5 +456,12 @@
@Excel(name = "ICU璇勪及鍖荤敓鎵嬫満鍙�")
private String icuDoctorPhone;
+ /**
+ * 闈炵鐞嗗憳ID
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("闈炵鐞嗗憳ID")
+ private String notAdminId;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceTransport.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceTransport.java
index 2595994..d0134dc 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceTransport.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceTransport.java
@@ -191,5 +191,12 @@
@TableField(exist = false)
@ApiModelProperty("闄勪欢鏂囦欢鍦板潃闆嗗悎")
private List<ServiceTransportFile> annexfilesList;
+
+ /**
+ * 闈炵鐞嗗憳ID
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("闈炵鐞嗗憳ID")
+ private String notAdminId;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceTransportMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceTransportMapper.java
index 227036a..94bdbc0 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceTransportMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceTransportMapper.java
@@ -6,6 +6,7 @@
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
+import java.util.Map;
/**
* 渚涜�呰浆杩愮櫥璁癕apper鎺ュ彛
@@ -23,4 +24,12 @@
* @return 渚涜�呰浆杩愮櫥璁伴泦鍚�
*/
public List<ServiceTransport> selectServiceTransportList(ServiceTransport serviceTransport);
+
+ /**
+ * 鏌ヨ渚涜�呰浆杩愮櫥璁板垪琛�
+ *
+ * @param serviceTransport 渚涜�呰浆杩愮櫥璁�
+ * @return 渚涜�呰浆杩愮櫥璁伴泦鍚�
+ */
+ public List<Map<String,Object>> totalState(ServiceTransport serviceTransport);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceTransportService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceTransportService.java
index 45022c2..891dc3e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceTransportService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceTransportService.java
@@ -5,6 +5,7 @@
import com.ruoyi.project.domain.ServiceTransport;
import java.util.List;
+import java.util.Map;
/**
* 渚涜�呰浆杩愮櫥璁癝ervice鎺ュ彛
@@ -29,5 +30,13 @@
* @param serviceTransport 渚涜�呰浆杩愮櫥璁�
* @return 渚涜�呰浆杩愮櫥璁伴泦鍚�
*/
+ public List<Map<String,Object>> totalState(ServiceTransport serviceTransport);
+
+ /**
+ * 鏌ヨ渚涜�呰浆杩愮櫥璁板垪琛�
+ *
+ * @param serviceTransport 渚涜�呰浆杩愮櫥璁�
+ * @return 渚涜�呰浆杩愮櫥璁伴泦鍚�
+ */
public List<ServiceTransport> queryListData(ServiceTransport 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 04be80a..093b26a 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
@@ -50,6 +50,7 @@
@Override
public Page<ServiceDonatebaseinfoReport> queryList(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
LambdaQueryWrapper<ServiceDonatebaseinfoReport> wrappers = getWrapper(serviceDonatebaseinfoReport);
+
// 娣诲姞create_time涓嶄负绌虹殑鏉′欢
wrappers.isNotNull(ServiceDonatebaseinfoReport::getCreateTime);
// 鐒跺悗杩涜鍊掑簭鎺掑簭
@@ -157,6 +158,7 @@
private LambdaQueryWrapper<ServiceDonatebaseinfoReport> getWrapper(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
LambdaQueryWrapper<ServiceDonatebaseinfoReport> wrappers = Wrappers.lambdaQuery();
+ wrappers.eq(ServiceDonatebaseinfoReport::getDelFlag, "0");
if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getCaseNo())) {
wrappers.eq(ServiceDonatebaseinfoReport::getCaseNo, serviceDonatebaseinfoReport.getCaseNo());
}
@@ -308,6 +310,9 @@
wrappers.eq(ServiceDonatebaseinfoReport::getCoordinatorNo, serviceDonatebaseinfoReport.getCoordinatorNo());
}
+ if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getNotAdminId())) {
+ wrappers.eq(ServiceDonatebaseinfoReport::getCreateBy, serviceDonatebaseinfoReport.getNotAdminId());
+ }
return wrappers;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java
index 1327166..83dc7c3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java
@@ -65,6 +65,16 @@
page.setRecords(list);
return page;
}
+ /**
+ * 鏌ヨ渚涜�呰浆杩愮櫥璁板垪琛�
+ *
+ * @param serviceTransport 渚涜�呰浆杩愮櫥璁�
+ * @return 渚涜�呰浆杩愮櫥璁�
+ */
+ @Override
+ public List<Map<String,Object>> totalState(ServiceTransport serviceTransport) {
+ return ServiceTransportMapper.totalState(serviceTransport);
+ }
@Override
public List<ServiceTransport> queryListData(ServiceTransport serviceTransport) {
@@ -154,6 +164,9 @@
if (StringUtils.isNotBlank(serviceTransport.getIcuDoctorPhone())) {
wrappers.eq(ServiceTransport::getIcuDoctorPhone, serviceTransport.getIcuDoctorPhone());
}
+ if (StringUtils.isNotBlank(serviceTransport.getNotAdminId())) {
+ wrappers.eq(ServiceTransport::getCreateBy, serviceTransport.getNotAdminId());
+ }
return wrappers;
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceTransportMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceTransportMapper.xml
index 5019b5d..041737d 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceTransportMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceTransportMapper.xml
@@ -101,4 +101,12 @@
</where>
</select>
+ <select id="totalState" parameterType="com.ruoyi.project.domain.ServiceTransport" resultType="map">
+ SELECT transit_status,COUNT(transit_status) as count FROM service_Transport
+ <where>
+ <if test="notAdminId != null and notAdminId != ''">and create_by = #{notAdminId}</if>
+ </where>
+ GROUP BY transit_status
+ </select>
+
</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index e9f836f..7cc44e6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -10,6 +10,7 @@
<result property="deptId" column="dept_id"/>
<result property="userName" column="user_name"/>
<result property="nickName" column="nick_name"/>
+ <result property="userType" column="user_type"/>
<result property="email" column="email"/>
<result property="phonenumber" column="phonenumber"/>
<result property="sex" column="sex"/>
@@ -61,6 +62,7 @@
u.ding_user_id,
u.error_nums,
u.error_times,
+ u.user_type,
u.user_name,
u.nick_name,
u.email,
--
Gitblit v1.9.3