From 9155df2aeab5b0d95c89dd928dbaefbfbaeae9d1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 九月 2024 17:10:35 +0800
Subject: [PATCH] zjh 2024-09-05
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 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 74dbb7c..fe83d88 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
@@ -10,6 +10,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.core.redis.RedisCache;
@@ -26,6 +27,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;
@@ -85,7 +87,7 @@
public AjaxResult getDxList() {
List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
String config = configService.selectConfigByKey("tj_dxsxtj");
- if(null !=config && config.equals("N")){
+ if (null != config && config.equals("N")) {
tjProjects = tjProjectService.getOpenDxTjProjectList();
}
if (tjProjects != null) {
@@ -95,14 +97,11 @@
}
}
String key = configService.selectConfigByKey("is_open_sfxm");
- Map<String,Object> map=new HashMap<>();
- map.put("list",tjProjects);
- map.put("key",key);
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", tjProjects);
+ map.put("key", key);
return AjaxResult.success(map);
}
-
-
-
/**
@@ -140,18 +139,18 @@
*/
@GetMapping("/getAllChildListById")
@ApiOperation(value = "鏌ヨ椤圭洰瀛愰」")
- public AjaxResult getAllChildListById(@RequestParam(required = false)String 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);
+ LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+ if (proId != null) {
+ wq.eq(TjProject::getProParentId, proId);
}
- if (proName!=null){
- wq.like(TjProject::getProName,proName);
+ if (proName != null) {
+ wq.like(TjProject::getProName, proName);
}
- if (checkType!=null){
- wq.eq(TjProject::getProCheckType,checkType);
+ if (checkType != null) {
+ wq.eq(TjProject::getProCheckType, checkType);
}
List<TjProject> tjProjects = tjProjectService.list(wq);
// List<TjProject> tjProjects = tjProjectService.getAllChildListById(proId);
@@ -211,7 +210,6 @@
List<TjProject> tjProjects = tjProjectService.list(wq);
return AjaxResult.success(tjProjects);
}
-
/**
@@ -278,6 +276,7 @@
if (null != tjProject.getTjStandardList() && tjProject.getTjStandardList().size() > 0) {
tjProject.setProStandard(1);
}
+ tjProject.setProEngName(PinyinUtil.getFirstLetter(tjProject.getProName(),""));
if (tjProjectService.save(tjProject)) {
if (null != tjProject.getSfxmId()) {
DictProSfxm proSfxm = new DictProSfxm();
@@ -350,6 +349,7 @@
return AjaxResult.error("璇ラ」鐩鍦ㄥ椁愪腑浣跨敤,鏆傛椂涓嶈兘鍋滅敤");
}
}
+ tjProject.setProEngName(PinyinUtil.getFirstLetter(tjProject.getProName(),""));
if (tjProject.getProParentId() == 0) {
if (tjProjectService.updateById(tjProject)) {
if (dictProSfxmService.deletedProSfxm(tjProject.getProId())) {
@@ -444,6 +444,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("璇烽�夋嫨瑕佸垹闄ょ殑椤圭洰");
@@ -475,6 +476,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);
}
}
}
@@ -544,13 +548,13 @@
public AjaxResult getProParentIdDxList() {
List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
String config = configService.selectConfigByKey("tj_dxsxtj");
- if(null !=config && config.equals("N")){
+ 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);
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", tjProjects);
+ map.put("key", key);
return AjaxResult.success(map);
}
@@ -559,9 +563,9 @@
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);
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", projectList);
+ map.put("key", key);
return AjaxResult.success(map);
}
--
Gitblit v1.8.0