From 8e4922026e05dceffa44d913a234bbc489f1be6c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 23 七月 2025 17:16:14 +0800
Subject: [PATCH] zjh20250723
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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 f1b3506..06b7df1 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
@@ -18,6 +18,7 @@
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.treeUtil.TreeSelect;
+import com.ltkj.mall.service.IMallKeywordService;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import io.swagger.annotations.Api;
@@ -74,6 +75,8 @@
private TjProjectXgjlService xgjlService;
@Autowired
private TjBzProService bzProService;
+ @Autowired
+ private IMallKeywordService mallKeywordService;
@GetMapping("/getTjHyBgList")
@@ -95,7 +98,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) {
@@ -159,6 +162,7 @@
if (checkType != null) {
wq.eq(TjProject::getProCheckType, checkType);
}
+ wq.orderByAsc(TjProject::getXh);
List<TjProject> tjProjects = tjProjectService.list(wq);
// List<TjProject> tjProjects = tjProjectService.getAllChildListById(proId);
if (tjProjects != null) {
@@ -361,10 +365,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("鑷冲皯淇濈暀涓�涓瓙椤圭洰,涓嶅彲鍏ㄩ儴鍋滅敤!!!");
@@ -472,8 +477,11 @@
}
// bigDecimal.add(tjProject.getProPrice());
TjProject byId = tjProjectService.getById(proParentId);
- byId.setProPrice(bigDecimal);
- tjProjectService.updateById(byId);
+ if(null != byId){
+ byId.setProPrice(bigDecimal);
+ tjProjectService.updateById(byId);
+ }
+
}
}
return AjaxResult.success();
@@ -589,11 +597,11 @@
*/
@GetMapping("/getProParentIdDxList")
@ApiOperation(value = "閫夋嫨浣撴椤圭洰(鎵�鏈夐〉闈㈤」鐩�)閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
- public AjaxResult getProParentIdDxList() {
+ public AjaxResult getProParentIdDxList(String xb) {
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, xb);
}
String key = configService.selectConfigByKey("is_open_sfxm");
Map<String, Object> map = new HashMap<>();
@@ -606,11 +614,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<>();
--
Gitblit v1.8.0