From 9f087e0cdec5679b2a2c3b16ad0115196f32d15b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 08 一月 2025 17:50:14 +0800
Subject: [PATCH] zjh20250108

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java |   44 ++++++++++++++++++++++++++++++--------------
 1 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
index 68b21fc..fae6ec7 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
@@ -22,6 +22,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -56,16 +57,8 @@
     private ITjConsumablesService tjConsumablesService;
     @Resource
     private ISysConfigService configService;
-
-    @Resource
-    private TjAsyncService asyncService;
-
-    @Resource
-    private RedisCache redisCache;
-
     @Autowired
     private IMallKeywordService mallKeywordService;
-
     @Autowired
     private IMallCategoryService mallCategoryService;
 
@@ -75,7 +68,7 @@
     public TableDataInfo getPacList(@ApiParam(value = "浣撴濂楅瀵硅薄") TjPackage tjPackage) {
         startPage();
         List<TjPackage> list = tjPackageService.selectTjPackageList(tjPackage);
-        if (null != list && list.size() > 0) {
+        if (null != list && !list.isEmpty()) {
             for (TjPackage aPackage : list) {
                 aPackage.setAllProName(tjPackageService.getTjPacProNames(String.valueOf(aPackage.getPacId())));
                 final String keywords = aPackage.getKeywords();
@@ -139,7 +132,7 @@
     public TableDataInfo list(@ApiParam(value = "浣撴濂楅瀵硅薄") TjPackage tjPackage) {
         startPage();
         List<TjPackage> list = tjPackageService.selectTjPackageList(tjPackage);
-        if (null != list && list.size() > 0) {
+        if (null != list && !list.isEmpty()) {
             for (TjPackage aPackage : list) {
                 StringBuilder allProName = new StringBuilder();
                 StringBuilder allSonName = new StringBuilder();
@@ -398,7 +391,7 @@
         tjPackage.setPym(PinyinUtil.getFirstLetter(tjPackage.getPacName(),""));
         if (tjPackageService.save(tjPackage)) {
             List<TjProject> tjProjectList = tjPackage.getTjProjectList();
-            if (null != tjProjectList && tjProjectList.size() > 0) {
+            if (null != tjProjectList && !tjProjectList.isEmpty()) {
                 BigDecimal money = new BigDecimal("0.00");
                 for (TjProject tjProject : tjProjectList) {
                     TjPackageProject tjpp = new TjPackageProject();
@@ -442,7 +435,7 @@
         tjPackage.setPym(PinyinUtil.getFirstLetter(tjPackage.getPacName(),""));
         if (tjPackageService.updateById(tjPackage)) {
             List<TjProject> tjProjectList = tjPackage.getTjProjectList();
-            if (null != tjProjectList && tjProjectList.size() > 0) {
+            if (null != tjProjectList && !tjProjectList.isEmpty()) {
                 LambdaQueryWrapper<TjPackageProject> wq = new LambdaQueryWrapper<>();
                 wq.eq(TjPackageProject::getPacId, tjPackage.getPacId());
                 ppservice.remove(wq);
@@ -569,7 +562,7 @@
             LambdaQueryWrapper<TjPackage> wq0 = new LambdaQueryWrapper<>();
             wq0.like(TjPackage::getPacName, name);
             List<TjPackage> packageList = tjPackageService.list(wq0);
-            if (null != packageList && packageList.size() > 0) {
+            if (null != packageList && !packageList.isEmpty()) {
                 for (TjPackage aPackage : packageList) {
                     List<TjProject> tjProjectList = new ArrayList<>();
                     LambdaQueryWrapper<TjPackageProject> wq = new LambdaQueryWrapper<>();
@@ -610,7 +603,7 @@
             }
 
             List<TjPackage> tjPackageList = tjPackageService.list();
-            if (null != tjPackageList && tjPackageList.size() > 0) {
+            if (null != tjPackageList && !tjPackageList.isEmpty()) {
                 List<TjPackage> lisi = new ArrayList<>();
                 for (TjPackage aPackage : tjPackageList) {
                     String pinyin = PinyinUtil.getFirstLetter(aPackage.getPacName(), "");
@@ -658,4 +651,27 @@
         }
         return AjaxResult.error("璇疯緭鍏ヤ綘瑕佹煡璇㈢殑鍐呭");
     }
+
+
+    @PostMapping("/saveOreditTjPacNew")
+    @ApiOperation(value = "浣撴濂楅鏂板淇敼鎺ュ彛")
+    public AjaxResult saveOreditTjPacNew(@RequestBody @ApiParam(value = "浣撴濂楅瀵硅薄") TjPackage tjPackage) {
+        tjPackage.setPym(PinyinUtil.getFirstLetter(tjPackage.getPacName(),""));
+        if (tjPackageService.saveOrUpdate(tjPackage)) {
+            List<TjPackageProject> projectList = tjPackage.getPackageProjects();
+            if (null != projectList && !projectList.isEmpty()) {
+                if(StringUtil.isNotBlank(tjPackage.getPacId())){
+                    if (ppservice.deleteTjPackageProjectByPacId(tjPackage.getPacId())) {
+                        for (TjPackageProject project : projectList) {
+                            project.setPacId(tjPackage.getPacId());
+                            ppservice.save(project);
+                        }
+
+                    }
+                }
+            }
+            return AjaxResult.success();
+        }
+        return AjaxResult.error();
+    }
 }

--
Gitblit v1.8.0