From 308589effc0fe60876a5794571ede0c211cc828c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 10 一月 2025 17:25:09 +0800
Subject: [PATCH] zjh20250110
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 8 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 2f592be..8b7e808 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
@@ -349,6 +349,8 @@
@ApiOperation(value = "淇敼浣撴椤圭洰")
@Transactional
public AjaxResult edit(@RequestBody @ApiParam(value = "浣撴椤圭洰瀵硅薄") TjProject tjProject) {
+ TjProject ytjproject = tjProjectService.getById(tjProject.getProId());
+ if(null==ytjproject)return AjaxResult.error();
if (tjProject.getProStatus() == 1) {
LambdaQueryWrapper<TjPackageProject> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjPackageProject::getProId, tjProject.getProId());
@@ -356,14 +358,21 @@
if (null != list1 && !list1.isEmpty()) {
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);
+ if (null != list && !list.isEmpty()) {
+ int i = list.size();
+ if(i<2) return AjaxResult.error("鑷冲皯淇濈暀涓�涓瓙椤圭洰,涓嶅彲鍏ㄩ儴鍋滅敤!!!");
+ }
+ }
}
tjProject.setProEngName(PinyinUtil.getFirstLetter(tjProject.getProName(),""));
-
- TjProject ytjproject = tjProjectService.getById(tjProject.getProId());
Date date=new Date();
if (tjProject.getProParentId() == 0) {
if (tjProjectService.updateById(tjProject)) {
- if(null !=ytjproject){
if(ytjproject.getProPrice().compareTo(tjProject.getProPrice())!=0){
TjProjectXgjl xgjl=new TjProjectXgjl();
BeanUtils.copyBeanProp(xgjl,ytjproject);
@@ -371,7 +380,6 @@
xgjl.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
xgjlService.save(xgjl);
}
- }
if (dictProSfxmService.deletedProSfxm(tjProject.getProId())) {
if (null != tjProject.getSfxmId()) {
DictProSfxm proSfxm = new DictProSfxm();
@@ -380,7 +388,11 @@
dictProSfxmService.save(proSfxm);
}
}
- List<TjProject> list = tjProjectService.getTjProjectListBySoneId(String.valueOf(tjProject.getProId()));
+ LambdaQueryWrapper<TjProject> wqq = new LambdaQueryWrapper<>();
+ wqq.eq(TjProject::getProParentId,tjProject.getProId());
+ if(ytjproject.getProStatus()==0)
+ wqq.eq(TjProject::getProStatus,0);
+ List<TjProject> list = tjProjectService.list(wqq);
if (null != list && !list.isEmpty()) {
for (TjProject project : list) {
project.setDeptId(tjProject.getDeptId());
@@ -415,7 +427,6 @@
tjProject.setIsSampling(byId1.getIsSampling());
}
if (tjProjectService.updateById(tjProject)) {
- if(null !=ytjproject){
if(ytjproject.getProPrice().compareTo(tjProject.getProPrice())!=0){
TjProjectXgjl xgjl=new TjProjectXgjl();
BeanUtils.copyBeanProp(xgjl,ytjproject);
@@ -423,7 +434,7 @@
xgjl.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
xgjlService.save(xgjl);
}
- }
+
if (dictProSfxmService.deletedProSfxm(tjProject.getProId())) {
if (null != tjProject.getSfxmId()) {
DictProSfxm proSfxm = new DictProSfxm();
@@ -575,7 +586,7 @@
* 閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�
*/
@GetMapping("/getProParentIdDxList")
- @ApiOperation(value = "閫夋嫨浣撴椤圭洰(鎵�鏈夋湇椤圭洰)閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
+ @ApiOperation(value = "閫夋嫨浣撴椤圭洰(鎵�鏈夐〉闈㈤」鐩�)閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
public AjaxResult getProParentIdDxList() {
List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
String config = configService.selectConfigByKey("tj_dxsxtj");
@@ -584,11 +595,37 @@
}
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("/getProParentIdDxListByFenYe")
+ @ApiOperation(value = "閫夋嫨浣撴椤圭洰(鎵�鏈夐〉闈㈤」鐩�)閫夊崟椤规椂璋冪敤鐨勬帴鍙�(鏈夊垎椤�)")
+ public AjaxResult getProParentIdDxListByFenYe(@RequestParam(defaultValue = "1") int page,@RequestParam(defaultValue = "10") int pageSize) {
+ 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<>();
+
+ if(null !=tjProjects && !tjProjects.isEmpty()){
+ List<TjProject> collect = tjProjects.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+ map.put("total", tjProjects.size());
+ map.put("list", collect);
+ }else {
+ map.put("total",0);
+ map.put("list", tjProjects);
+ }
+ map.put("key", key);
+ return AjaxResult.success(map);
+ }
+
+
@GetMapping("/getProSonDxList")
@ApiOperation(value = "閫夋嫨浣撴椤圭洰(鏍规嵁鐖堕」id閫夋嫨瀛愰」)閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
public AjaxResult getProSonDxList(@RequestParam String proId) {
--
Gitblit v1.8.0