From bda1ce873514c0848c4ad76bdd2274f01ab5dcc1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 11 八月 2025 08:48:08 +0800
Subject: [PATCH] zjh202500811
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 135 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 126 insertions(+), 9 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 130f15c..87e2060 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
@@ -27,6 +27,7 @@
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import net.sf.ehcache.constructs.scheduledrefresh.OverseerJob;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.session.SqlSession;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -73,6 +74,8 @@
private RedisCache redisCache;
@Autowired
private TjProjectXgjlService xgjlService;
+ @Autowired
+ private TjBzProService bzProService;
@GetMapping("/getTjHyBgList")
@@ -94,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) {
@@ -361,10 +364,11 @@
return AjaxResult.error("璇ラ」鐩鍦ㄥ椁愪腑浣跨敤,鏆傛椂涓嶈兘鍋滅敤");
}
if(tjProject.getProParentId() !=0){
- LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
- wq.eq(TjProject::getProParentId, tjProject.getProParentId());
- wq.eq(TjProject::getProStatus,0);
- List<TjProject> list = tjProjectService.list(wq);
+// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjProject::getProParentId, tjProject.getProParentId());
+// wq.eq(TjProject::getProStatus,0);
+// List<TjProject> list = tjProjectService.list(wq);
+ List<TjProject> list = tjProjectService.getTjProjectListBySoneId(tjProject.getProParentId().toString());
if (null != list && !list.isEmpty()) {
int i = list.size();
if(i<2) return AjaxResult.error("鑷冲皯淇濈暀涓�涓瓙椤圭洰,涓嶅彲鍏ㄩ儴鍋滅敤!!!");
@@ -593,7 +597,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<>();
@@ -606,11 +610,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<>();
@@ -692,7 +701,7 @@
}
- @GetMapping("/updateProByBblx")
+ @PostMapping("/updateProByBblx")
@ApiOperation(value = "淇敼鎵�閫夐」鐩殑鏍囨湰绫诲瀷")
@Transactional
public AjaxResult updateProByBblx(@ApiParam(value = "椤圭洰ID闆嗗悎")@RequestParam(required = false) List<String> proIds,
@@ -713,4 +722,112 @@
+
+
+
+ @GetMapping("/getProListByBwwh")
+ @ApiOperation(value = "鏌ヨ閮ㄤ綅瀵瑰簲椤圭洰鎴栨湭瀵瑰簲閮ㄤ綅鐨勯」鐩�")
+ public AjaxResult getProListByBwwh(@ApiParam(value = "鏍囨湰绫诲瀷")@RequestParam(required = false) String bw) {
+ try {
+ List<TjProject> projectList =tjProjectService.getProListByBwwh(bw);
+ return AjaxResult.success(projectList);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @GetMapping("/delProByBbwwh")
+ @ApiOperation(value = "鍒犻櫎椤圭洰瀵瑰簲閮ㄤ綅")
+ @Transactional
+ public AjaxResult delProByBbwwh(@ApiParam(value = "椤圭洰ID")@RequestParam(required = false) String proId) {
+ try {
+ TjProject tjProject = tjProjectService.getById(proId);
+ tjProject.setCheckBw(null);
+ tjProjectService.updateById(tjProject);
+ return AjaxResult.success();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @PostMapping("/updateProByBwwh")
+ @ApiOperation(value = "淇敼鎵�閫夐」鐩殑閮ㄤ綅")
+ @Transactional
+ public AjaxResult updateProByBwwh(@ApiParam(value = "椤圭洰ID闆嗗悎")@RequestParam(required = false) List<String> proIds,
+ @ApiParam(value = "鏍囨湰绫诲瀷")@RequestParam(required = false)String bw) {
+ try {
+ if(null != proIds && !proIds.isEmpty()){
+ for (String proId : proIds) {
+ TjProject tjProject = tjProjectService.getById(proId);
+ tjProject.setCheckBw(bw);
+ tjProjectService.updateById(tjProject);
+ }
+ }
+ return AjaxResult.success();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+ @PostMapping("/addOrupdateProByBz")
+ @ApiOperation(value = "鏂板鎴栦慨鏀规墍閫夐」鐩殑瀵瑰簲鐥呯淇℃伅")
+ @Transactional
+ public AjaxResult addOrupdateProByBz(@ApiParam(value = "椤圭洰ID闆嗗悎")@RequestParam(required = false) List<String> proIds,
+ @ApiParam(value = "鐥呯ID")@RequestParam(required = false)String bz) {
+ try {
+ if(null != proIds && !proIds.isEmpty()){
+ bzProService.remove(new LambdaQueryWrapper<>(TjBzPro.class).eq(TjBzPro::getBzId,bz));
+ for (String proId : proIds) {
+ TjBzPro bzPro=new TjBzPro();
+ bzPro.setBzId(Long.valueOf(bz));
+ bzPro.setProId(Long.valueOf(proId));
+ bzProService.save(bzPro);
+ }
+ }
+ return AjaxResult.success();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+ @GetMapping("/getProByBz")
+ @ApiOperation(value = "鏌ヨ鐥呯瀵瑰簲椤圭洰")
+ public AjaxResult getProByBz(@ApiParam(value = "鐥呯ID")@RequestParam(required = false)String bz) {
+ try {
+ 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);
+ }
+ }
+
+
+ @DeleteMapping("/delProByBz")
+ @ApiOperation(value = "鍒犻櫎鐥呯瀵瑰簲椤圭洰")
+ public AjaxResult delProByBz(@ApiParam(value = "鐥呯ID")@RequestParam(required = false)String bz,
+ @ApiParam(value = "椤圭洰ID")@RequestParam(required = false)String proId) {
+ try {
+ bzProService.remove(new LambdaQueryWrapper<>(TjBzPro.class).eq(TjBzPro::getBzId,bz).eq(TjBzPro::getProId,proId));
+ return AjaxResult.success();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+
}
--
Gitblit v1.8.0