From 5d1b1f894e4ea695bd273f09f6bc25aa9134e786 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 14 Nov 2024 15:44:58 +0800
Subject: [PATCH] =?UTF-8?q?11/14=20=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?=
=?UTF-8?q?=E6=9F=A5=E7=94=A8=E5=AD=97=E6=AE=B5=20=E4=BE=9B=E5=BA=94?=
=?UTF-8?q?=E5=95=86=E9=80=89=E5=85=A5=E8=8D=AF=E5=93=81=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2=20=E6=B5=8B=E8=AF=95?=
=?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../auth/SysCustomConfigDetailEntity.java | 6 ++++++
.../api/req/basic/FilterUdiRelRequest.java | 2 ++
.../mapper/auth/SysCustomConfigDetailDao.xml | 7 +++++--
.../mybatis/mapper/basic/UdiRelevanceDao.xml | 21 +++++++++++++++++++
.../mybatis/mapper/basic/UdiRlSupDao.xml | 2 +-
src/main/resources/schemas/schema_v2.4.sql | 6 ++++++
6 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java b/src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java
index 93d9887e..9e59069f 100644
--- a/src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java
+++ b/src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java
@@ -185,4 +185,10 @@ public class SysCustomConfigDetailEntity {
*/
@TableField("isShowXx")
private String isShowXx;
+
+ /**
+ * 是否禁用
+ */
+ @TableField("isImport")
+ private Boolean isImport;
}
diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
index bc6c1e93..43f110d8 100644
--- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
@@ -126,5 +126,7 @@ public class FilterUdiRelRequest extends ListPageRequest {
*/
private String payFeeCode;
+ private String keyWords;
+
}
diff --git a/src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml b/src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml
index 9bc006e6..577727eb 100644
--- a/src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml
@@ -25,10 +25,10 @@
parameterType="com.glxp.api.entity.auth.SysCustomConfigDetailEntity">
INSERT INTO sys_custom_config_detail
(id,configId,type,isShow, columnName,columnDesc,columnType,colorRule,sort,lableRule,width,tooltip,buttonRule,number,
- clickFuc,disabledFuc,expression,size,style,disabled,checkRules,inputType,lineNumber,dataFuc,isShowXx)
+ clickFuc,disabledFuc,expression,size,style,disabled,checkRules,inputType,lineNumber,dataFuc,isShowXx,isImport)
values (#{id},#{configId},#{type},#{isShow}, #{columnName},#{columnDesc},#{columnType},#{colorRule},#{sort},
#{lableRule},#{width},#{tooltip},#{buttonRule},#{number},#{clickFuc},#{disabledFuc},#{expression},#{size},#{style},
- #{disabled}, #{checkRules}, #{inputType}, #{lineNumber}, #{dataFuc},#{isShowXx})
+ #{disabled}, #{checkRules}, #{inputType}, #{lineNumber}, #{dataFuc},#{isShowXx},#{isImport})
@@ -106,6 +106,9 @@
isShowXx=#{isShowXx},
+
+ isImport=#{isImport},
+
WHERE id = #{id}
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 5ca4ab87..91a4df25 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -517,6 +517,27 @@
AND supName LIKE concat('%', #{supName}, '%')
+
+ AND (
+ nameCode LIKE concat('%', #{keyWords}, '%')
+ or ybbm LIKE concat('%', #{keyWords}, '%')
+ or sptm LIKE concat('%', #{keyWords}, '%')
+ or basic_udirel.mainId LIKE concat('%', #{keyWords}, '%')
+ or basic_udirel.thirdId LIKE concat('%', #{keyWords}, '%')
+ or basic_udirel.thirdId1 LIKE concat('%', #{keyWords}, '%')
+ or basic_udirel.thirdId2 LIKE concat('%', #{keyWords}, '%')
+ or basic_udirel.thirdId3 LIKE concat('%', #{keyWords}, '%')
+ or basic_udirel.thirdId4 LIKE concat('%', #{keyWords}, '%')
+ or basic_udirel.thirdId4 LIKE concat('%', #{keyWords}, '%')
+ or basic_products.cpmctymc LIKE concat('%', #{keyWords}, '%')
+ or basic_products.ggxh LIKE concat('%', #{keyWords}, '%')
+ or basic_products.zczbhhzbapzbh LIKE concat('%', #{keyWords}, '%')
+ or basic_products.zczbhhzbapzbh LIKE concat('%', #{keyWords}, '%')
+ or basic_products.manufactory LIKE concat('%', #{keyWords}, '%')
+ or basic_products.ybbm LIKE concat(#{keyWords}, '%')
+ or basic_products.bzgg LIKE concat('%', #{keyWords}, '%')
+ or basic_products.prepnSpec LIKE concat('%', #{keyWords}, '%'))
+
AND (
nameCode LIKE concat('%', #{nameCode}, '%')
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
index e833124e..b1d0ceea 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
@@ -32,7 +32,7 @@
select company_product_relevance.id,
company_product_relevance.customerId,
company_product_relevance.auditStatus,
- company_product_relevance.price,
+ basic_products.price,
basic_udirel.uuid,
basic_udirel.thirdId,
basic_udirel.id rlId,
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 4e2242ee..15d8a42e 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -1191,3 +1191,9 @@ CALL Pro_Temp_ColumnWork('basic_products', 'detailSort',
CALL Pro_Temp_ColumnWork('sync_data_set', 'drugDataTask',
' tinyint NULL DEFAULT NULL COMMENT ''药品关联关系同步''',
1);
+
+
+
+CALL Pro_Temp_ColumnWork('sys_custom_config_detail', 'isImport',
+ ' tinyint NULL DEFAULT NULL COMMENT ''是否常用搜索0：否；1：是''',
+ 1);