From 23b6b1e44ccfc55598230caafcfb076688a7318d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 19 Apr 2022 13:49:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=A9=BA=E6=A0=BC=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarStandUnqualified/entity/SarStandUnqualified.java | 4 ++-- .../mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index eeb93142..66846da9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -132,12 +132,12 @@ public class SarStandUnqualified extends BaseEntity { @TableField("RESPONSIBLE_UNIT") private String responsibleUnit; - @ExcelProperty("质量工程师") +// @ExcelProperty("质量工程师") @ApiModelProperty(value = "质量工程师") @TableField("QA_ENGINEER") private String qaEngineer; - @ExcelProperty("认证工程师") +// @ExcelProperty("认证工程师") @ApiModelProperty(value = "认证工程师") @TableField("AUTH_ENGINEER") private String authEngineer; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index 9e0fe11e..0e6501af 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -54,7 +54,7 @@ and ts_institution.name like concat('%',#{sar.responsibleUnit},'%') - and (REPLACE(sar_stand_unqualified.STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%') + and (REPLACE(REPLACE(sar_stand_unqualified.STAND_SERIAL_NUMBER,' ',''),' ','') like concat(concat('%',REPLACE(REPLACE(#{sar.standSerialNumber},' ',''),' ','')),'%') or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')) order by sar_stand_unqualified.ID,sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc