From b3585e6475b7a7ab38fcb8af79def5e938a297ea Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期三, 22 十一月 2023 18:45:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
index 0b7c3dd..5145cc3 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
@@ -1,7 +1,8 @@
package com.consum.base.service;
import com.consum.base.core.utils.MapperUtil;
-import com.consum.base.pojo.query.FormProcureQryDto;
+import com.consum.base.core.utils.PageUtil;
+import com.consum.base.pojo.query.FormProcureQry;
import com.consum.model.po.LWhFormProcure;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
@@ -21,7 +22,7 @@
private static String QUERY_FORM_PROCURE_LIST = "SELECT * FROM L_WH_FORM_PROCURE WHERE 1 = 1";
- public GenericPager<LWhFormProcure> queryFormProcureList(FormProcureQryDto param) {
+ public PageUtil<LWhFormProcure> queryFormProcureList(FormProcureQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(QUERY_FORM_PROCURE_LIST);
//鍏ュ簱鍗曞彿
@@ -44,13 +45,13 @@
paramts.put("states", param.getStates());
}
//鍏ュ簱鏃堕棿
- if (param.getIncomeTimeStart() != null) {
+ if (param.getStartTime() != null) {
sql.append(" and INCOME_TIME >=:incomeTimeStart ");
- paramts.put("incomeTimeStart", param.getIncomeTimeStart() * 1000000);
+ paramts.put("incomeTimeStart", param.getStartTime() * 1000000);
}
- if (param.getIncomeTimeEnd() != null) {
+ if (param.getEndTime() != null) {
sql.append(" and INCOME_TIME <:incomeTimeEnd ");
- paramts.put("incomeTimeEnd", param.getIncomeTimeEnd() * 1000000 + 240000);
+ paramts.put("incomeTimeEnd", param.getEndTime() * 1000000 + 240000);
}
//鐗╁搧鍚嶇О
if (!StringUtils.isEmpty(param.getGoodsTemplateName())) {
@@ -60,11 +61,12 @@
}
sql.append(" ORDER BY PROCURE_TIME DESC");
GenericPager genericPager = selectSplit(sql.toString(), paramts, new LWhFormProcure());
- return genericPager;
+ PageUtil pageUtil = new PageUtil(genericPager);
+ return pageUtil;
}
- public GenericPager<Map<String, Object>> queryFormProcureDetailList(FormProcureQryDto param) {
+ public GenericPager<Map<String, Object>> queryFormProcureDetailList(FormProcureQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder("SELECT pm.id,fp.BUSINESS_FORM_CODE,fpg.GOODS_TEMPLATE_NAME,pm.PRICE,pm.COUNTS, "
+ "( pm.PRICE * pm.COUNTS ) amount,fp.AGENCY_NAME,fp.BUYER_NAME,fp.PROCURE_TIME,pm.BUSINESS_ID,pm.BASE_GOODS_MODELS_NAME FROM l_wh_procure_model pm "
@@ -90,14 +92,14 @@
paramts.put("buyerName", param.getCreateName());
}
//鍏ュ簱寮�濮嬫椂闂�
- if (param.getIncomeTimeStart() != null) {
+ if (param.getStartTime() != null) {
sql.append("and INCOME_TIME >=:incomeTimeStart ");
- paramts.put("incomeTimeStart", param.getIncomeTimeStart() * 1000000);
+ paramts.put("incomeTimeStart", param.getStartTime() * 1000000);
}
//鍏ュ簱缁撴潫鏃堕棿
- if (param.getIncomeTimeEnd() != null) {
+ if (param.getEndTime() != null) {
sql.append("and INCOME_TIME <:incomeTimeEnd ");
- paramts.put("incomeTimeEnd", param.getIncomeTimeEnd() * 1000000 + 240000);
+ paramts.put("incomeTimeEnd", param.getEndTime() * 1000000 + 240000);
}
//瑙勬牸鍨嬪彿
if (param.getBaseGoodsModelsId() != null) {
--
Gitblit v1.9.1