From 4b31aa654bb1027d2c8cf17cef126f7c494c3096 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Thu, 7 Dec 2023 11:29:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=BE=E5=A4=87=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/pojo/query/OptionalEbomConfigListQuery.java   | 5 +++--
 .../bomnew/service/aggreg/OptionalExcelService.java      | 1 +
 .../resources/mapper/master/OptionalEbomConfigMapper.xml | 9 ++++-----
 .../resources/mapper/master/OptionalEbomMainMapper.xml   | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java
index d18ae346..b3d1f719 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java
@@ -10,14 +10,15 @@ import java.io.Serializable;
 import java.util.Date;
 
 @Data
-@ApiModel("选配方案清单")
+@ApiModel("com.nflg.product.bomnew.pojo.query.OptionalEbomConfigListQuery选配方案清单")
 @Accessors(chain = true)
 public class OptionalEbomConfigListQuery extends   BasePageQuery  implements Serializable {
 
 
     @ApiModelProperty(value = "机型编号")
     private String deviceNo;
-
+    @ApiModelProperty(value = "机型编号 /机型名")
+    private String deviceName;
 
 
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java
index ed6e68de..c5a10da6 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java
@@ -265,6 +265,7 @@ public class OptionalExcelService {
 
 
         optionalEbomMainEntity.setCreatedBy(SessionUtil.getUserCode());
+        optionalEbomMainEntity.setRealName(SessionUtil.getRealName());
         optionalEbomMainEntity.setDeptName(SessionUtil.getDepartName());
         optionalEbomMainEntity.setCreatedTime(new Date());
         optionalEbomMainEntity.setUpdatedTime(new Date());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml
index 311c26f2..f42d610f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml
@@ -31,17 +31,16 @@
 
         from t_optional_ebom_config
         <where>
+            edit_status = #{query.editStatus}
 
-            <if test="query.deviceNo != null and query.deviceNo != ''">
-                  device_no = #{query.deviceNo}
+            <if test="query.deviceName != null and query.deviceName != ''">
+                and( device_name    like concat('%', '${query.deviceName}', '%')   or  device_no  like concat('%', '${query.deviceName}', '%') )
             </if>
+
             <if test="query.createdBy != null and query.createdBy != ''">
                 and created_by = #{query.createdBy}
             </if>
 
-            <if test="query.editStatus != null">
-                and edit_status = #{query.editStatus}
-            </if>
 
         <if test="query.startTime!= null and query.endTime != null">
 			<![CDATA[and created_time >= #{query.startTime}  and created_time  <   #{query.endTime} ]]>
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml
index 031ce76a..cf78e9ae 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml
@@ -30,7 +30,7 @@
 
 
             <if test="query.deviceName != null and query.deviceName != ''">
-                and( device_name    like concat('%', '${query.deviceName}', '%')   or  device_no = #{query.deviceName})
+               and( device_name    like concat('%', '${query.deviceName}', '%')   or  device_no  like concat('%', '${query.deviceName}', '%') )
             </if>