From 464043930df178727b357e2b31b4e5f19e1e17a8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 30 八月 2023 10:13:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml                            |   10 +++++++++-
 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkDetectionServiceImpl.java |    1 +
 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkBasicInformation.java             |    4 ++++
 3 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkBasicInformation.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkBasicInformation.java
index 5c9f196..483d0e4 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkBasicInformation.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkBasicInformation.java
@@ -65,6 +65,10 @@
     @ApiModelProperty(value = "濮旀墭澶囨敞", example = "濮旀墭澶囨敞YPBH123456789YPBH123456789YPBH123456789")
     private String entrustRemarks;
 
+    @ApiModelProperty(value = "妫�楠屾椂闂�", hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date insTime;
+
     @TableLogic(value = "1", delval = "0")
     @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝e父>=1,鍒犻櫎<=0", hidden = true)
     private Integer state;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkDetectionServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkDetectionServiceImpl.java
index e347c34..b73a90f 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkDetectionServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkDetectionServiceImpl.java
@@ -29,6 +29,7 @@
         for (LinkDetection linkDetection:linkDetectionList){
             linkDetection.setInspectionStatus(1);
             linkDetection.setLinkBasicId(id);
+            linkDetection.setState(1);
         }
         linkDetectionMapper.insertBatchSomeColumn(linkDetectionList);
     }
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 9941c89..8d5b574 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -9,7 +9,8 @@
         d.`specifications_models`,
         DATE_FORMAT(l.`inspection_time`,'%Y-%m-%d') inspectionTime, DATE_FORMAT(l.`completion_deadline`,'%Y-%m-%d')
         completionDeadline, l.`contacts`,
-        DATE_FORMAT(d.`date_survey`,'%Y-%m-%d') dateSurvey, d.`inspection_status`
+        DATE_FORMAT(d.`date_survey`,'%Y-%m-%d') dateSurvey, d.`inspection_status`,
+        DATE_FORMAT(l.`ins_time`,'%Y-%m-%d') insTime
         FROM link_basic_information l, link_detection d
         WHERE l.`id` = d.`link_basic_id`
         AND d.`state` = 1
@@ -57,6 +58,8 @@
                lb.sample_delivery_phone sampleDeliveryPhone,
                lb.report_number         reportNumber,
                lb.entrust_remarks       entrustRemarks,
+               lb.sample_sender         sampleSender,
+               lb.entrusted             entrusted,
                lb.uid                   uid,
                ld.id                    id,
                ld.sample_number         sampleNumber,
@@ -83,9 +86,14 @@
         <result property="inspectionTime" column="inspectionTime"/>
         <result property="sampleDeliveryMode" column="sampleDeliveryMode"/>
         <result property="sampleDeliveryPhone" column="sampleDeliveryPhone"/>
+        <result property="sampleSender" column="sampleSender"/>
+        <result property="entrustRemarks" column="entrustRemarks"/>
+        <result property="reportNumber" column="reportNumber"/>
+        <result property="entrusted" column="entrusted"/>
         <collection property="linkDetectionList" ofType="LinkDetection">
             <result property="id" column="id"/>
             <result property="sampleNumber" column="sampleNumber"/>
+            <result property="sampleName" column="sampleName"/>
             <result property="specificationsModels" column="specificationsModels"/>
             <result property="unit" column="unit"/>
             <result property="samplesNumber" column="samplesNumber"/>

--
Gitblit v1.9.3