From b8e7b7cd4fd4f9305ac0eef7df08aaec98ec0b82 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 23 一月 2025 09:12:20 +0800
Subject: [PATCH] zjh20250122
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 60 +----------------------------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 3 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 3 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 7 +--
4 files changed, 9 insertions(+), 64 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 2dfe3e8..e6fe635 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1429,6 +1429,7 @@
// @Transactional
@GetMapping("/getParentList")
@ApiOperation(value = "鍖荤敓鐐瑰嚮浣撴淇℃伅璇︽儏(鍙樉绀虹埗椤圭洰鍒楄〃)")
+// 淇敼鎸夌収绉戝鏌ヨ
public AjaxResult getParentList(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
String userId = SecurityUtils.getLoginUser().getUserId();
Integer ksId = null;
@@ -1489,15 +1490,13 @@
String config = configService.selectConfigByKey("qt_open_xdt");
String byKey = configService.selectConfigByKey("qt_kjksid");
- List<Integer> split = new ArrayList<>(); // 瀛樻斁杞崲鍚庣殑integer绫诲瀷缁撴灉
+ Set<Integer> split = new HashSet<>(); // 瀛樻斁杞崲鍚庣殑integer绫诲瀷缁撴灉
+ split.add(ksId);
if ("Y".equals(config)) {
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
if (null != roles && !roles.isEmpty()) {
List<SysRole> list = roles.stream().filter(item -> item.getRoleName().contains("鍓嶅彴")).collect(Collectors.toList());
if (!list.isEmpty()) {
-// if (null != ksId && ksId == 100) {
-// ksId = 999;
-// }
if (null != byKey && !byKey.isEmpty()) {
String[] arr = byKey.split(","); // 鏍规嵁閫楀彿杩涜鍒囧壊
for (String s : arr) {
@@ -1505,36 +1504,15 @@
split.add(num); // 娣诲姞鍒板垪琛ㄤ腑
}
}
- } else {
- split.add(ksId);
}
- } else {
- split.add(ksId);
}
- } else {
- split.add(ksId);
}
-
-// LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
-// if ((null != sysUser && !sysUser.getUserName().equals("10001")) && 100!=ksId) {
-// wq2.in(TjProject::getDeptId,split);
-// }
-// //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
-// wq2.eq(TjProject::getNeedReport,"Y");
-// List<TjProject> Deptlist = projectService.list(wq2);
-// List<Long> proIdList = Deptlist.stream().map(TjProject::getProId).collect(Collectors.toList());
-// if (Deptlist.isEmpty() || proIdList.isEmpty()) {
-// return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
-// }
-
-
List<TjOrderRemark> list;
if(null != sysUser && sysUser.getUserName().equals("10001")){
list=remarkService.yiShengJianChaGetPrentProCJGLY(tjNumber);
}else {
list= remarkService.yiShengJianChaGetPrentPro(tjNumber, split);
}
-
if (null ==list || list.isEmpty()) {
return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
}
@@ -1544,39 +1522,7 @@
tjOrderRemark.setProName(tjProject.getProName());
}
}
-
return AjaxResult.success(list);
-
-
-// LambdaQueryWrapper<TjOrderDetail> wqq = new LambdaQueryWrapper<>();
-// wqq.eq(TjOrderDetail::getOrderId, one.getOrderId());
-// wqq.isNotNull(TjOrderDetail::getFlowingWaterId);
-// wqq.in(TjOrderDetail::getProId, proIdList);
-// wqq.notIn(TjOrderDetail::getProId, proIdList,projectService.getNneedReprotProId());
-// List<TjOrderDetail> detailList = detailService.list(wqq);
-// if (detailList != null && !detailList.isEmpty()) {
-// List<Long> collect = detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList());
-// QueryWrapper<TjOrderRemark> wq = new QueryWrapper<>();
-// wq.eq("tj_number", tjNumber);
-// wq.in("pro_id", collect);
-// wq.ne("type", 2);
-// wq.ne("dept_id",241);
-// wq.notIn("pro_id", proIdList,projectService.getNneedReprotProId());
-// List<TjOrderRemark> list = remarkService.list(wq);
-// if (list.isEmpty()) {
-// return AjaxResult.success("璇ョ瀹や笅鏃犻」鐩紒");
-// }
-// for (TjOrderRemark tjOrderRemark : list) {
-// TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
-// if (null != tjProject) {
-// tjOrderRemark.setProName(tjProject.getProName());
-// }
-// }
-// return AjaxResult.success(list);
-// }
-// return AjaxResult.success();
-// }
-
}
@Transactional
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index da7d70f..de247aa 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
import java.util.Map;
+import java.util.Set;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjOrderRemark;
@@ -217,7 +218,7 @@
"#{id}",
"</foreach>",
"</script>" })
- List<TjOrderRemark> yiShengJianChaGetPrentPro(@Param("tjNumber") String tjNumber,@Param("split") List<Integer> split);
+ List<TjOrderRemark> yiShengJianChaGetPrentPro(@Param("tjNumber") String tjNumber,@Param("split") Set<Integer> split);
@Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id JOIN sys_dept c ON c.dept_id=a.dept_id\n" +
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
index 91f2797..5278ced 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -11,6 +11,7 @@
import javax.validation.constraints.Size;
import java.util.List;
+import java.util.Set;
/**
* 鍖荤敓澶囨敞Service鎺ュ彛
@@ -85,7 +86,7 @@
void updateTjOrderRemarkSfbzByJxbzisnull(String orderId, String ls);
- List<TjOrderRemark> yiShengJianChaGetPrentPro(String tjNumber,List<Integer> split);
+ List<TjOrderRemark> yiShengJianChaGetPrentPro(String tjNumber, Set<Integer> split);
List<TjOrderRemark> yiShengJianChaGetPrentProCJGLY(String tjNumber);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
index 58a0077..39540b9 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -9,10 +9,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 鍖荤敓澶囨敞Service涓氬姟灞傚鐞�
@@ -172,7 +169,7 @@
}
@Override
- public List<TjOrderRemark> yiShengJianChaGetPrentPro(String tjNumber, List<Integer> split) {
+ public List<TjOrderRemark> yiShengJianChaGetPrentPro(String tjNumber, Set<Integer> split) {
return mapper.yiShengJianChaGetPrentPro(tjNumber,split);
}
--
Gitblit v1.8.0