From e53cfd2c256f4ca1f282ce4c470b1b13ead46f3b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 18 Sep 2024 15:41:22 +0800 Subject: [PATCH] =?UTF-8?q?9/118=20=E7=8E=B0=E5=9C=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E4=BD=9C=E4=B8=9A=20=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/res/inout/IoOrderResponse.java | 5 +++++ src/main/resources/mybatis/mapper/inout/IoOrderDao.xml | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index a87e3a466..7aeec1341 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -275,6 +275,11 @@ public class IoOrderResponse { */ private String workPlaceName; + /** + * 业务类型编码 + */ + private String splitBusType; + public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 8eb973720..42217e9af 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -43,6 +43,8 @@ io_order_invoice ioi ON ioi.orderIdFk = io.billNo LEFT JOIN sys_workplace sw ON sw.workplaceId = io.workPlaceCode + LEFT JOIN + sys_workplace_document swd ON swd.documentTypeCode = io.splitBusType INNER JOIN io_unit_maintain_platform a2 on io.action = a2.sourceAction AND io.fromCorp = a2.unitId @@ -197,6 +199,7 @@ or io.workPlaceCode like concat('%', #{keywords}, '%') or io.busType like concat('%', #{keywords}, '%') or sw.workplaceName like concat('%', #{keywords}, '%') + or swd.busName like concat('%', #{keywords}, '%') or io.fromType like concat('%', #{keywords}, '%'))