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