diff --git a/src/main/java/mjkf/xinke/main/controller/PricePublishController.java b/src/main/java/mjkf/xinke/main/controller/PricePublishController.java index 86ab731..5446c28 100644 --- a/src/main/java/mjkf/xinke/main/controller/PricePublishController.java +++ b/src/main/java/mjkf/xinke/main/controller/PricePublishController.java @@ -52,7 +52,7 @@ public class PricePublishController { if (month < 0 || year < 0) { var date = pricePublishService.getLatestDate(); year = date.getYear(); - month = date.getMonth(); + month = date.getMonthValue(); } var query = pricePublishService.getQuery(year, month, materialId, name, spec, type); diff --git a/src/main/java/mjkf/xinke/main/service/PricePublishService.java b/src/main/java/mjkf/xinke/main/service/PricePublishService.java index 6b23f03..b842416 100644 --- a/src/main/java/mjkf/xinke/main/service/PricePublishService.java +++ b/src/main/java/mjkf/xinke/main/service/PricePublishService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import mjkf.xinke.main.model.vo.BudgetCreateRequest; import org.springframework.stereotype.Service; -import java.util.Date; +import java.time.LocalDate; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -58,12 +58,12 @@ public class PricePublishService extends ServiceImpl, P return result; } - public Date getLatestDate() { + public LocalDate getLatestDate() { var query = new LambdaQueryWrapper(); query.orderByDesc(PricePublish::getYear); query.orderByDesc(PricePublish::getMonth); var data = this.getOne(query, false); - var result = new Date(data.getYear(), data.getMonth(), 1); + var result = LocalDate.of(data.getYear(), data.getMonth(), 1); return result; } }