2024-10-13

src/main/java/com/spring/modules/sift/utils/QueryCriteriaConstructorDefault.java

@@ -25,6 +25,8 @@ public class QueryCriteriaConstructorDefault implements QueryCriteriaConstructor
     private QuerySavedHeaderService querySavedHeaderService;
     @Autowired
     private QuerySavedDetailService querySavedDetailService;
+    @Autowired
+    private QueryUserSettingUtils queryUserSettingUtils;
     @Override
     public String EQ(QuerySavedDetail querySavedDetail) {
         if ("F".equals(querySavedDetail.getDataType()) || "I".equals(querySavedDetail.getDataType())){
@@ -183,6 +185,7 @@ public class QueryCriteriaConstructorDefault implements QueryCriteriaConstructor
     @Transactional
     public String lastConditionalStatement(QuerySavedVo querySavedVo) {
         extracted(querySavedVo);
+        queryUserSettingUtils.lastQuery(querySavedVo);
         Optional<QuerySavedDetail> any = querySavedVo.getQuerySavedDetailList().stream().filter(a -> StringUtils.hasText(a.getSortBy())).findAny();
         StringBuilder order = new StringBuilder(any.isPresent()?" ORDER BY ":"");
         StringBuilder where = new StringBuilder();

src/main/java/com/spring/modules/sift/utils/QueryCriteriaConstructorWrapper.java

@@ -3,6 +3,7 @@ package com.spring.modules.sift.utils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.spring.modules.sift.entity.QuerySavedDetail;
 import com.spring.modules.sift.vo.QuerySavedVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
@@ -11,6 +12,9 @@ public class QueryCriteriaConstructorWrapper<T> implements QueryCriteriaConstruc
 
     private final QueryWrapper<T> wrapper = new QueryWrapper<>();
 
+    @Autowired
+    private QueryUserSettingUtils queryUserSettingUtils;
+
     @Override
     public QueryWrapper<T> EQ(QuerySavedDetail querySavedDetail) {
         if ("F".equals(querySavedDetail.getDataType()) || "I".equals(querySavedDetail.getDataType())){
@@ -181,6 +185,7 @@ public class QueryCriteriaConstructorWrapper<T> implements QueryCriteriaConstruc
     @Override
     public QueryWrapper<T> lastConditionalStatement(QuerySavedVo querySavedVo) {
         extracted(querySavedVo);
+        queryUserSettingUtils.lastQuery(querySavedVo);
         querySavedVo.getQuerySavedDetailList().forEach(querySavedDetail -> {
             // 排序处理
             if ("asc".equals(querySavedDetail.getSortBy())){