From 5e3ccfecaf2933ed7e0f5d69b2fce93fcbbcd115 Mon Sep 17 00:00:00 2001 From: han0 Date: Thu, 11 Jul 2024 09:33:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E6=9F=A5=E8=AF=A2=E5=9C=B0=E6=9D=90=E9=87=87?= =?UTF-8?q?=E9=9B=86=E7=BB=93=E6=9E=9C=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/mjkf/xinke/main/service/LocalMaterialService.java | 4 ++++ src/main/resources/_sql/init/mysql/v0.1.sql | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/mjkf/xinke/main/service/LocalMaterialService.java b/src/main/java/mjkf/xinke/main/service/LocalMaterialService.java index b928874..23af11a 100644 --- a/src/main/java/mjkf/xinke/main/service/LocalMaterialService.java +++ b/src/main/java/mjkf/xinke/main/service/LocalMaterialService.java @@ -2,6 +2,7 @@ package mjkf.xinke.main.service; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import mjkf.xinke.main.constant.MaterialTaskType; import mjkf.xinke.main.model.db.LocalMaterial; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springframework.stereotype.Service; @@ -72,6 +73,9 @@ public class LocalMaterialService extends DataService, if (materialId != null) { query.eq(LocalMaterial::getMaterialId, materialId); } + if (type != null) { + query.like(LocalMaterial::getCity, MaterialTaskType.getRegion(type)); + } return query; } diff --git a/src/main/resources/_sql/init/mysql/v0.1.sql b/src/main/resources/_sql/init/mysql/v0.1.sql index 8bcb6d4..a066e20 100644 --- a/src/main/resources/_sql/init/mysql/v0.1.sql +++ b/src/main/resources/_sql/init/mysql/v0.1.sql @@ -39,4 +39,8 @@ ALTER TABLE PRICE_PUBLISH MODIFY COLUMN PRICE_ZHANGZHOUKFQ decimal(16,4) COMMENT '漳州开发区价格' AFTER PRICE_PINTAN; ALTER TABLE BUDGET ADD MIN_MONTH varchar(16) NULL COMMENT '最小值月份'; -ALTER TABLE BUDGET ADD MAX_MONTH varchar(16) NULL COMMENT '最大值月份'; \ No newline at end of file +ALTER TABLE BUDGET ADD MAX_MONTH varchar(16) NULL COMMENT '最大值月份'; + +-- +DROP INDEX Idx_key ON SANMING_STEEL; +CREATE UNIQUE INDEX Idx_key ON SANMING_STEEL (NAME, SPEC, DATE); \ No newline at end of file