From 0c1dd25eabc4472c007951d528ee7385cc114e32 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 11 十一月 2023 19:06:23 +0800
Subject: [PATCH] -- 采购单 -- 分类
---
consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java | 72 ++++++++++++++++++++++++++++++------
1 files changed, 60 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 d0189f9..5f497b8 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,17 +1,17 @@
package com.consum.base.service;
-import com.consum.base.pojo.LWhFormProcureParam;
+import com.consum.base.core.tools.MapperUtil;
+import com.consum.base.pojo.query.FormProcureQryDto;
import com.consum.model.po.LWhFormProcure;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
import java.util.HashMap;
+import java.util.Map;
+import org.springframework.stereotype.Service;
/**
* @ClassName lWhFormProcureService
-
* @Date 2023/10/24
* @Description 閲囪喘鍗�
* @Version 1.0
@@ -21,7 +21,7 @@
private static String QUERY_FORM_PROCURE_LIST = "SELECT * FROM L_WH_FORM_PROCURE WHERE 1 = 1";
- public GenericPager<LWhFormProcure> queryFormProcureList(LWhFormProcureParam param) {
+ public GenericPager<LWhFormProcure> queryFormProcureList(FormProcureQryDto param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(QUERY_FORM_PROCURE_LIST);
//鍏ュ簱鍗曞彿
@@ -29,19 +29,19 @@
sql.append(" and BUSINESS_FORM_CODE like :businessFormCode ");
paramts.put("businessFormCode", StringUtils.CHAR_PERCENT + param.getBusinessFormCode() + StringUtils.CHAR_PERCENT);
}
- if (param.getAgencyId() != null){
+ if (param.getAgencyId() != null) {
sql.append(" and AGENCY_ID like :agencyId ");
- paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
+ paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
}
//鍒涘缓浜�
- if (!StringUtils.isEmpty(param.getBuyerName())) {
+ if (!StringUtils.isEmpty(param.getCreateName())) {
sql.append(" and buyer_Name =:buyerName ");
- paramts.put("buyerName", param.getBuyerName());
+ paramts.put("buyerName", param.getCreateName());
}
//鐘舵��
if (param.getStates() != null) {
- sql.append(" and status =:status ");
- paramts.put("status", param.getStates());
+ sql.append(" and states =:states ");
+ paramts.put("states", param.getStates());
}
//鍏ュ簱鏃堕棿
if (param.getIncomeTimeStart() != null) {
@@ -54,7 +54,8 @@
}
//鐗╁搧鍚嶇О
if (!StringUtils.isEmpty(param.getGoodsTemplateName())) {
- sql.append(" AND id IN (SELECT BUSINESS_ID FROM L_WH_PROCURE_MODEL procureModel LEFT JOIN BASE_GOODS_MODELS baseModel ON procureModel.BASE_GOODS_MODELS_ID=baseModel.ID LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseModel.GOODS_TEMPLATES_ID=baseTemp.id WHERE procureModel.BUSINESS_TYPE=1 AND baseTemp.GOODS_NAME LIKE :goodsTemplateName)");
+ sql.append(
+ " AND id IN (SELECT BUSINESS_ID FROM L_WH_PROCURE_MODEL procureModel LEFT JOIN BASE_GOODS_MODELS baseModel ON procureModel.BASE_GOODS_MODELS_ID=baseModel.ID LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseModel.GOODS_TEMPLATES_ID=baseTemp.id WHERE procureModel.BUSINESS_TYPE=1 AND baseTemp.GOODS_NAME LIKE :goodsTemplateName)");
paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
sql.append(" ORDER BY PROCURE_TIME DESC");
@@ -63,5 +64,52 @@
}
+ public GenericPager<Map<String, Object>> queryFormProcureDetailList(FormProcureQryDto 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 ");
+ //鍏ュ簱鍗曞彿
+ if (!StringUtils.isEmpty(param.getBusinessFormCode())) {
+ sql.append("and BUSINESS_FORM_CODE = :businessFormCode ");
+ paramts.put("businessFormCode", param.getBusinessFormCode());
+ }
+ //鐗╁搧鍚嶇О
+ if (!StringUtils.isEmpty(param.getGoodsTemplateName())) {
+ sql.append("and fpg.GOODS_TEMPLATE_NAME like :goodsTemplateName ");
+ paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ }
+ if (param.getAgencyId() != null) {
+ sql.append("and AGENCY_ID like :agencyId ");
+ paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
+ }
+ //鍒涘缓浜�
+ if (!StringUtils.isEmpty(param.getCreateName())) {
+ sql.append("and buyer_Name =:buyerName ");
+ paramts.put("buyerName", param.getCreateName());
+ }
+ //鍏ュ簱寮�濮嬫椂闂�
+ if (param.getIncomeTimeStart() != null) {
+ sql.append("and INCOME_TIME >=:incomeTimeStart ");
+ paramts.put("incomeTimeStart", param.getIncomeTimeStart() * 1000000);
+ }
+ //鍏ュ簱缁撴潫鏃堕棿
+ if (param.getIncomeTimeEnd() != null) {
+ sql.append("and INCOME_TIME <:incomeTimeEnd ");
+ paramts.put("incomeTimeEnd", param.getIncomeTimeEnd() * 1000000 + 240000);
+ }
+ //瑙勬牸鍨嬪彿
+ if (param.getBaseGoodsTemplateId() != null) {
+ sql.append("and fpg.BASE_GOODS_TEMPLATE_ID =:baseGoodsTemplateId ");
+ paramts.put("baseGoodsTemplateId",param.getBaseGoodsTemplateId());
+ }
+
+ sql.append("ORDER BY PROCURE_TIME DESC");
+ GenericPager genericPager = selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
+ return genericPager;
+
+ }
}
--
Gitblit v1.9.1