From c1ac6d13630b04b4e11d6f383858e4f8fa64f924 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 02 十二月 2023 17:24:34 +0800
Subject: [PATCH] 盘点查询返回结果修改
---
consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java | 67 +++++++++++++++++++++++++++------
1 files changed, 55 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..f2b8590 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,13 +1,19 @@
package com.consum.base.service;
+import com.consum.base.core.utils.MapUtils;
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.excel.ProcureExcelTemplate;
+import com.consum.base.pojo.query.FormProcureQry;
import com.consum.model.po.LWhFormProcure;
import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import org.apache.commons.compress.utils.Lists;
import org.springframework.stereotype.Service;
/**
@@ -21,7 +27,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 +50,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 +66,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 +97,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) {
@@ -111,4 +118,40 @@
}
+ public List<ProcureExcelTemplate> getExportList(Long id) {
+ String sql = "SELECT\n"
+ + "\tfp.BUSINESS_FORM_CODE,\n"
+ + "\tfp.AGENCY_NAME tenantName,\n"
+ + "\tfp.INCOME_TIME createTime,\n"
+ + "\tfp.INCOME_NAME operatorName,\n"
+ + "\tGOODS_NAME templateName,\n"
+ + "\tpm.BASE_GOODS_MODELS_NAME baseModelName,\n"
+ + "\tcounts num,\n"
+ + "\tprice,\n"
+ + "\ttotal_amount totalAmount,\n"
+ + "\tWAREHOUSE_NAME,\n"
+ + "\tBEIZ remark\n"
+ + "FROM\n"
+ + "\tl_wh_procure_model pm\n"
+ + "\tLEFT JOIN base_goods_models bgm ON pm.BASE_GOODS_MODELS_ID = bgm.id\n"
+ + "\tLEFT JOIN base_goods_template bgt ON bgm.GOODS_TEMPLATES_ID = bgt.id\n"
+ + "\tLEFT JOIN l_wh_form_procure fp ON fp.ID = pm.BUSINESS_ID\n"
+ + "WHERE\n"
+ + "\tpm.BUSINESS_ID = :id";
+ Map<String, Object> param = new HashMap<>();
+ param.put("id", id);
+ List<Map<String, Object>> select = this.select(sql, param, new MapperUtil());
+ if (CollectionUtils.isEmpty(select)) {
+ return null;
+ }
+
+ List<ProcureExcelTemplate> list = Lists.newArrayList();
+ select.forEach(item -> {
+ ProcureExcelTemplate templateExcelExport = MapUtils.convertMapToObj(item, ProcureExcelTemplate.class);
+ list.add(templateExcelExport);
+ });
+ return list;
+
+
+ }
}
--
Gitblit v1.9.1