From 383c8a0e76ffd6be938634112d80e66af6545bb5 Mon Sep 17 00:00:00 2001
From: "a15234804788@163.com" <a15234804788@163.com>
Date: Thu, 29 Sep 2022 11:53:17 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A7=94=E6=89=98=E5=8D=95=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E7=94=9F=E6=88=90=E7=9A=84=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lims/controller/EntrustController.java    | 45 ++++++++++---------
 .../lims/mapper/EntrustMapper.java            |  5 ++-
 .../springblade/lims/mapper/EntrustMapper.xml |  9 +++-
 3 files changed, 36 insertions(+), 23 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 ce9f928..8483ef0 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
@@ -26,6 +26,7 @@ import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.springblade.common.utils.ZipCompressUtil;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.lims.entry.*;
+import org.springblade.lims.mapper.EntrustMapper;
 import org.springblade.lims.service.*;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -103,6 +104,7 @@ public class EntrustController extends BladeController {
 
     private final IMessageClient messageClient;
 
+    private final EntrustMapper entrustMapper;
     /**
      * 1.分页 委托单表
      */
@@ -1472,67 +1474,68 @@ public class EntrustController extends BladeController {
 //                .or()
 //                .eq(Entrust::getIsDeleted, 1)
 //        );
-        wrapper.ge(Entrust::getCreateTime, parse).ne(Entrust::getEntrustStatus, -1);
-        List<Entrust> entrusts = service.list(wrapper);
-        wrapper.eq(Entrust::getIsDeleted , 1);
-        List<Entrust> entrustIsDeleted = service.list(wrapper);
-
+//        wrapper.ge(Entrust::getCreateTime, parse).ne(Entrust::getEntrustStatus, -1);
+//        List<Entrust> entrusts = service.list(wrapper);
+        Entrust entrust = new Entrust();
+        entrust.setInvestigativeType(number);
+        entrust.setCreateTime(parse);
+        List<Entrust> entrusts = entrustMapper.entrustListNonStatus(entrust);
         // 设置受理编号
         String acceptance = "";
         if ("1".equals(number)) {
             if (entrusts.size() >= 0 && entrusts.size() < 9) {
-                acceptance = "SDCADC-W-" + year + "000" + (entrusts.size() + entrustIsDeleted.size() + 1);
+                acceptance = "SDCADC-W-" + year + "000" + (entrusts.size()  + 1);
             }
             if (entrusts.size() >= 9 && entrusts.size() < 99) {
-                acceptance = "SDCADC-W-" + year + "00" + (entrusts.size() + entrustIsDeleted.size() + 1);
+                acceptance = "SDCADC-W-" + year + "00" + (entrusts.size() + + 1);
             }
             if (entrusts.size() >= 99 && entrusts.size() < 999) {
-                acceptance = "SDCADC-W-" + year + "0" + (entrusts.size() + entrustIsDeleted.size() + 1);
+                acceptance = "SDCADC-W-" + year + "0" + (entrusts.size()  + 1);
             }
             if (entrusts.size() >= 999 && entrusts.size() < 9999) {
-                acceptance = "SDCADC-W-" + year + (entrusts.size() + entrustIsDeleted.size() + 1);
+                acceptance = "SDCADC-W-" + year + (entrusts.size()  + 1);
             }
         }
         if ("2".equals(number)) {
             if (entrusts.size() >= 0 && entrusts.size() < 9) {
-                acceptance = "SDCADC-J-" + year + "000" + (entrusts.size() + entrustIsDeleted.size() + 1);
+                acceptance = "SDCADC-J-" + year + "000" + (entrusts.size()  + 1);
             }
             if (entrusts.size() >= 9 && entrusts.size() < 99) {
-                acceptance = "SDCADC-J-" + year + "00" + (entrusts.size() + entrustIsDeleted.size() + 1);
+                acceptance = "SDCADC-J-" + year + "00" + (entrusts.size()  + 1);
             }
             if (entrusts.size() >= 99 && entrusts.size() < 999) {
-                acceptance = "SDCADC-J-" + year + "0" + (entrusts.size() + entrustIsDeleted.size() + 1);
+                acceptance = "SDCADC-J-" + year + "0" + (entrusts.size()  + 1);
             }
             if (entrusts.size() >= 999 && entrusts.size() < 9999) {
-                acceptance = "SDCADC-J-" + year + (entrusts.size() + entrustIsDeleted.size() + 1);
+                acceptance = "SDCADC-J-" + year + (entrusts.size()  + 1);
             }
         }
         if ("3".equals(number)) {
             if (entrusts.size() >= 0 && entrusts.size() < 9) {
-                acceptance = "SDCADC-Z-" + year + "000" + (entrusts.size() + entrustIsDeleted.size() + 1);
+                acceptance = "SDCADC-Z-" + year + "000" + (entrusts.size()  + 1);
             }
             if (entrusts.size() >= 9 && entrusts.size() < 99) {
-                acceptance = "SDCADC-Z-" + year + "00" + (entrusts.size() + entrustIsDeleted.size() + 1);
+                acceptance = "SDCADC-Z-" + year + "00" + (entrusts.size()  + 1);
             }
             if (entrusts.size() >= 99 && entrusts.size() < 999) {
-                acceptance = "SDCADC-Z-" + year + "0" + (entrusts.size() + entrustIsDeleted.size() + 1);
+                acceptance = "SDCADC-Z-" + year + "0" + (entrusts.size()  + 1);
             }
             if (entrusts.size() >= 999 && entrusts.size() < 9999) {
-                acceptance = "SDCADC-Z-" + year + (entrusts.size() + entrustIsDeleted.size() + 1);
+                acceptance = "SDCADC-Z-" + year + (entrusts.size()  + 1);
             }
         }
         if ("4".equals(number)) {
             if (entrusts.size() >= 0 && entrusts.size() < 9) {
-                acceptance = "SDCADC-S-" + year + "000" + (entrusts.size() + entrustIsDeleted.size() + 1);
+                acceptance = "SDCADC-S-" + year + "000" + (entrusts.size()  + 1);
             }
             if (entrusts.size() >= 9 && entrusts.size() < 99) {
-                acceptance = "SDCADC-S-" + year + "00" + (entrusts.size() + entrustIsDeleted.size() + 1);
+                acceptance = "SDCADC-S-" + year + "00" + (entrusts.size()  + 1);
             }
             if (entrusts.size() >= 99 && entrusts.size() < 999) {
-                acceptance = "SDCADC-S-" + year + "0" + (entrusts.size() + entrustIsDeleted.size() + 1);
+                acceptance = "SDCADC-S-" + year + "0" + (entrusts.size()  + 1);
             }
             if (entrusts.size() >= 999 && entrusts.size() < 9999) {
-                acceptance = "SDCADC-S-" + year + (entrusts.size() + entrustIsDeleted.size() + 1);
+                acceptance = "SDCADC-S-" + year + (entrusts.size()  + 1);
             }
         }
         return acceptance;
diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EntrustMapper.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EntrustMapper.java
index 93137a1..52c37bd 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EntrustMapper.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EntrustMapper.java
@@ -2,8 +2,11 @@
 package org.springblade.lims.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import feign.Param;
 import org.springblade.lims.entry.Entrust;
 
+import java.util.List;
+
 /**
  * 检测知识库明细表 Mapper 接口
  *
@@ -12,6 +15,6 @@ import org.springblade.lims.entry.Entrust;
  */
 public interface EntrustMapper extends BaseMapper<Entrust> {
 
-
+    List<Entrust>  entrustListNonStatus(@Param Entrust entrust);
 
 }
diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EntrustMapper.xml b/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EntrustMapper.xml
index 344ebe2..da643a3 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EntrustMapper.xml
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EntrustMapper.xml
@@ -8,6 +8,13 @@
         <result column="sample_name" property="sampleName"/>
     </resultMap>
 
-
+    <select id="entrustListNonStatus" parameterType="org.springblade.lims.entry.Entrust" resultType="org.springblade.lims.entry.Entrust">
+        SELECT
+            *
+        FROM
+        f_entrust_main
+        WHERE
+        investigative_type = #{investigativeType} AND create_time >= #{createTime} AND entrust_status &lt;&gt; - 1
+    </select>
 
 </mapper>