From 027c1328165a0d37a778ec7f58760bb0fe1ffebb Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 30 七月 2025 17:00:01 +0800
Subject: [PATCH] zjh20250730-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 a8dc766..eb40dcf 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
@@ -97,7 +97,7 @@
List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
String config = configService.selectConfigByKey("tj_dxsxtj");
if (null != config && config.equals("N")) {
- tjProjects = tjProjectService.getOpenDxTjProjectList(null);
+ tjProjects = tjProjectService.getOpenDxTjProjectList(null, null);
}
if (tjProjects != null) {
for (TjProject project : tjProjects) {
@@ -596,7 +596,7 @@
List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
String config = configService.selectConfigByKey("tj_dxsxtj");
if (null != config && config.equals("N")) {
- tjProjects = tjProjectService.getOpenDxTjProjectList(null);
+ tjProjects = tjProjectService.getOpenDxTjProjectList(null, null);
}
String key = configService.selectConfigByKey("is_open_sfxm");
Map<String, Object> map = new HashMap<>();
@@ -609,11 +609,16 @@
@GetMapping("/getProParentIdDxListByFenYe")
@ApiOperation(value = "閫夋嫨浣撴椤圭洰(鎵�鏈夐〉闈㈤」鐩�)閫夊崟椤规椂璋冪敤鐨勬帴鍙�(鏈夊垎椤�)")
- public AjaxResult getProParentIdDxListByFenYe(@RequestParam(defaultValue = "1") int page,@RequestParam(defaultValue = "10") int pageSize,String nr) {
+ public AjaxResult getProParentIdDxListByFenYe(@RequestParam(defaultValue = "1") int page,@RequestParam(defaultValue = "10") int pageSize,String nr,String xb) {
List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
String config = configService.selectConfigByKey("tj_dxsxtj");
+ if(StringUtil.isNotBlank(xb)){
+ if(xb.contains("4"))xb="0";
+ if(xb.contains("5"))xb="1";
+ if(xb.contains("4") && xb.contains("5"))xb=null;
+ }
if (null != config && config.equals("N")) {
- tjProjects = tjProjectService.getOpenDxTjProjectList(nr);
+ tjProjects = tjProjectService.getOpenDxTjProjectList(nr,xb);
}
String key = configService.selectConfigByKey("is_open_sfxm");
Map<String, Object> map = new HashMap<>();
@@ -790,8 +795,20 @@
@ApiOperation(value = "鏌ヨ鐥呯瀵瑰簲椤圭洰")
public AjaxResult getProByBz(@ApiParam(value = "鐥呯ID")@RequestParam(required = false)String bz) {
try {
- List<TjBzPro> list = bzProService.list(new LambdaQueryWrapper<>(TjBzPro.class).eq(TjBzPro::getBzId, bz));
- return AjaxResult.success(list);
+ LambdaQueryWrapper<TjBzPro> tjBzProLambdaQueryWrapper = new LambdaQueryWrapper<>(TjBzPro.class);
+ if(StringUtil.isNotBlank(bz)){
+ tjBzProLambdaQueryWrapper.eq(TjBzPro::getBzId, bz);
+ List<TjBzPro> list = bzProService.list(tjBzProLambdaQueryWrapper);
+ for (TjBzPro bzPro : list) {
+ TjProject tjProject = tjProjectService.getById(bzPro.getProId());
+ if(null != tjProject)bzPro.setProName(tjProject.getProName());
+ }
+ return AjaxResult.success(list);
+ }else {
+ List<TjProject> list = tjProjectService.selectTjProjectListByBz();
+ return AjaxResult.success(list);
+ }
+
} catch (Exception e) {
throw new RuntimeException(e);
}
--
Gitblit v1.8.0