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

fix: 调整住建厅数据趋势内容

Browse Source
This commit is contained in:
han0
2024-07-12 08:48:29 +08:00
parent 89c9ffd213
commit f774c521c9
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/mjkf/xinke/main/service/DataFujianService.java
View File

@@ -3,6 +3,7 @@ package mjkf.xinke.main.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import mjkf.xinke.main.model.db.DataFujian; import mjkf.xinke.main.model.db.DataFujian;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import mjkf.xinke.main.model.db.PriceResult;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDate; import java.time.LocalDate;
@@ -61,8 +62,16 @@ public class DataFujianService extends DataService<BaseMapper<DataFujian>, DataF
var data = (DataFujian) obj; var data = (DataFujian) obj;
LambdaQueryWrapper<DataFujian> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<DataFujian> query = new LambdaQueryWrapper<>();
query.eq(DataFujian::getName, data.getName()); query.eq(DataFujian::getName, data.getName());
var date = LocalDate.of(year, month, 1); query.eq(DataFujian::getCity, data.getCity());
query.between(DataFujian::getDate, date.minusYears(1), date.plusMonths(1)); query.eq(DataFujian::getSpec, data.getSpec());
var endDate = LocalDate.of(year, month, 1).plusMonths(1);
var startDate = endDate.minusYears(1);
query.and(e -> e
.eq(DataFujian::getYear, startDate.getYear())
.between(DataFujian::getMonth, startDate.getMonth(), 12).or()
.eq(DataFujian::getYear, endDate.getYear())
.between(DataFujian::getMonth, 1, endDate.getMonth())
);
return query; return query;
} }