From 9b2d3eab108467d512a79c00e7bab3109cd228db Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Fri, 12 Jul 2024 15:37:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=94=B9=E4=BD=8F=E5=BB=BA?=
 =?UTF-8?q?=E5=8E=85=E9=87=87=E9=9B=86=E7=BB=93=E6=9E=9C=E8=B6=8B=E5=8A=BF?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/mjkf/xinke/main/constant/MaterialTaskType.java | 5 -----
 .../java/mjkf/xinke/main/controller/BudgetController.java    | 2 +-
 .../mjkf/xinke/main/controller/PricePublishController.java   | 2 +-
 src/main/java/mjkf/xinke/main/service/DataFujianService.java | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/main/java/mjkf/xinke/main/constant/MaterialTaskType.java b/src/main/java/mjkf/xinke/main/constant/MaterialTaskType.java
index b6ec596..c6ae5e1 100644
--- a/src/main/java/mjkf/xinke/main/constant/MaterialTaskType.java
+++ b/src/main/java/mjkf/xinke/main/constant/MaterialTaskType.java
@@ -295,10 +295,5 @@ public class MaterialTaskType {
         );
         return types.contains(type);
     }
-
-    /**
-     * todo-1 数据展示模块 地市暂不切换
-     * todo-1 计算模块更新
-     */
 }
 
diff --git a/src/main/java/mjkf/xinke/main/controller/BudgetController.java b/src/main/java/mjkf/xinke/main/controller/BudgetController.java
index ee01644..b8d582e 100644
--- a/src/main/java/mjkf/xinke/main/controller/BudgetController.java
+++ b/src/main/java/mjkf/xinke/main/controller/BudgetController.java
@@ -154,5 +154,5 @@ public class BudgetController {
         return FuHttpResponse.Builder().dataResponse(budgetItemList).build();
     }
 
-    // todo 在价格发布创建时补全材料id
+    // todo-2 在价格发布创建时补全材料id
 }
diff --git a/src/main/java/mjkf/xinke/main/controller/PricePublishController.java b/src/main/java/mjkf/xinke/main/controller/PricePublishController.java
index 47f1909..f458f6e 100644
--- a/src/main/java/mjkf/xinke/main/controller/PricePublishController.java
+++ b/src/main/java/mjkf/xinke/main/controller/PricePublishController.java
@@ -30,7 +30,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/price-publish")
 public class PricePublishController {
-    // todo-1 系统日志
+
     @Resource
     PricePublishService pricePublishService;
 
diff --git a/src/main/java/mjkf/xinke/main/service/DataFujianService.java b/src/main/java/mjkf/xinke/main/service/DataFujianService.java
index 0c7c97e..3cc7aed 100644
--- a/src/main/java/mjkf/xinke/main/service/DataFujianService.java
+++ b/src/main/java/mjkf/xinke/main/service/DataFujianService.java
@@ -3,7 +3,6 @@ package mjkf.xinke.main.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import mjkf.xinke.main.model.db.DataFujian;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import mjkf.xinke.main.model.db.PriceResult;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
@@ -72,6 +71,7 @@ public class DataFujianService extends DataService<BaseMapper<DataFujian>, DataF
                 .eq(DataFujian::getYear, endDate.getYear())
                 .between(DataFujian::getMonth, 1, endDate.getMonth())
         );
+        query.orderByAsc(DataFujian::getYear, DataFujian::getMonth);
         return query;
     }