From 24fc98301c0b38a76b7d5aa704fe79a2e385e584 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 29 十一月 2023 14:20:41 +0800
Subject: [PATCH] feat: 1、物品分发部门查询 2、分发新增数量校验
---
consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java | 101 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 80 insertions(+), 21 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 5f497b8..a3b1464 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,21 @@
package com.consum.base.service;
-import com.consum.base.core.tools.MapperUtil;
-import com.consum.base.pojo.query.FormProcureQryDto;
+import com.consum.base.core.utils.MapUtils;
+import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.core.utils.PageUtil;
+import com.consum.base.pojo.excel.TemplateExcelExport;
+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.DateUtils;
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 java.util.Optional;
+import org.apache.commons.compress.utils.Lists;
import org.springframework.stereotype.Service;
/**
@@ -21,7 +29,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 +52,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,17 +68,17 @@
}
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 "
- + "LEFT JOIN l_wh_form_procure fp ON pm.BUSINESS_ID = fp.id "
- + "LEFT JOIN l_wh_form_procure_goods fpg ON fp.id = fpg.WH_FORM_PROCURE_ID WHERE pm.BUSINESS_TYPE = 1 ");
+ 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 "
+ + "LEFT JOIN l_wh_form_procure fp ON pm.BUSINESS_ID = fp.id "
+ + "LEFT JOIN l_wh_form_procure_goods fpg ON fp.id = fpg.WH_FORM_PROCURE_ID WHERE pm.BUSINESS_TYPE = 1 ");
//鍏ュ簱鍗曞彿
if (!StringUtils.isEmpty(param.getBusinessFormCode())) {
sql.append("and BUSINESS_FORM_CODE = :businessFormCode ");
@@ -91,19 +99,19 @@
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.getBaseGoodsTemplateId() != null) {
- sql.append("and fpg.BASE_GOODS_TEMPLATE_ID =:baseGoodsTemplateId ");
- paramts.put("baseGoodsTemplateId",param.getBaseGoodsTemplateId());
+ if (param.getBaseGoodsModelsId() != null) {
+ sql.append("and pm.BASE_GOODS_MODELS_ID =:baseGoodsModelsId ");
+ paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
}
sql.append("ORDER BY PROCURE_TIME DESC");
@@ -112,4 +120,55 @@
}
+ public Map<String, Object> getExportList(Long id, String userName) {
+ String sql = "SELECT\n"
+ + "\tfp.BUSINESS_FORM_CODE,\n"
+ + "\tfp.AGENCY_NAME tenantName,\n"
+ + "\tGOODS_NAME goodsName,\n"
+ + "\tpm.BASE_GOODS_MODELS_NAME goodsModeName,\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<TemplateExcelExport> list = Lists.newArrayList();
+ select.forEach(item -> {
+ TemplateExcelExport templateExcelExport = MapUtils.convertMapToObj(item, TemplateExcelExport.class);
+ templateExcelExport.setTotalAmount(templateExcelExport.getTotalAmount() == null ? 0 : templateExcelExport.getTotalAmount());
+ templateExcelExport.setNum(templateExcelExport.getNum() == null ? 0 : templateExcelExport.getNum());
+ templateExcelExport.setTenantName(StringUtils.isNotEmpty(templateExcelExport.getTenantName()) ? templateExcelExport.getTenantName() : "");
+ templateExcelExport.setRemark(StringUtils.isNotEmpty(templateExcelExport.getRemark()) ? templateExcelExport.getRemark() : "");
+ list.add(templateExcelExport);
+ });
+ int sum = list.stream().filter(item -> item.getNum() != null).mapToInt(TemplateExcelExport::getNum).sum();
+ int totalAmount = list.stream().filter(export -> export.getTotalAmount() != null).mapToInt(TemplateExcelExport::getTotalAmount).sum();
+ Optional<TemplateExcelExport> first = list.stream().findFirst();
+ TemplateExcelExport templateExcelExport = first.get();
+ String businessFormCode = templateExcelExport.getBusinessFormCode();
+
+ String dateForHuman = DateUtils.getDateForHuman(System.currentTimeMillis());
+ Map<String, Object> map = new HashMap<>();
+ map.put("code", businessFormCode);
+ map.put("date", dateForHuman);
+ map.put("name", userName);
+ map.put("sum", sum);
+ map.put("totalAmount", totalAmount);
+ map.put("data", list);
+ return map;
+
+ }
}
--
Gitblit v1.9.1