From dd26f7ffd14a1640eea5e37c43752e823cb346ad Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Mon, 21 Oct 2024 15:55:51 +0800
Subject: [PATCH] 2024-10-21

---
 .../modules/test/mapper/TestInformationMapper.java    |  2 ++
 .../test/service/impl/TestPropertiesServiceImpl.java  |  8 +++++++-
 .../mapper/quotation/QuotationInformationMapper.xml   |  7 ++++---
 .../resources/mapper/test/TestInformationMapper.xml   | 11 ++++++++++-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/spring/modules/test/mapper/TestInformationMapper.java b/src/main/java/com/spring/modules/test/mapper/TestInformationMapper.java
index f1449776..df95bc5d 100644
--- a/src/main/java/com/spring/modules/test/mapper/TestInformationMapper.java
+++ b/src/main/java/com/spring/modules/test/mapper/TestInformationMapper.java
@@ -40,4 +40,6 @@ public interface TestInformationMapper extends BaseMapper<TestInformationEntity>
                                                       @Param("itemDesc")String itemDesc,
                                                       @Param("codeType")String testCodeType,
                                                       @Param("list") List<String> list);
+
+    List<PlmPropertiesItemAvailable> queryAvailableList(TestPropertiesVo testPropertiesVo);
 }
diff --git a/src/main/java/com/spring/modules/test/service/impl/TestPropertiesServiceImpl.java b/src/main/java/com/spring/modules/test/service/impl/TestPropertiesServiceImpl.java
index f0f444d9..d6579954 100644
--- a/src/main/java/com/spring/modules/test/service/impl/TestPropertiesServiceImpl.java
+++ b/src/main/java/com/spring/modules/test/service/impl/TestPropertiesServiceImpl.java
@@ -23,7 +23,13 @@ public class TestPropertiesServiceImpl extends ServiceImpl<TestPropertiesMapper,
     private TestInformationMapper testInformationMapper;
     @Override
     public List<TestPropertiesVo> searchTestPropertiesList(TestProperties testProperties) {
-        return testInformationMapper.searchTestPropertiesVo(testProperties.getSite(),testProperties.getTestNo(),Constant.TEST_CODE_NO);
+        List<TestPropertiesVo> list = testInformationMapper.searchTestPropertiesVo(testProperties.getSite(), testProperties.getTestNo(), Constant.TEST_CODE_NO);
+        for (TestPropertiesVo testPropertiesVo : list) {
+            if ("Y".equalsIgnoreCase(testPropertiesVo.getValueChooseFlag())){
+                testPropertiesVo.setList(testInformationMapper.queryAvailableList(testPropertiesVo));
+            }
+        }
+        return list;
     }
 
     @Override
diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
index bd83d037..83048e91 100644
--- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
+++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
@@ -496,14 +496,15 @@
         a.default_value,
         a.value_type,
         a.value_type_db,
-        a.value_choose_flag,
-        a.max_value,
-        a.min_value,
+        c.ValueChooseFlag as value_choose_flag,
+        c.MaxValue as max_value,
+        c.MinValue as min_value,
         a.text_value,
         a.num_value,
         a.quotation_no
         FROM plm_price_check_properties a
         left join plm_properties_model_detail b on a.site = b.site and a.function_type = b.function_type and b.code_no = #{codeNo} and a.item_no = b.properties_item_no
+        left join plm_properties_item c on a.function_type = c.itemType and a.item_no = c.itemNo and a.site = c.site
         where quotation_no = #{quotationNo} and a.site = #{site} order by b.order_id
     </select>
 
diff --git a/src/main/resources/mapper/test/TestInformationMapper.xml b/src/main/resources/mapper/test/TestInformationMapper.xml
index ba9e1a40..badbcb99 100644
--- a/src/main/resources/mapper/test/TestInformationMapper.xml
+++ b/src/main/resources/mapper/test/TestInformationMapper.xml
@@ -243,7 +243,7 @@
         a.default_value,
         a.value_type,
         a.value_type_db,
-        a.value_choose_flag,
+        c.ValueChooseFlag as value_choose_flag,
         a.max_value,
         a.min_value,
         a.text_value,
@@ -251,6 +251,7 @@
         a.test_no
         FROM plm_test_properties a
         left join plm_properties_model_detail b on a.site = b.site and a.function_type = b.function_type and b.code_no = #{codeNo} and a.item_no = b.properties_item_no
+        left join plm_properties_item c on a.site = c.site and a.function_type = c.itemType and a.item_no = c.itemNo
         where test_no = #{testNo} and a.site = #{site} order by b.order_id
     </select>
 
@@ -306,4 +307,12 @@
             )
         </if>
     </select>
+
+    <select id="queryAvailableList" resultType="com.spring.modules.base.entity.PlmPropertiesItemAvailable">
+        select site, ItemNo, ItemType, ValueNo, AvailableValue, CreatedDate, CreatedBy
+        from plm_properties_item_available
+        where site = #{site}
+          and ItemNo = #{itemNo}
+          and ItemType = #{functionType}
+    </select>
 </mapper>