Ver código fonte

预测对比查询可以自定义升序还是降序

王苗苗 7 meses atrás
pai
commit
41868f3f3c

+ 3 - 2
slibra-admin/src/main/java/com/slibra/web/controller/business/TXinyiForecastComparisonController.java

@@ -28,8 +28,7 @@ import com.slibra.business.service.ITXinyiForecastComparisonService;
 import com.slibra.common.utils.poi.ExcelUtil;
 import com.slibra.common.core.page.TableDataInfo;
 
-import static com.slibra.common.constant.MyConstants.BigDecimal_100;
-import static com.slibra.common.constant.MyConstants.PERCENT_SYMBOL;
+import static com.slibra.common.constant.MyConstants.*;
 
 /**
  * 信义预测对比Controller
@@ -81,6 +80,8 @@ public class TXinyiForecastComparisonController extends BaseController
         if(StringUtils.isBlank(timeEnd))
             tXinyiForecastComparison.setTimeEnd(nowDateStr);
         //        this.addListExtra(list);//处理误差率 乘以100,取绝对值 保留2位小数
+        //2024年08月16日14:37:52  同一个SQL,不同排序
+        tXinyiForecastComparison.setSort(SORT_ASC);
         return tXinyiForecastComparisonService.selectTXinyiForecastComparisonList(tXinyiForecastComparison);
     }
 

+ 2 - 0
slibra-common/src/main/java/com/slibra/common/constant/MyConstants.java

@@ -340,6 +340,8 @@ public class MyConstants {
 
     public static final String DEFAULT_PROMPT = "你是LibraAI水务大模型,由红杉天枰开发的水务垂直大语言模型,能够提供水务行业专家问答、智能决策、报表分析、智能工单管理等一系列功能,作为水务人的AI助手,你会竭尽全力帮助我处理工作问题。";
 
+    public static final String SORT_ASC = "asc";
+    public static final String SORT_DESC = "desc";
 
     public static void main(String[] args) {
         System.out.println(DecimalUtils.getAbsAndScale(new BigDecimal("2.211"), MyConstants.INT_0));

+ 6 - 0
slibra-system/src/main/java/com/slibra/business/domain/TXinyiForecastComparison.java

@@ -14,6 +14,7 @@ import com.slibra.common.annotation.Excel;
 import com.slibra.common.core.domain.BaseEntity;
 
 import static com.slibra.common.constant.MyConstants.PERCENT_SYMBOL;
+import static com.slibra.common.constant.MyConstants.SORT_DESC;
 
 /**
  * 信义预测对比对象 t_xinyi_forecast_comparison
@@ -165,6 +166,11 @@ public class TXinyiForecastComparison extends BaseEntity
     private String timeEnd;
 
 
+
+    //2024年08月16日14:23:50  新增字段,降序还是升序
+    private String sort = SORT_DESC;
+
+
     //2024年6月24日15:27:47 因为导出关系,必须要set进去才能有结果
     /*public String getHsErrorRateOneStr() {
         if(Objects.isNull(hsErrorRateOne))

+ 9 - 1
slibra-system/src/main/resources/mapper/business/TXinyiForecastComparisonMapper.xml

@@ -211,7 +211,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="timeBegin != null  and timeBegin != ''"> and remark &gt;= #{timeBegin}</if>
             <if test="timeEnd != null  and timeEnd != ''"> and remark &lt;= #{timeEnd}</if>
         </where>
-        and del_flag = 0 order by id asc
+        and del_flag = 0
+        <choose>
+            <when test="sort != null  and sort != ''">
+                order by id ${sort}
+            </when>
+            <otherwise>
+                order by id desc
+            </otherwise>
+        </choose>
     </select>
 
     <select id="selectNewestForecastComparison" resultMap="TXinyiForecastComparisonResult">