From 10d29899ca0487f23ac217f7f7e52a5ea3510c41 Mon Sep 17 00:00:00 2001
From: yitonglei <ytl653@163.com>
Date: Wed, 28 Sep 2022 12:27:10 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=A7=94=E6=89=98=E5=8D=95=E7=9A=84=E6=97=B6=E5=80=99=E5=8F=97?=
 =?UTF-8?q?=E7=90=86=E7=BC=96=E5=8F=B7=E7=9A=84=E8=AE=A1=E7=AE=97=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lims/controller/EntrustController.java    | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
index f0bd8d3..1e27009 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
@@ -1474,62 +1474,65 @@ public class EntrustController extends BladeController {
 //        );
         wrapper.ge(Entrust::getCreateTime, parse);
         List<Entrust> entrusts = service.list(wrapper);
+        wrapper.eq(Entrust::getIsDeleted , 1);
+        List<Entrust> entrustIsDeleted = service.list(wrapper);
+
         // 设置受理编号
         String acceptance = "";
         if ("1".equals(number)) {
             if (entrusts.size() >= 0 && entrusts.size() < 9) {
-                acceptance = "SDCADC-W-" + year + "000" + (entrusts.size() + 1);
+                acceptance = "SDCADC-W-" + year + "000" + (entrusts.size() + entrustIsDeleted.size() + 1);
             }
             if (entrusts.size() >= 9 && entrusts.size() < 99) {
-                acceptance = "SDCADC-W-" + year + "00" + (entrusts.size() + 1);
+                acceptance = "SDCADC-W-" + year + "00" + (entrusts.size() + entrustIsDeleted.size() + 1);
             }
             if (entrusts.size() >= 99 && entrusts.size() < 999) {
-                acceptance = "SDCADC-W-" + year + "0" + (entrusts.size() + 1);
+                acceptance = "SDCADC-W-" + year + "0" + (entrusts.size() + entrustIsDeleted.size() + 1);
             }
             if (entrusts.size() >= 999 && entrusts.size() < 9999) {
-                acceptance = "SDCADC-W-" + year + (entrusts.size() + 1);
+                acceptance = "SDCADC-W-" + year + (entrusts.size() + entrustIsDeleted.size() + 1);
             }
         }
         if ("2".equals(number)) {
             if (entrusts.size() >= 0 && entrusts.size() < 9) {
-                acceptance = "SDCADC-J-" + year + "000" + (entrusts.size() + 1);
+                acceptance = "SDCADC-J-" + year + "000" + (entrusts.size() + entrustIsDeleted.size() + 1);
             }
             if (entrusts.size() >= 9 && entrusts.size() < 99) {
-                acceptance = "SDCADC-J-" + year + "00" + (entrusts.size() + 1);
+                acceptance = "SDCADC-J-" + year + "00" + (entrusts.size() + entrustIsDeleted.size() + 1);
             }
             if (entrusts.size() >= 99 && entrusts.size() < 999) {
-                acceptance = "SDCADC-J-" + year + "0" + (entrusts.size() + 1);
+                acceptance = "SDCADC-J-" + year + "0" + (entrusts.size() + entrustIsDeleted.size() + 1);
             }
             if (entrusts.size() >= 999 && entrusts.size() < 9999) {
-                acceptance = "SDCADC-J-" + year + (entrusts.size() + 1);
+                acceptance = "SDCADC-J-" + year + (entrusts.size() + entrustIsDeleted.size() + 1);
             }
         }
         if ("3".equals(number)) {
             if (entrusts.size() >= 0 && entrusts.size() < 9) {
-                acceptance = "SDCADC-Z-" + year + "000" + (entrusts.size() + 1);
+                acceptance = "SDCADC-Z-" + year + "000" + (entrusts.size() + entrustIsDeleted.size() + 1);
             }
             if (entrusts.size() >= 9 && entrusts.size() < 99) {
-                acceptance = "SDCADC-Z-" + year + "00" + (entrusts.size() + 1);
+                acceptance = "SDCADC-Z-" + year + "00" + (entrusts.size() + entrustIsDeleted.size() + 1);
             }
             if (entrusts.size() >= 99 && entrusts.size() < 999) {
-                acceptance = "SDCADC-Z-" + year + "0" + (entrusts.size() + 1);
+                acceptance = "SDCADC-Z-" + year + "0" + (entrusts.size() + entrustIsDeleted.size() + 1);
             }
             if (entrusts.size() >= 999 && entrusts.size() < 9999) {
-                acceptance = "SDCADC-Z-" + year + (entrusts.size() + 1);
+                acceptance = "SDCADC-Z-" + year + (entrusts.size() + entrustIsDeleted.size() + 1);
             }
         }
         if ("4".equals(number)) {
             if (entrusts.size() >= 0 && entrusts.size() < 9) {
-                acceptance = "SDCADC-S-" + year + "000" + (entrusts.size() + 1);
+                acceptance = "SDCADC-S-" + year + "000" + (entrusts.size() + entrustIsDeleted.size() + 1);
             }
             if (entrusts.size() >= 9 && entrusts.size() < 99) {
-                acceptance = "SDCADC-S-" + year + "00" + (entrusts.size() + 1);
+                acceptance = "SDCADC-S-" + year + "00" + (entrusts.size() + entrustIsDeleted.size() + 1);
             }
             if (entrusts.size() >= 99 && entrusts.size() < 999) {
-                acceptance = "SDCADC-S-" + year + "0" + (entrusts.size() + 1);
+                acceptance = "SDCADC-S-" + year + "0" + (entrusts.size() + entrustIsDeleted.size() + 1);
             }
             if (entrusts.size() >= 999 && entrusts.size() < 9999) {
-                acceptance = "SDCADC-S-" + year + (entrusts.size() + 1);
+                acceptance = "SDCADC-S-" + year + (entrusts.size() + entrustIsDeleted.size() + 1);
             }
         }
         return acceptance;