From f552224e3f83b32b9dace6ab0b3c37c861261b3d Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期三, 05 六月 2024 18:46:19 +0800
Subject: [PATCH] 获取接口代码
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 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 3da76a3..11d6d05 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
@@ -11,8 +11,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.base.Joiner;
import com.ltkj.common.core.domain.TreeSelect;
+import com.ltkj.common.core.domain.entity.SysRole;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
+import com.ltkj.common.core.text.Convert;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.common.utils.bean.BeanUtils;
import com.ltkj.framework.config.MatchUtils;
@@ -21,9 +23,7 @@
import com.ltkj.hosp.service.*;
import com.ltkj.system.domain.SysPost;
import com.ltkj.system.domain.SysUserPost;
-import com.ltkj.system.service.ISysPostService;
-import com.ltkj.system.service.ISysUserPostService;
-import com.ltkj.system.service.ISysUserService;
+import com.ltkj.system.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -46,7 +46,6 @@
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.enums.BusinessType;
import com.ltkj.common.utils.StringUtils;
-import com.ltkj.system.service.ISysDeptService;
import javax.annotation.Resource;
@@ -101,7 +100,8 @@
public RedisTemplate<Object,Object> redisTemplate;
@Resource
private TestMapper testMapper;
-
+ @Autowired
+ private ISysConfigService configService;
/**
* 璇ヤ綋妫�绉戝涓嬪鎴峰垪琛ㄦ樉绀烘帴鍙�
@@ -1366,7 +1366,7 @@
if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null)) {
one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
}
- one.setDeptId(orderRemark.getDeptId());
+// one.setDeptId(orderRemark.getDeptId());
one.setDoctorName(orderRemark.getDoctorName());
one.setType(1);
remarkService.updateById(one);
@@ -1400,6 +1400,35 @@
}
ksId = Math.toIntExact(sysUser.getDeptId());
}
+
+ String config = configService.selectConfigByKey("qt_open_xdt");
+ String byKey = configService.selectConfigByKey("qt_kjksid");
+ List<Integer> split = new ArrayList<>(); // 瀛樻斁杞崲鍚庣殑integer绫诲瀷缁撴灉
+ if("Y".equals(config)){
+ List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+ if(null !=roles && roles.size()>0){
+ List<SysRole> list = roles.stream().filter(item -> item.getRoleName().contains("鍓嶅彴")).collect(Collectors.toList());
+ if(list.size()>0){
+ if(null !=ksId && ksId==100){
+ ksId=999;
+ }
+ if(null !=byKey && !"".equals(byKey)){
+ String[] arr = byKey.split(","); // 鏍规嵁閫楀彿杩涜鍒囧壊
+ for (String s : arr) {
+ int num = Integer.parseInt(s); // 灏嗘瘡涓瓙瀛楃涓茶浆鎹负integer绫诲瀷
+ split.add(num); // 娣诲姞鍒板垪琛ㄤ腑
+ }
+ }
+ }else {
+ split.add(ksId);
+ }
+ }else {
+ split.add(ksId);
+ }
+ }else {
+ split.add(ksId);
+ }
+
//鍒ゆ柇褰撳墠鐧婚檰鐨勪汉鏄笉鏄鐞嗗憳銆傜鐞嗗憳鍙互鐪嬪綋鍓嶄綋妫�鍙蜂笅鎵�鏈夐」鐩�
// if (sysUser.getUserName().equals("10001")) {
// QueryWrapper<TjOrderRemark> wqq = new QueryWrapper<>();
@@ -1418,7 +1447,7 @@
// }
LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
if ((null != sysUser && !sysUser.getUserName().equals("10001")) && 100!=ksId) {
- wq2.eq(TjProject::getDeptId, ksId);
+ wq2.in(TjProject::getDeptId,split);
}
//鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
wq2.eq(TjProject::getNeedReport,"Y");
@@ -1481,7 +1510,10 @@
// }
TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
- List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);
+
+// List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);
+ List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId,tjNumber);
+
if (null == proParentList || proParentList.size()==0) {
Map<String, Object> map = new HashMap<>();
map.put("xiaoJieIds", null);
--
Gitblit v1.8.0