From 4a552f3ac80408d6116c8b4e0d68b9c173e826a3 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 14 Nov 2024 11:35:47 +0800 Subject: [PATCH] =?UTF-8?q?11/14=20=E7=8E=B0=E5=9C=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/res/collect/CollectOrderBizResponse.java | 2 ++ .../mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml | 2 +- .../mybatis/mapper/collect/IoCollectOrderBizMapper.xml | 2 +- .../mybatis/mapper/collect/IoCollectOrderBizOriginMapper.xml | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java index 7029d1519..00d9d0865 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java @@ -162,4 +162,6 @@ public class CollectOrderBizResponse { private Boolean getConfirm; private String workplaceQueueCode; + private String spec; + } diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml index 757457765..c847f85fa 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml @@ -7,7 +7,7 @@ bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory, - bp.bzgg + COALESCE(bp.bzgg,icobb.ggxh) AS spec FROM io_collect_order_biz_backup icobb left join basic_udirel bu on icobb.relId = bu.id left join basic_products bp on bu.uuid = bp.uuid diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml index 47e7bc6ac..dee069a24 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml @@ -7,7 +7,7 @@ bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory, - bp.bzgg, + COALESCE(bp.bzgg,icob.ggxh) AS spec, sys_workplace_queue.code FROM io_collect_order_biz icob left join basic_udirel bu on icob.relId = bu.id diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizOriginMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizOriginMapper.xml index 61e013f59..9ac6f6262 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizOriginMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizOriginMapper.xml @@ -9,7 +9,7 @@ bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory, - bp.bzgg + COALESCE(bp.bzgg,icob.ggxh) AS spec FROM io_collect_order_biz_origin icob left join basic_udirel bu on icob.relId = bu.id left join basic_products bp on bu.uuid = bp.uuid @@ -39,4 +39,4 @@ group by icob.id - \ No newline at end of file +