From 1ca74cf2332000ae12c827c9e8dc1ca57dd61641 Mon Sep 17 00:00:00 2001
From: liuzhaotian <liu2655477224@163.com>
Date: Wed, 17 Jul 2024 10:21:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7-=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5=E7=BB=84=E4=BF=A1=E6=81=AFBug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/plan/bo/ProcessGroupList.java       |  6 ++++--
 .../resources/mapper/plate/PlateMapper.xml    | 20 ++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/ProcessGroupList.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/ProcessGroupList.java
index 1a150b0c4..ff55eefd5 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/ProcessGroupList.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/ProcessGroupList.java
@@ -10,11 +10,13 @@ import lombok.Data;
 public class ProcessGroupList {
 
 
+    @Schema(description = "加工组ID")
+    private Long groupId;
+
     @Schema(description = "加工组名称")
     private String groupName;
 
-//    @Schema(description = "加工组ID")
-//    private String groupId;
+
 
 
 
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
index 1098573e6..f9053a7ae 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
@@ -162,18 +162,20 @@
         <result property="roomName" column="roomName"/>
         <result property="hasHole" column="hasHole"/>
 
-        <collection property="processGroupLists" javaType="java.util.List"  ofType="com.cf.imes.module.executor.controller.admin.plan.bo.ProcessGroupList">
+        <collection property="processGroupLists" javaType="java.util.List"   ofType="com.cf.imes.module.executor.controller.admin.plan.bo.ProcessGroupList"  >
+
+            <result property="groupId" column="groupId"/>
             <result property="groupName" column="groupName"/>
-
-        </collection>
-
+        </collection >
     </resultMap>
+
     <select id="selectPlateDetialList"
             resultMap="PlateDetialMap"
             resultType="java.lang.Long">
 
         select distinct
-
+                        oi.group_id as groupId,
+                        og.name as groupName,
                         op.id as plateId,
                         op.order_id as orderId,
                         op.name as name,
@@ -218,8 +220,7 @@
                         ob.room_id as roomId,
                         ob.name as bodyName,
                         ob.room_name as roomName,
-                        op.is_row_hole as  hasHole,
-                        og.name as groupName
+                        op.is_row_hole as  hasHole
 
         from order_plate op
                 join order_goods ogs on op.goods_id = ogs.id and op.organ_id = ogs.organ_id
@@ -236,6 +237,8 @@
             resultType="java.lang.Long">
 
         select distinct
+                        oi.group_id as groupId,
+                        og.name as groupName,
                         op.id as plateId,
                         op.order_id as orderId,
                         op.name as name,
@@ -280,8 +283,7 @@
                         ob.room_id as roomId,
                         ob.name as bodyName,
                         ob.room_name as roomName,
-                        op.is_row_hole as  hasHole,
-                        og.name as groupName
+                        op.is_row_hole as  hasHole
         from order_plate op
             join order_goods ogs on op.goods_id = ogs.id and op.organ_id = ogs.organ_id
             join order_item oi on op.id = oi.plate_id and op.organ_id = oi.organ_id