From 56fb79ce92bfcb4fd3526e12121dc517dd3b9ca9 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 01 二月 2024 14:46:38 +0800
Subject: [PATCH] zjh 本地 2024/02/2 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index b94ca7d..6fc5f47 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -12,7 +12,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.utils.bean.BeanUtils;
+import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.treeUtil.TreeSelect;
import com.ltkj.system.service.ISysConfigService;
@@ -57,6 +59,20 @@
private DictProSfxmService dictProSfxmService;
@Autowired
private ITjRulesService tjRulesService;
+ @Resource
+ private TestMapper testMapper;
+
+
+ @GetMapping("/getTjHyBgList")
+ @ApiOperation(value = "鏌ヨlis鏁版嵁搴撻」鐩俊鎭帴鍙�")
+ public AjaxResult getTjHyBgList(@RequestParam(required = false)String pacCode,
+ @RequestParam(required = false)String pacName,
+ @RequestParam(required = false)String pacRemark) {
+ List<Map<String, Object>> maps = testMapper.getTjHyBgList(pacCode,pacName,pacRemark);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ return AjaxResult.success(maps);
+ }
+
/**
* 鏌ヨ浣撴椤圭洰鍒楄〃
@@ -66,27 +82,20 @@
public AjaxResult getlist(@RequestParam(required = false) @ApiParam(value = "椤圭洰鍚嶇О") String proName,
@RequestParam(required = false) @ApiParam(value = "妫�鏌ョ被鍒�") String checkType,
@RequestParam(required = false) @ApiParam(value = "閮ㄩ棬id") String deptId) {
- LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
- wq0.eq(TjProject::getProParentId, 0);
- if(null !=proName){
- wq0.like(TjProject::getProName,proName);
- }
- if(null !=checkType){
- wq0.like(TjProject::getProCheckType,checkType);
- }
- if(null !=deptId){
- wq0.like(TjProject::getDeptId,deptId);
- }
+ //涓婇潰鐨勬崲sql
+ final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);
- List<TjProject> tjProjects = tjProjectService.list(wq0);
if (tjProjects != null) {
for (TjProject project : tjProjects) {
LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjProject::getProParentId, project.getProId());
+ if(null !=proName) {
+ wq1.like(TjProject::getProName, proName);
+ }
List<TjProject> projectList = tjProjectService.list(wq1);
project.setTjProjectList(projectList);
- //鏍规嵁姣忎釜椤圭洰鐨刣eptId鎷垮埌name 2023/2/7
+
SysDept sysDept = deptService.selectDeptById(project.getDeptId());
if (sysDept!=null){
project.setDeptName(sysDept.getDeptName());
@@ -125,7 +134,7 @@
/**
* 瀵煎嚭浣撴椤圭洰鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('hosp:project:export')")
+ //@PreAuthorize("@ss.hasPermi('hosp:project:export')")
@Log(title = "浣撴椤圭洰", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation(value = "瀵煎嚭浣撴椤圭洰鍒楄〃")
@@ -138,7 +147,7 @@
/**
* 鑾峰彇浣撴椤圭洰璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('hosp:project:query')")
+ //@PreAuthorize("@ss.hasPermi('hosp:project:query')")
@GetMapping(value = "/{proId}")
@ApiOperation(value = "鑾峰彇浣撴椤圭洰璇︾粏淇℃伅")
public AjaxResult getInfo(@PathVariable("proId") @ApiParam(value = "浣撴椤圭洰id") Long proId) {
@@ -174,7 +183,7 @@
/**
* 鏂板浣撴椤圭洰
*/
- @PreAuthorize("@ss.hasPermi('hosp:project:add')")
+ //@PreAuthorize("@ss.hasPermi('hosp:project:add')")
@ApiOperation(value = "鏂板浣撴椤圭洰")
@Log(title = "浣撴椤圭洰", businessType = BusinessType.INSERT)
@PostMapping
@@ -245,7 +254,7 @@
/**
* 淇敼浣撴椤圭洰
*/
- @PreAuthorize("@ss.hasPermi('hosp:project:edit')")
+ //@PreAuthorize("@ss.hasPermi('hosp:project:edit')")
@Log(title = "浣撴椤圭洰", businessType = BusinessType.UPDATE)
@PutMapping
@ApiOperation(value = "淇敼浣撴椤圭洰")
@@ -271,6 +280,7 @@
List<TjProject> list = tjProjectService.getTjProjectListBySoneId(String.valueOf(tjProject.getProId()));
if (null != list && list.size() > 0) {
for (TjProject project : list) {
+ project.setDeptId(tjProject.getDeptId());
project.setProType(tjProject.getProType());
project.setProCheckMethod(tjProject.getProCheckMethod());
project.setProStatus(tjProject.getProStatus());
@@ -295,6 +305,9 @@
}
}
TjProject byId1 = tjProjectService.selectTjProjectByProId(tjProject.getProParentId());
+ if(null !=byId1 && !tjProject.getDeptId().equals(byId1.getDeptId())){
+ return AjaxResult.error("涓嶅彲鏇存敼鐖堕」鐩瀹�!");
+ }
if(null !=byId1){
tjProject.setIsSampling(byId1.getIsSampling());
}
@@ -344,7 +357,7 @@
/**
* 鍒犻櫎浣撴椤圭洰
*/
- @PreAuthorize("@ss.hasPermi('hosp:project:remove')")
+ // @PreAuthorize("@ss.hasPermi('hosp:project:remove')")
@Log(title = "浣撴椤圭洰", businessType = BusinessType.DELETE)
@DeleteMapping("/{proIds}")
@ApiOperation(value = "鍒犻櫎浣撴椤圭洰(鍙垹闄ょ埗椤圭洰鍜屽瓙椤圭洰)")
--
Gitblit v1.8.0