From eac3e0354ad396a16845e2f8510af43bce99961f Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Thu, 19 Sep 2024 12:52:17 +0800
Subject: [PATCH] =?UTF-8?q?2024.9.18=20=E4=B8=80=E3=80=81=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=88=90=E6=9C=AC=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=EF=BC=88=E7=AC=AC=E4=BA=8C=E7=89=88=EF=BC=89=20=E4=BA=8C?=
 =?UTF-8?q?=E3=80=81=E5=8A=A0=E5=B7=A5=E4=B8=AD=E5=BF=83=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=94=B9=E9=80=A0=20=E4=B8=89=E3=80=81=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=EF=BC=88=E7=AC=AC=E4=BA=8C=E7=89=88=EF=BC=89?=
 =?UTF-8?q?=20=E5=9B=9B=E3=80=81=E5=95=86=E5=93=81=E7=BB=84=20-=20?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B7=A5=E5=BA=8F=EF=BC=88=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E7=89=88=EF=BC=89=20=E4=BA=94=E3=80=81=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=BB=84=20-=20Process=20Time=20Matrix=EF=BC=88=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E7=89=88=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/part/data/PtmConditionItemData.java  | 16 ++++++++++++++++
 .../part/mapper/PtmConditionItemMapper.java      |  2 ++
 .../impl/PtmConditionItemServiceImpl.java        | 12 ++++++++++--
 .../mapper/part/PtmConditionItemMapper.xml       | 11 +++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/part/data/PtmConditionItemData.java b/src/main/java/com/xujie/sys/modules/part/data/PtmConditionItemData.java
index 1819de52..fcb3d8a5 100644
--- a/src/main/java/com/xujie/sys/modules/part/data/PtmConditionItemData.java
+++ b/src/main/java/com/xujie/sys/modules/part/data/PtmConditionItemData.java
@@ -68,5 +68,21 @@ public class PtmConditionItemData implements Serializable {
     @TableField(exist = false)
     private List<PtmConditionItemData> ptmItemAddList;
 
+    //value_choose_flag
+    @TableField(exist = false)
+    private String valueChooseFlag;
+
+    @TableField(exist = false)
+    private Integer itemId;
+
+    @TableField(exist = false)
+    private String valueNo;
+
+    @TableField(exist = false)
+    private String availableValue;
+
+    @TableField(exist = false)
+    private List<PtmConditionItemData> availableValueList;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/src/main/java/com/xujie/sys/modules/part/mapper/PtmConditionItemMapper.java b/src/main/java/com/xujie/sys/modules/part/mapper/PtmConditionItemMapper.java
index cd6db42b..1d67668b 100644
--- a/src/main/java/com/xujie/sys/modules/part/mapper/PtmConditionItemMapper.java
+++ b/src/main/java/com/xujie/sys/modules/part/mapper/PtmConditionItemMapper.java
@@ -24,6 +24,8 @@ public interface PtmConditionItemMapper extends BaseMapper<PtmConditionItemData>
         "SELECT item_no FROM plm_properties_item WHERE item_type = #{recordType} and site = #{site} and bu_no = #{buNo}"
     )
     List<String> searchItemNoByType(PtmConditionItemData data);
+
+    List<PtmConditionItemData> searchProductGroupPtmConditionItemAvailable(PtmConditionItemData data);
 }
 
 
diff --git a/src/main/java/com/xujie/sys/modules/part/service/impl/PtmConditionItemServiceImpl.java b/src/main/java/com/xujie/sys/modules/part/service/impl/PtmConditionItemServiceImpl.java
index e12ace5c..23a11406 100644
--- a/src/main/java/com/xujie/sys/modules/part/service/impl/PtmConditionItemServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/part/service/impl/PtmConditionItemServiceImpl.java
@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xujie.sys.modules.part.data.PgPtmConditionData;
 import com.xujie.sys.modules.part.data.PtmConditionItemData;
 import com.xujie.sys.modules.part.data.PtmConditionProcessData;
+import com.xujie.sys.modules.part.entity.PlmPropertiesItemAvailableData;
 import com.xujie.sys.modules.part.service.PtmConditionItemService;
 import com.xujie.sys.modules.part.mapper.PtmConditionItemMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
 * @author Jia
@@ -26,8 +28,14 @@ public class PtmConditionItemServiceImpl extends ServiceImpl<PtmConditionItemMap
 
     @Override
     public List<PtmConditionItemData> searchProductGroupPtmConditionItem(PtmConditionProcessData data) {
-        List<PtmConditionItemData> list = ptmConditionItemMapper.searchProductGroupPtmConditionItem(data);
-        return list;
+        List<PtmConditionItemData> result = ptmConditionItemMapper.searchProductGroupPtmConditionItem(data);
+        for (int i = 0; i < result.size(); i++) {
+            if ("Y".equals(result.get(i).getValueChooseFlag())) {
+                List<PtmConditionItemData> availableList = ptmConditionItemMapper.searchProductGroupPtmConditionItemAvailable(result.get(i));
+                result.get(i).setAvailableValueList(availableList);
+            }
+        }
+        return result;
     }
 
     @Override
diff --git a/src/main/resources/mapper/part/PtmConditionItemMapper.xml b/src/main/resources/mapper/part/PtmConditionItemMapper.xml
index 5dbe31a2..f52206d9 100644
--- a/src/main/resources/mapper/part/PtmConditionItemMapper.xml
+++ b/src/main/resources/mapper/part/PtmConditionItemMapper.xml
@@ -45,4 +45,15 @@
         and a.site = #{site}
         and a.record_type = #{recordType}
     </select>
+    <select id="searchProductGroupPtmConditionItemAvailable"
+            resultType="com.xujie.sys.modules.part.data.PtmConditionItemData">
+        SELECT
+            a.item_no,
+            b.valueNo,
+            b.availableValue
+        FROM
+            plm_properties_item as a
+        left join plm_properties_item_available as b on a.id = b.item_id
+        where b.itemNo = #{itemNo} and b.site = #{site} and b.itemType = #{recordType} and b.bu_no = #{buNo}
+    </select>
 </mapper>