root/material-manage-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 修复无法正确查询地材采集结果的问题

Browse Source
This commit is contained in:
han0
2024-07-11 09:33:48 +08:00
parent 7fcaee8d6a
commit 5e3ccfecaf
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/mjkf/xinke/main/service/LocalMaterialService.java
View File

@@ -2,6 +2,7 @@ package mjkf.xinke.main.service;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import mjkf.xinke.main.constant.MaterialTaskType;
import mjkf.xinke.main.model.db.LocalMaterial; import mjkf.xinke.main.model.db.LocalMaterial;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -72,6 +73,9 @@ public class LocalMaterialService extends DataService<BaseMapper<LocalMaterial>,
if (materialId != null) { if (materialId != null) {
query.eq(LocalMaterial::getMaterialId, materialId); query.eq(LocalMaterial::getMaterialId, materialId);
} }
if (type != null) {
query.like(LocalMaterial::getCity, MaterialTaskType.getRegion(type));
}
return query; return query;
} }

6
src/main/resources/_sql/init/mysql/v0.1.sql
View File

@@ -39,4 +39,8 @@ ALTER TABLE PRICE_PUBLISH
MODIFY COLUMN PRICE_ZHANGZHOUKFQ decimal(16,4) COMMENT '漳州开发区价格' AFTER PRICE_PINTAN; 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 MIN_MONTH varchar(16) NULL COMMENT '最小值月份';
ALTER TABLE BUDGET ADD MAX_MONTH varchar(16) NULL COMMENT '最大值月份'; 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);