From 7767333991f386994f37f7e8c03f9016bec62132 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Thu, 28 Dec 2023 13:49:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=BA=E5=B0=91=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boditech/controller/TestController.java         | 21 ---------------------
 .../com/dreamworks/boditech/entity/MdbTest.java     |  6 ++++++
 .../com/dreamworks/boditech/mapper/TestMapper.java  |  6 ++++++
 .../dreamworks/boditech/service/TestService.java    | 10 ++++++++++
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/dreamworks/boditech/controller/TestController.java b/src/main/java/com/dreamworks/boditech/controller/TestController.java
index e183436..0d7547a 100644
--- a/src/main/java/com/dreamworks/boditech/controller/TestController.java
+++ b/src/main/java/com/dreamworks/boditech/controller/TestController.java
@@ -131,27 +131,6 @@ public class TestController extends BaseController {
         }
 
         Integer count = this.testService.testCount(params);
-
-
-
-
-
-//        for (int i = 0; i < 20; i++) {
-//            List<Map<String, String>> results = new ArrayList<>();
-//            for (int j = 0; j < 2; j++) {
-//                Map<String, String> result = new HashMap<>();
-//                result.put("name", "sth01");
-//                result.put("value", "123.45mg/L");
-//                results.add(result);
-//            }
-//
-//            Map<String,Object> item = new HashMap<>();
-//            item.put("recordUUID", "202110-01");
-//            item.put("samplePID", "ABCD1234");
-//            item.put("tubeIndex", "05");
-//            list.add(item);
-//        }
-
         return this.success(Map.of(
             "totalCount", count,
             "list", list
diff --git a/src/main/java/com/dreamworks/boditech/entity/MdbTest.java b/src/main/java/com/dreamworks/boditech/entity/MdbTest.java
index 4dcab6c..52d4357 100644
--- a/src/main/java/com/dreamworks/boditech/entity/MdbTest.java
+++ b/src/main/java/com/dreamworks/boditech/entity/MdbTest.java
@@ -2,12 +2,16 @@ package com.dreamworks.boditech.entity;
 public class MdbTest {
     // id
     public Integer id;
+    // serial code
+    public String serialCode;
     // task type
     public String taskType;
     // task id
     public Integer taskId;
     // lot code
     public String lotCode;
+    // bar code
+    public String barCode;
     // patient code
     public String sampleUid;
     // project id
@@ -16,6 +20,8 @@ public class MdbTest {
     public String projectName;
     // tube type
     public String tubeType;
+    // tube index
+    public Integer tubeIndex;
     // sample type
     public String sampleType;
     // incubate slot index
diff --git a/src/main/java/com/dreamworks/boditech/mapper/TestMapper.java b/src/main/java/com/dreamworks/boditech/mapper/TestMapper.java
index 160fbe7..15ab4c8 100644
--- a/src/main/java/com/dreamworks/boditech/mapper/TestMapper.java
+++ b/src/main/java/com/dreamworks/boditech/mapper/TestMapper.java
@@ -15,6 +15,9 @@ public interface TestMapper {
     @Options(useGeneratedKeys=true, keyProperty="id", keyColumn="id")
     int insert(MdbTest test);
 
+    @Select("SELECT COUNT(id) FROM bdt_tests WHERE startedAt >= #{start} AND startedAt <= #{end}")
+    int countByTimeRange(Long start, Long end);
+
     @Update("UPDATE bdt_tests SET status = #{status} WHERE id = #{id}")
     int statusUpdate(MdbTest test);
 
@@ -31,6 +34,9 @@ public interface TestMapper {
     Integer count(ParamTestSearch param);
 
     @Update("UPDATE bdt_tests SET " +
+        "barCode = #{barCode}, " +
+        "serialCode = #{serialCode}, " +
+        "tubeIndex = #{tubeIndex}, " +
         "incubateStartedAt = #{incubateStartedAt}, " +
         "incubateTime = #{incubateTime}, " +
         "incubateSlotIndex = #{incubateSlotIndex} " +
diff --git a/src/main/java/com/dreamworks/boditech/service/TestService.java b/src/main/java/com/dreamworks/boditech/service/TestService.java
index 4606c50..fa32816 100644
--- a/src/main/java/com/dreamworks/boditech/service/TestService.java
+++ b/src/main/java/com/dreamworks/boditech/service/TestService.java
@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 
 @Service
@@ -277,6 +278,15 @@ public class TestService {
 
     // create test
     public void insert(MdbTest test) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        Long startTime = calendar.getTimeInMillis();
+        int count = this.testMapper.countByTimeRange(startTime, System.currentTimeMillis());
+        test.serialCode = String.format("%s_%03d", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMdd")), count + 1);
+
         // @TODO : startedBy should be set to the current user
         test.startedBy = 0;
         test.startedAt = System.currentTimeMillis();