From 235e80df76fb957e3335e7c464486b11c8926193 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Thu, 27 Feb 2025 09:05:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8D=95excel=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=9Abody-plat?=
 =?UTF-8?q?eNum=E3=80=81group-plateNum=E6=95=B0=E9=87=8F=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=8C=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E8=A1=A8xml=E9=AD=94=E5=80=BC=E4=BD=BF=E7=94=A8=E6=9E=9A?=
 =?UTF-8?q?=E4=B8=BE=E7=9B=B4=E6=8E=A5=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orderImport/OrderImportTempDataMapper.xml | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/mapper/orderImport/OrderImportTempDataMapper.xml b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/mapper/orderImport/OrderImportTempDataMapper.xml
index 7c2119260..dd5cc8b06 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/mapper/orderImport/OrderImportTempDataMapper.xml
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/mapper/orderImport/OrderImportTempDataMapper.xml
@@ -112,14 +112,14 @@
         select count(1)
         from (select room_name
               from order_import_temp_data
-              where task_id = #{taskId} and type != 0
+              where task_id = #{taskId} and type != '${@com.cf.imes.module.executor.enums.OrderImportTmpDataTypeEnum@ORDER.type}'
               group by room_name) temp
     </select>
 
     <select id="selectRoomGroup" resultType="com.cf.imes.module.plan.dal.dataobject.orderImport.OrderImportTempDataGoodsGroupDO">
         select room_name
         from order_import_temp_data
-        where task_id = #{reqVO.taskId} and type != 0
+        where task_id = #{reqVO.taskId} and type != '${@com.cf.imes.module.executor.enums.OrderImportTmpDataTypeEnum@ORDER.type}'
         group by room_name
         <if test="reqVO.doPaging">
             order by sort
@@ -131,14 +131,14 @@
         select count(1)
         from (select body_name
               from order_import_temp_data
-              where task_id = #{reqVO.taskId} and room_name = #{reqVO.roomName} and type != 0
+              where task_id = #{reqVO.taskId} and room_name = #{reqVO.roomName} and type != '${@com.cf.imes.module.executor.enums.OrderImportTmpDataTypeEnum@ORDER.type}'
               group by body_name) temp
     </select>
 
     <select id="selectBodyGroup" resultType="com.cf.imes.module.plan.dal.dataobject.orderImport.OrderImportTempDataGoodsGroupDO">
-        select body_name,sum(case type when 1 then num else 0 end) as bodyPlateNum
+        select body_name,sum(case type when '${@com.cf.imes.module.executor.enums.OrderImportTmpDataTypeEnum@PLATE.type}' then num else 0 end) as bodyPlateNum
         from order_import_temp_data
-        where task_id = #{reqVO.taskId} and room_name = #{reqVO.roomName} and type != 0
+        where task_id = #{reqVO.taskId} and room_name = #{reqVO.roomName} and type != '${@com.cf.imes.module.executor.enums.OrderImportTmpDataTypeEnum@ORDER.type}'
         group by body_name
         <if test="reqVO.doPaging">
             order by sort
@@ -150,14 +150,14 @@
         select count(1)
         from (select group_type_name
               from order_import_temp_data
-              where task_id = #{reqVO.taskId} and room_name = #{reqVO.roomName} and body_name = #{reqVO.bodyName} and type != 0
+              where task_id = #{reqVO.taskId} and room_name = #{reqVO.roomName} and body_name = #{reqVO.bodyName} and type != '${@com.cf.imes.module.executor.enums.OrderImportTmpDataTypeEnum@ORDER.type}'
               group by group_type_name) temp
     </select>
 
     <select id="selectGroupTypeNameGroup" resultType="com.cf.imes.module.plan.dal.dataobject.orderImport.OrderImportTempDataGoodsGroupDO">
         select group_type_name, count(1) as count
         from order_import_temp_data
-        where task_id = #{reqVO.taskId} and room_name = #{reqVO.roomName} and body_name = #{reqVO.bodyName} and type != 0
+        where task_id = #{reqVO.taskId} and room_name = #{reqVO.roomName} and body_name = #{reqVO.bodyName} and type != '${@com.cf.imes.module.executor.enums.OrderImportTmpDataTypeEnum@ORDER.type}'
         group by group_type_name
         <if test="reqVO.doPaging">
             order by sort
@@ -169,7 +169,7 @@
         select count(1)
         from (select group_name
               from order_import_temp_data
-              where task_id = #{reqVO.taskId} and room_name = #{reqVO.roomName} and body_name = #{reqVO.bodyName} and type != 0
+              where task_id = #{reqVO.taskId} and room_name = #{reqVO.roomName} and body_name = #{reqVO.bodyName} and type != '${@com.cf.imes.module.executor.enums.OrderImportTmpDataTypeEnum@ORDER.type}'
               <choose>
                   <when test="reqVO.groupTypeName != null and reqVO.groupTypeName != ''">
                       and group_type_name = #{reqVO.groupTypeName}
@@ -182,9 +182,9 @@
     </select>
 
     <select id="selectGroupNameGroup" resultType="com.cf.imes.module.plan.dal.dataobject.orderImport.OrderImportTempDataGoodsGroupDO">
-        select group_name, sum(case type when 1 then num else 0 end) as groupNameNum
+        select group_name, sum(case type when '${@com.cf.imes.module.executor.enums.OrderImportTmpDataTypeEnum@PLATE.type}' then num else 0 end) as groupNameNum
         from order_import_temp_data
-        where task_id = #{reqVO.taskId} and room_name = #{reqVO.roomName} and body_name = #{reqVO.bodyName} and type != 0
+        where task_id = #{reqVO.taskId} and room_name = #{reqVO.roomName} and body_name = #{reqVO.bodyName} and type != '${@com.cf.imes.module.executor.enums.OrderImportTmpDataTypeEnum@ORDER.type}'
         <choose>
             <when test="reqVO.groupTypeName != null and reqVO.groupTypeName != ''">
                 and group_type_name = #{reqVO.groupTypeName}
@@ -249,6 +249,6 @@
     <select id="selectPartList" resultType="com.cf.imes.module.plan.dal.dataobject.orderImport.OrderImportTempDataDO">
         select *
         from order_import_temp_data
-        where task_id = #{reqVO.taskId} and type = 2 and inner_goods_id = #{reqVO.goodsId}
+        where task_id = #{reqVO.taskId} and type = '${@com.cf.imes.module.executor.enums.OrderImportTmpDataTypeEnum@PART.type}' and inner_goods_id = #{reqVO.goodsId}
     </select>
 </mapper>
\ No newline at end of file