From 8c215c8be0f5076e8c95daf1b2203440ca7dfcad Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 十月 2026 13:42:50 +0800
Subject: [PATCH] 修改了报销校验
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 154 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 102 insertions(+), 52 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
index cd42b9f..06dea79 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
@@ -216,26 +216,46 @@
public List<ServiceDonatebaseinfo> selectServiceDonatebaseinfoList(ServiceDonatebaseinfo serviceDonatebaseinfo) {
SysUser user = SecurityUtils.getLoginUser().getUser();
- List<SysRole> l = user.getRoles();
- int b = 0;
+ // 瓒呯骇绠＄悊鍛樹笉鍙�"鍙湅鏈汉鎶ラ�� / 鍙湅鏈儴闂�"鐨勬暟鎹寖鍥撮檺鍒讹紝鍙煡鐪嬪叏閮ㄦ暟鎹�
+ if (!isSuperAdmin(user)) {
+ List<SysRole> l = user.getRoles();
+ int b = 0;
- for (SysRole r : l) {
- if (r.getRoleId().longValue() == 3) {
- b = 1;
+ for (SysRole r : l) {
+ if (r.getRoleId().longValue() == 3) {
+ b = 1;
+ }
+ if (r.getRoleId().longValue() == 13) {
+ b = 2;
+ }
}
- if (r.getRoleId().longValue() == 13) {
- b = 2;
- }
- }
- if (b == 1) {
+ if (b == 1) {
// serviceDonatebaseinfo.setCreateBy(user.getUserName());
- log.info("user.getUserName()鐨勫�间负 ---- 锛歿}", user.getUserName());
- serviceDonatebaseinfo.setReporterno(user.getUserName());
- }
- if (b == 2) {
- serviceDonatebaseinfo.setDeptid(user.getDeptId());
+ log.info("user.getUserName()鐨勫�间负 ---- 锛歿}", user.getUserName());
+ serviceDonatebaseinfo.setReporterno(user.getUserName());
+ }
+ if (b == 2) {
+ serviceDonatebaseinfo.setDeptid(user.getDeptId());
+ }
}
List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
+
+ // 涓�娆℃�у彇鍑哄悇鎹愮尞鍩虹瀵瑰簲鐨勬浜℃椂闂达紝閬垮厤鍦ㄥ惊鐜噷鎸� InfoID 閫愭潯鏌ヨ璇佽〃锛圢+1锛�
+ List<Long> infoIds = new ArrayList<>();
+ for (ServiceDonatebaseinfo item : serviceDonatebaseinfos) {
+ if (item.getId() != null) {
+ infoIds.add(item.getId());
+ }
+ }
+ Map<Long, Date> deathTimeMap = new HashMap<>();
+ if (!infoIds.isEmpty()) {
+ for (ServiceDonationwitness witness : serviceDonationwitnessMapper.selectDeathTimeByInfoIds(infoIds)) {
+ if (witness.getInfoid() != null && !deathTimeMap.containsKey(witness.getInfoid())) {
+ deathTimeMap.put(witness.getInfoid(), witness.getDeathtime());
+ }
+ }
+ }
+
for (ServiceDonatebaseinfo serviceDonatebaseinfo1 : serviceDonatebaseinfos) {
//鍏堢粰涓勾榫勯粯璁ゅ�硷紙鍥犱负age鏄暟瀛楃被鍨嬶紝涓嶈兘鏀炬í鏉狅紝鎵�浠ュ氨鎵�妯墰鏀惧埌鍗曚綅涓婏級
serviceDonatebaseinfo1.setAgeunit("-");
@@ -243,22 +263,17 @@
serviceDonatebaseinfo1.setAge2(null);
//鑾峰彇姝讳骸鏃堕棿锛屽鏋滆幏鍙栬璇侀噷鏈夋浜℃椂闂达紝鍒欒繘琛岃绠椾粬鐨勫勾榫�
- ServiceDonationwitness sdw = new ServiceDonationwitness();
- sdw.setInfoid(serviceDonatebaseinfo1.getId());
- List<ServiceDonationwitness> serviceDonationwitnessList = serviceDonationwitnessMapper.selectServiceDonationwitnessList(sdw);
- if (!CollectionUtils.isEmpty(serviceDonationwitnessList) && serviceDonatebaseinfo1.getBirthday() != null) {
- Date deathtime = serviceDonationwitnessList.get(0).getDeathtime();
- if (ObjectUtils.isNotEmpty(deathtime)) {
- Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
- if (Objects.isNull(map)) {
- log.error("ServiceDonationwitness鍑虹敓鏃ユ湡锛歿},ServiceDonationwitness姝讳骸鏃ユ湡锛歿}", serviceDonatebaseinfo1.getBirthday(), deathtime);
- continue;
- }
- serviceDonatebaseinfo1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
- serviceDonatebaseinfo1.setAgeunit(map.get("ageUnit"));
- serviceDonatebaseinfo1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
- serviceDonatebaseinfo1.setAgeunit2(map.get("ageUnit2"));
+ Date deathtime = deathTimeMap.get(serviceDonatebaseinfo1.getId());
+ if (ObjectUtils.isNotEmpty(deathtime) && serviceDonatebaseinfo1.getBirthday() != null) {
+ Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
+ if (Objects.isNull(map)) {
+ log.error("ServiceDonationwitness鍑虹敓鏃ユ湡锛歿},ServiceDonationwitness姝讳骸鏃ユ湡锛歿}", serviceDonatebaseinfo1.getBirthday(), deathtime);
+ continue;
}
+ serviceDonatebaseinfo1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
+ serviceDonatebaseinfo1.setAgeunit(map.get("ageUnit"));
+ serviceDonatebaseinfo1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
+ serviceDonatebaseinfo1.setAgeunit2(map.get("ageUnit2"));
}
}
@@ -270,23 +285,26 @@
public List<ServiceDonatebaseinfo> getPatName(ServiceDonatebaseinfo serviceDonatebaseinfo) {
SysUser user = SecurityUtils.getLoginUser().getUser();
- List<SysRole> l = user.getRoles();
- int b = 0;
+ // 瓒呯骇绠＄悊鍛樹笉鍙楁暟鎹寖鍥撮檺鍒讹紝鍙煡鐪嬪叏閮ㄦ暟鎹�
+ if (!isSuperAdmin(user)) {
+ List<SysRole> l = user.getRoles();
+ int b = 0;
- for (SysRole r : l) {
- if (r.getRoleId().longValue() == 3) {
- b = 1;
+ for (SysRole r : l) {
+ if (r.getRoleId().longValue() == 3) {
+ b = 1;
+ }
+ if (r.getRoleId().longValue() == 13) {
+ b = 2;
+ }
}
- if (r.getRoleId().longValue() == 13) {
- b = 2;
+ if (b == 1) {
+ log.info("user.getUserName()鐨勫�间负 ---- 锛歿}", user.getUserName());
+ serviceDonatebaseinfo.setReporterno(user.getUserName());
}
- }
- if (b == 1) {
- log.info("user.getUserName()鐨勫�间负 ---- 锛歿}", user.getUserName());
- serviceDonatebaseinfo.setReporterno(user.getUserName());
- }
- if (b == 2) {
- serviceDonatebaseinfo.setDeptid(user.getDeptId());
+ if (b == 2) {
+ serviceDonatebaseinfo.setDeptid(user.getDeptId());
+ }
}
List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.getPatName(serviceDonatebaseinfo);
@@ -296,15 +314,18 @@
@Override
public List<ServiceDonatebaseinfo> listForSearch(ServiceDonatebaseinfo serviceDonatebaseinfo) {
SysUser user = SecurityUtils.getLoginUser().getUser();
- List<SysRole> l = user.getRoles();
- Boolean b = false;
- for (SysRole r : l) {
- if (r.getRoleId().longValue() == 3) {
- b = true;
+ // 瓒呯骇绠＄悊鍛樹笉鍙楁暟鎹寖鍥撮檺鍒讹紝鍙煡鐪嬪叏閮ㄦ暟鎹�
+ if (!isSuperAdmin(user)) {
+ List<SysRole> l = user.getRoles();
+ Boolean b = false;
+ for (SysRole r : l) {
+ if (r.getRoleId().longValue() == 3) {
+ b = true;
+ }
}
- }
- if (b) {
- serviceDonatebaseinfo.setCreateBy(user.getUserName());
+ if (b) {
+ serviceDonatebaseinfo.setCreateBy(user.getUserName());
+ }
}
return serviceDonatebaseinfoMapper.listForSearch(serviceDonatebaseinfo);
@@ -569,4 +590,33 @@
//灏嗘暟鎹皝闂紝骞惰繑鍥�
return map;
}
+
+ /**
+ * 鏄惁瓒呯骇绠＄悊鍛樸��
+ *
+ * <p>鍒ゅ畾涓鸿秴绾х鐞嗗憳鐨勬儏褰細
+ * <ul>
+ * <li>鍐呯疆绠＄悊鍛樿处鍙凤紙userId = 1锛夛紱</li>
+ * <li>璐﹀彿琚巿浜�"瓒呯骇绠＄悊鍛�"瑙掕壊锛坮oleId = 1锛夈��</li>
+ * </ul>
+ * 瓒呯骇绠＄悊鍛樹笉鍙�"鍙湅鏈汉鎶ラ�侊紙瑙掕壊3 涓撹亴浜哄憳锛�/ 鍙湅鏈儴闂紙瑙掕壊13 涓氬姟缁勯暱锛�"鐨勬暟鎹寖鍥撮檺鍒讹紝
+ * 鍙煡鐪嬪叏閮ㄦ暟鎹��
+ */
+ private boolean isSuperAdmin(SysUser user) {
+ if (user == null) {
+ return false;
+ }
+ if (SysUser.isAdmin(user.getUserId())) {
+ return true;
+ }
+ List<SysRole> roles = user.getRoles();
+ if (roles != null) {
+ for (SysRole role : roles) {
+ if (role.getRoleId() != null && role.getRoleId().longValue() == 1L) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
}
--
Gitblit v1.9.3