From cc7b4e431ec3a2c0918e3e6b306c7d248e2ab756 Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Fri, 12 Jul 2024 16:50:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kms/yxgh/df/service/DfYhPlanService.java     |  6 ++++++
 .../com/kms/yxgh/df/service/DfYhRecordService.java   | 11 ++++++++---
 .../com/kms/yxgh/sz/service/SzYhPlanService.java     |  6 ++++++
 .../com/kms/yxgh/sz/service/SzYhRecordService.java   | 12 +++++++++---
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java
index 14bebe57..269b0f7d 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java
@@ -105,6 +105,12 @@ public class DfYhPlanService extends BaseService<DfYhPlanMapper, DfYhPlan> imple
         if (CollectionUtil.isEmpty(id)) {
             return false;
         }
+        Wrapper<DfYhPlan> wp = Wrappers.<DfYhPlan>lambdaQuery()
+                .in(DfYhPlan::getId, id)
+                .notIn(DfYhPlan::getStatus, ApprovalStatusEnum.SUBMITTING.getValue(), ApprovalStatusEnum.REJECT.getValue());
+        if (this.getBaseMapper().selectCount(wp) > 0) {
+            throw new DfException("存在不能删除的数据");
+        }
         return removeByIds(id);
     }
 
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java
index 53a7fb3d..ccf40dea 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java
@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.system.service.SysUserService;
 import com.kms.yxgh.base.DfException;
-import com.kms.yxgh.base.enums.YhRecordStatus;
 import com.kms.yxgh.common.ApprovalStatusEnum;
 import com.kms.yxgh.common.dto.*;
 import com.kms.yxgh.common.service.ApprovalBusinessService;
@@ -98,14 +97,20 @@ public class DfYhRecordService extends BaseService<DfYhRecordMapper, DfYhRecord>
         if (CollectionUtil.isEmpty(ids)) {
             return false;
         }
+        Wrapper<DfYhRecord> wp = Wrappers.<DfYhRecord>lambdaQuery()
+                .in(DfYhRecord::getId, ids)
+                .notIn(DfYhRecord::getStatus, ApprovalStatusEnum.SUBMITTING.getValue(), ApprovalStatusEnum.REJECT.getValue());
+        if (this.getBaseMapper().selectCount(wp) > 0) {
+            throw new DfException("已确认的记录不能删除");
+        }
         return removeByIds(ids);
     }
 
     private boolean checkStatus(String id) {
         Wrapper<DfYhRecord> wp = Wrappers.<DfYhRecord>lambdaQuery()
                 .eq(DfYhRecord::getId, id)
-                .eq(DfYhRecord::getStatus, YhRecordStatus.CONFIRMED.getValue());
-        return !(this.getBaseMapper().selectCount(wp) > 0);
+                .in(DfYhRecord::getStatus, ApprovalStatusEnum.SUBMITTING.getValue(), ApprovalStatusEnum.REJECT.getValue());
+        return this.getBaseMapper().selectCount(wp) > 0;
     }
 
     private boolean exist(String id) {
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java
index 923d0bbe..e0246f47 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java
@@ -106,6 +106,12 @@ public class SzYhPlanService extends BaseService<SzYhPlanMapper, SzYhPlan> imple
         if (CollectionUtil.isEmpty(ids)) {
             return false;
         }
+        Wrapper<SzYhPlan> wp = Wrappers.<SzYhPlan>lambdaQuery()
+                .in(SzYhPlan::getId, ids)
+                .notIn(SzYhPlan::getStatus, ApprovalStatusEnum.SUBMITTING.getValue(), ApprovalStatusEnum.REJECT.getValue());
+        if (this.getBaseMapper().selectCount(wp) > 0) {
+            throw new DfException("存在不能删除的数据");
+        }
         return removeByIds(ids);
     }
 
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java
index 39a51792..6abb3423 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.system.service.SysUserService;
+import com.kms.yxgh.base.DfException;
 import com.kms.yxgh.base.SzException;
-import com.kms.yxgh.base.enums.YhRecordStatus;
 import com.kms.yxgh.common.ApprovalStatusEnum;
 import com.kms.yxgh.common.dto.*;
 import com.kms.yxgh.common.service.ApprovalBusinessService;
@@ -98,14 +98,20 @@ public class SzYhRecordService extends BaseService<SzYhRecordMapper, SzYhRecord>
         if (CollectionUtil.isEmpty(ids)) {
             return false;
         }
+        Wrapper<SzYhRecord> wp = Wrappers.<SzYhRecord>lambdaQuery()
+                .in(SzYhRecord::getId, ids)
+                .notIn(SzYhRecord::getStatus, ApprovalStatusEnum.SUBMITTING.getValue(), ApprovalStatusEnum.REJECT.getValue());
+        if (this.getBaseMapper().selectCount(wp) > 0) {
+            throw new DfException("已确认的记录不能删除");
+        }
         return removeByIds(ids);
     }
 
     private boolean checkStatus(String id) {
         Wrapper<SzYhRecord> wp = Wrappers.<SzYhRecord>lambdaQuery()
                 .eq(SzYhRecord::getId, id)
-                .eq(SzYhRecord::getStatus, YhRecordStatus.CONFIRMED.getValue());
-        return !(this.getBaseMapper().selectCount(wp) > 0);
+                .in(SzYhRecord::getStatus, ApprovalStatusEnum.SUBMITTING.getValue(), ApprovalStatusEnum.REJECT.getValue());
+        return this.getBaseMapper().selectCount(wp) > 0;
     }
 
     private boolean exist(String id) {