Pārlūkot izejas kodu

fix: 列表查询分页参数默认修改

dongbw 7 gadi atpakaļ
vecāks
revīzija
b7203abeb1

+ 1 - 0
src/main/java/com/uas/ps/inquiry/controller/PublicInquiryController.java

@@ -68,6 +68,7 @@ public class PublicInquiryController {
     @RequestMapping(method = RequestMethod.GET)
     public IPage<PurcInquiryItemInfo> getInquiry(PageInfo pageInfo, SearchFilter searchFilter, String distributes) {
         long start = System.currentTimeMillis();
+        pageInfo = pageInfo.defaultSet(pageInfo);
         log.info("/inquiry/public, 查询公共询价信息, pageInfo: {}, searchFilter: {}, distributes: {}", JSON.toJSON(pageInfo), JSON.toJSON(searchFilter), distributes);
         if (!StringUtils.isEmpty(distributes)) {
             List<Long> distribute = JSONObject.parseArray(distributes, Long.class);

+ 17 - 13
src/main/java/com/uas/ps/inquiry/page/PageInfo.java

@@ -20,19 +20,7 @@ import java.util.*;
 public class PageInfo implements Pageable {
 
 	public PageInfo() {
-        // 不传入页面大小,默认页面大小为5
-        if (this.pageSize == 0) {
-            this.pageSize = 5;
-        }
-        // 页面大小最大不可超过1000,防止服务器崩溃
-        if (this.pageSize > 1000) {
-            throw new IllegalOperatorException("页面大小不可超过1000");
-        }
-        if (this.pageNumber == 0) {
-            // 不传入页码,默认为第一页
-            this.pageNumber = 1;
-        }
-        this.offset = this.pageSize * (this.pageNumber - 1);
+
 	}
 
 	/**
@@ -457,4 +445,20 @@ public class PageInfo implements Pageable {
 		};
 	}
 
+	public PageInfo defaultSet(PageInfo pageInfo) {
+		// 不传入页面大小,默认页面大小为5
+		if (pageInfo.getPageSize() == 0) {
+			pageInfo.setPageSize(5);
+		}
+		// 页面大小最大不可超过1000,防止服务器崩溃
+		if (pageInfo.getPageSize() > 1000) {
+			throw new IllegalOperatorException("页面大小不可超过1000");
+		}
+		if (pageInfo.getPageNumber() == 0) {
+			// 不传入页码,默认为第一页
+			pageInfo.setPageNumber(1);
+		}
+		pageInfo.setOffset(pageInfo.getPageSize() * (pageInfo.getPageNumber() - 1));
+		return pageInfo;
+	}
 }

+ 2 - 3
src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -905,8 +905,8 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                 String sql = "update purc$puInquiryItems set id_overdue = 1 where id_id = " +
                         "(select id_sourceid from public$inquiryItems where id_id = " + detail.getB2b_id_id() + ")";
                 jdbcTemplate.update(sql);
-                // 更新已转报价的询价单明细状态
-                jdbcTemplate.update("update public$inquiryItems set id_checked = 1 where id_id = " + detail.getB2b_id_id());
+//                // 更新已转报价的询价单明细状态
+//                jdbcTemplate.update("update public$inquiryItems set id_checked = 1 where id_id = " + detail.getB2b_id_id());
             }
         }
     }
@@ -1354,7 +1354,6 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
             SimpleExpression brand = new SimpleExpression("inbrand", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
             SimpleExpression title = new SimpleExpression("prodTitle", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
             SimpleExpression spec = new SimpleExpression("spec", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
-//            SimpleExpression code = new SimpleExpression("inquiry.code", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
             SimpleExpression enName = new SimpleExpression("inquiry.enName", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
             SimpleExpression[] simpleExpressions = null;
             if (!StringUtils.isEmpty(filter.getIsLogin()) && filter.getIsLogin() == 1) {