From 69c9af799f03e3700ce15a9b81dacb1e1d61591d Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Wed, 29 Nov 2023 16:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/api/user/OptionalEbomApi.java      | 24 ++++++++++++++--
 .../service/OptionalEbomConfigRService.java   |  5 ++++
 .../service/OptionalEbomConfigService.java    | 28 +++++++++++++++++++
 3 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java
index 3caa6732..013067c3 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java
@@ -167,7 +167,7 @@ public class OptionalEbomApi extends BaseApi {
 
     @PostMapping("submitTmpWork")
     @ApiOperation("提交生成暂存")
-    public ResultVO<Boolean> submitTmp(@RequestBody OptionalEbomConfigDTO dto) {
+    public ResultVO<Boolean> submitTmpWork(@RequestBody OptionalEbomConfigDTO dto) {
         try {
             return ResultVO.success(optionalEbomConfigService.buildTmpWork(dto));
         } catch (NflgBusinessException e) {
@@ -176,6 +176,10 @@ public class OptionalEbomApi extends BaseApi {
 
     }
 
+
+
+
+
     @PostMapping("getTmpListPage")
     @ApiOperation("暂存方案分页数据")
     public ResultVO<IPage<OptionalEbomConfigVO>> getTmpListPage(@RequestBody OptionalEbomConfigListQuery query) {
@@ -184,13 +188,29 @@ public class OptionalEbomApi extends BaseApi {
     }
 
 
+
+    @DeleteMapping("deleteTmp")
+    @ApiOperation("删除暂存")
+    public ResultVO<Boolean> deleteTmp(@RequestBody List<Long> rowIds) {
+
+        if(CollectionUtil.isNotEmpty(rowIds)){
+            return ResultVO.error("选择删除的数据");
+        }
+        try {
+            return ResultVO.success(this.optionalEbomConfigService.deleteTmps(rowIds));
+        } catch (Exception e) {
+            return ResultVO.error(e.getMessage());
+        }
+    }
+
+
     @GetMapping("tmpOptionTree")
     @ApiOperation("暂存数据选项")
     public ResultVO<OptionalEbomConfigTmpAggregVO> tmpOptionTree(@ApiParam("暂存id") @RequestParam("rowId") Long rowId) {
         return ResultVO.success(aggregOptionConfigService.tmpOptionTree(rowId));
     }
 
-    @PutMapping("submiTmpOptionTree")
+    @PostMapping ("submiTmpOptionTree")
     @ApiOperation("变更暂存数据")
     public ResultVO<Boolean> submiTmpOptionTree(OptionalEbomConfigDTO   dto) {
         return ResultVO.success(aggregOptionConfigService.submiTmpOptionTree(dto));
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigRService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigRService.java
index f13635d6..b49275d7 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigRService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigRService.java
@@ -40,5 +40,10 @@ public class OptionalEbomConfigRService extends ServiceImpl<OptionalEbomConfigRM
 
     }
 
+
+
+
+
+
 }
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java
index a9303be3..f63f6f6f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java
@@ -1,6 +1,7 @@
 package com.nflg.product.bomnew.service;
 
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,6 +14,7 @@ import com.nflg.product.bomnew.constant.OptionalBomConstant;
 import com.nflg.product.bomnew.mapper.master.OptionalEbomConfigMapper;
 import com.nflg.product.bomnew.pojo.dto.OptionalEbomConfigDTO;
 import com.nflg.product.bomnew.pojo.entity.OptionalEbomConfigEntity;
+import com.nflg.product.bomnew.pojo.entity.OptionalEbomConfigREntity;
 import com.nflg.product.bomnew.pojo.entity.OptionalEbomMainEntity;
 import com.nflg.product.bomnew.pojo.query.OptionalEbomConfigListQuery;
 import com.nflg.product.bomnew.pojo.query.OptionalEbomMainQuery;
@@ -103,7 +105,29 @@ public class OptionalEbomConfigService extends ServiceImpl<OptionalEbomConfigMap
         return optionalEbomConfigRService.insertConfigRelation(rowId,rList);
     }
 
+    /**
+     * 删除暂存数据
 
+     * @return
+     */
+    public  Boolean deleteTmps(List<Long> rowIds ){
+
+        QueryWrapper<OptionalEbomConfigEntity> wrapper=new QueryWrapper();
+        wrapper.lambda().in(OptionalEbomConfigEntity::getRowId,rowIds);
+        wrapper.lambda().eq(OptionalEbomConfigEntity::getEditStatus,OptionalBomConstant.PublishEnum.TMP.getValue());
+        wrapper.lambda().eq(OptionalEbomConfigEntity::getCreatedBy,SessionUtil.getUserCode());
+
+        Boolean result= this.remove(wrapper);
+        if(result) {
+            QueryWrapper<OptionalEbomConfigREntity> wrapperR = new QueryWrapper();
+            wrapperR.lambda().in(OptionalEbomConfigREntity::getParentRowId, rowIds);
+
+            optionalEbomConfigRService.remove(wrapperR);
+        }
+
+        return  true;
+
+    }
 
     /**
      * 编辑暂存数据
@@ -125,6 +149,10 @@ public class OptionalEbomConfigService extends ServiceImpl<OptionalEbomConfigMap
 
     }
 
+
+
+
+
     /**
      * 暂存选项
      * @param rowId