From 4dc5a1ece2a58f768dea5c829bff9da842a6de95 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期六, 15 六月 2024 15:02:22 +0800
Subject: [PATCH] zjh 本地 2024/06/15 --2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 140 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 111 insertions(+), 29 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 c4e4481..d7d35df 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
@@ -26,6 +26,7 @@
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
@@ -77,6 +78,30 @@
return AjaxResult.success(maps);
}
+ /**
+ * 閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�
+ */
+ @GetMapping("/getDxList")
+ @ApiOperation(value = "閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
+ public AjaxResult getDxList() {
+ List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
+ String config = configService.selectConfigByKey("tj_dxsxtj");
+ if (null != config && config.equals("N")) {
+ tjProjects = tjProjectService.getOpenDxTjProjectList();
+ }
+ if (tjProjects != null) {
+ for (TjProject project : tjProjects) {
+ List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
+ project.setTjProjectList(projectList);
+ }
+ }
+ String key = configService.selectConfigByKey("is_open_sfxm");
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", tjProjects);
+ map.put("key", key);
+ return AjaxResult.success(map);
+ }
+
/**
* 鏌ヨ浣撴椤圭洰鍒楄〃
@@ -89,17 +114,17 @@
//涓婇潰鐨勬崲sql
final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);
- if (tjProjects != null) {
- for (TjProject project : tjProjects) {
- List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
- project.setTjProjectList(projectList);
- SysDept sysDept = deptService.selectDeptById(project.getDeptId());
- if (sysDept != null) {
- project.setDeptName(sysDept.getDeptName());
- }
-
- }
- }
+// if (tjProjects != null) {
+// for (TjProject project : tjProjects) {
+// List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
+// project.setTjProjectList(projectList);
+// SysDept sysDept = deptService.selectDeptById(project.getDeptId());
+// if (sysDept != null) {
+// project.setDeptName(sysDept.getDeptName());
+// }
+//
+// }
+// }
String key = configService.selectConfigByKey("is_open_sfxm");
Map<String, Object> map = new HashMap<>();
map.put("list", tjProjects);
@@ -113,8 +138,21 @@
*/
@GetMapping("/getAllChildListById")
@ApiOperation(value = "鏌ヨ椤圭洰瀛愰」")
- public AjaxResult getAllChildListById(String proId) {
- List<TjProject> tjProjects = tjProjectService.getAllChildListById(proId);
+ public AjaxResult getAllChildListById(@RequestParam(required = false) String proId,
+ @RequestParam(required = false) String proName,
+ @RequestParam(required = false) String checkType) {
+ LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+ if (proId != null) {
+ wq.eq(TjProject::getProParentId, proId);
+ }
+ if (proName != null) {
+ wq.like(TjProject::getProName, proName);
+ }
+ if (checkType != null) {
+ wq.eq(TjProject::getProCheckType, checkType);
+ }
+ List<TjProject> tjProjects = tjProjectService.list(wq);
+// List<TjProject> tjProjects = tjProjectService.getAllChildListById(proId);
if (tjProjects != null) {
for (TjProject project : tjProjects) {
SysDept sysDept = deptService.selectDeptById(project.getDeptId());
@@ -133,27 +171,45 @@
}
+ @GetMapping("/getPacTjProjectList")
+ @ApiOperation(value = "缁存姢濂楅椤甸潰鏂板椤圭洰鏃惰皟鐢�")
+ public AjaxResult getPacTjProjectList() {
+ List<TjProject> tjProjects = tjProjectService.getPacTjProjectList();
+ return AjaxResult.success(tjProjects);
+ }
+
+
/**
* 鏌ヨ浣撴椤圭洰鍒楄〃
*/
@GetMapping("/list")
@ApiOperation(value = "鏌ヨ浣撴椤圭洰鍒楄〃")
public AjaxResult list() {
- LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
- wq.eq(TjProject::getProParentId, 0);
- wq.eq(TjProject::getProStatus, 0);
- List<TjProject> tjProjects = tjProjectService.list(wq);
+// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjProject::getProParentId, 0);
+// wq.eq(TjProject::getProStatus, 0);
+ List<TjProject> tjProjects = tjProjectService.getTjProjectList();
if (tjProjects != null) {
for (TjProject project : tjProjects) {
- LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjProject::getProParentId, project.getProId());
- List<TjProject> projectList = tjProjectService.list(wq1);
+ List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
project.setTjProjectList(projectList);
}
return AjaxResult.success(tjProjects);
}
return AjaxResult.success(null);
}
+
+
+ @GetMapping("/getPacProList")
+ @ApiOperation(value = "鏌ヨ浣撴椤圭洰鍒楄〃")
+ public AjaxResult getPacProList() {
+ LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjProject::getProParentId, 0);
+ wq.eq(TjProject::getProStatus, 0);
+ List<TjProject> tjProjects = tjProjectService.list(wq);
+ return AjaxResult.success(tjProjects);
+ }
+
/**
* 瀵煎嚭浣撴椤圭洰鍒楄〃
@@ -385,6 +441,7 @@
@Log(title = "浣撴椤圭洰", businessType = BusinessType.DELETE)
@DeleteMapping("/{proIds}")
@ApiOperation(value = "鍒犻櫎浣撴椤圭洰(鍙垹闄ょ埗椤圭洰鍜屽瓙椤圭洰)")
+ @Transactional
public AjaxResult remove(@PathVariable Long[] proIds) {
if (null == proIds || proIds.length <= 0) {
return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑椤圭洰");
@@ -416,6 +473,9 @@
wq.eq(TjStandard::getProId, proId);
tjStandardService.remove(wq);
tjProjectService.removeById(project1.getProId());
+ TjProject project = tjProjectService.getById(project1.getProParentId());
+ project.setProPrice(tjProjectService.getMoneys(project1.getProParentId().toString()));
+ tjProjectService.updateById(project);
}
}
}
@@ -471,17 +531,39 @@
*/
@GetMapping(value = "/getInfoByProId")
@ApiOperation(value = "鑾峰彇浣撴椤圭洰璇︾粏淇℃伅")
- public AjaxResult getInfoByProId(Long proId) {
+ public AjaxResult getInfoByProId(@RequestParam Long proId) {
TjProject tjProject = tjProjectService.getById(proId);
return AjaxResult.success(tjProject);
}
-// /**
-// * 鑾峰彇閮ㄩ棬鏍戝垪琛�
-// */
-// @GetMapping("/deptTree")
-// @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�")
-// public AjaxResult deptTree(SysDept dept) {
-// return success(deptService.selectDeptTreeList(dept));
-// }
+
+
+ /**
+ * 閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�
+ */
+ @GetMapping("/getProParentIdDxList")
+ @ApiOperation(value = "閫夋嫨浣撴椤圭洰(鎵�鏈夋湇椤圭洰)閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
+ public AjaxResult getProParentIdDxList() {
+ List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
+ String config = configService.selectConfigByKey("tj_dxsxtj");
+ if (null != config && config.equals("N")) {
+ tjProjects = tjProjectService.getOpenDxTjProjectList();
+ }
+ String key = configService.selectConfigByKey("is_open_sfxm");
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", tjProjects);
+ map.put("key", key);
+ return AjaxResult.success(map);
+ }
+
+ @GetMapping("/getProSonDxList")
+ @ApiOperation(value = "閫夋嫨浣撴椤圭洰(鏍规嵁鐖堕」id閫夋嫨瀛愰」)閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
+ public AjaxResult getProSonDxList(@RequestParam String proId) {
+ List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(proId);
+ String key = configService.selectConfigByKey("is_open_sfxm");
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", projectList);
+ map.put("key", key);
+ return AjaxResult.success(map);
+ }
}
--
Gitblit v1.8.0