From c96b05ab329834d16ec2aad7a35e66dfa02511c1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:40:34 +0800
Subject: [PATCH] #获取正常还车

---
 server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
index 6a8a8b5..710465c 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
@@ -16,6 +16,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
+import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -72,13 +73,18 @@
 
     @Override
     public void deleteById(String id) {
-        baseParamMapper.deleteById(id);
+        BaseParam baseParam = new BaseParam();
+        baseParam.setId(id);
+        baseParam.setEditDate(new Date());
+        baseParam.setIsdeleted(Constants.ONE);
+        baseParamMapper.updateById(baseParam);
     }
 
     @Override
     public void delete(BaseParam baseParam) {
-        UpdateWrapper<BaseParam> deleteWrapper = new UpdateWrapper<>(baseParam);
-        baseParamMapper.delete(deleteWrapper);
+//      UpdateWrapper<BaseParam> deleteWrapper = new UpdateWrapper<>(baseParam);
+        baseParam.setIsdeleted(Constants.ONE);
+        baseParamMapper.updateById(baseParam);
     }
 
     @Override
@@ -87,7 +93,9 @@
         if (CollectionUtils.isEmpty(ids)) {
             return;
         }
-        baseParamMapper.deleteBatchIds(ids);
+       for(String id :ids){
+           deleteById(id);
+       }
     }
 
     @Override
@@ -97,7 +105,7 @@
         wrapper.lambda()
                 .eq(BaseParam::getType,baseParam.getType())
                 .eq(BaseParam::getIsdeleted,Constants.ZERO)
-                .eq(BaseParam::getType,baseParam.getName());
+                .eq(BaseParam::getName,baseParam.getName());
 
         BaseParam baseParam1 = baseParamMapper.selectOne(wrapper.last(" limit 1"));
         if (Objects.nonNull(baseParam1) && !baseParam1.getId().equals(baseParam.getId())){
@@ -138,6 +146,7 @@
     @Override
     public List<BaseParam> findList(BaseParam baseParam) {
         QueryWrapper<BaseParam> wrapper = new QueryWrapper<>(baseParam);
+        baseParam.setIsdeleted(Constants.ZERO);
         wrapper.orderByAsc("sortnum");
         return baseParamMapper.selectList(wrapper);
     }
@@ -193,6 +202,7 @@
     @Override
     public long count(BaseParam baseParam) {
         QueryWrapper<BaseParam> wrapper = new QueryWrapper<>(baseParam);
+        baseParam.setIsdeleted(Constants.ZERO);
         return baseParamMapper.selectCount(wrapper);
     }
 }

--
Gitblit v1.9.3