From b34b160a7332f94015fc047455b718e303920dc8 Mon Sep 17 00:00:00 2001
From: lilibo <1471506043@qq.com>
Date: 星期三, 22 一月 2025 10:58:23 +0800
Subject: [PATCH] 漏洞修改 升级tomcat版本
---
consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 115 insertions(+), 4 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java
index 664ffa8..4dd6741 100644
--- a/consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java
@@ -3,6 +3,7 @@
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.query.LWhLedgerQry;
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 org.springframework.stereotype.Service;
@@ -20,7 +21,8 @@
@Service
public class FinWarehouseLedgerServiceImpl extends BaseServiceImpl {
- private static String LEDGER_LIST_QUERY_PREFIX = "SELECT ware.AGENCY_NAME ,ware.WAREHOUSE_NAME ,goodsTemp.CATEGORY_NAME ,CASE goods.COST_TYPE WHEN 1 THEN 'A绫�' WHEN 2 THEN 'B绫�' WHEN 3 THEN 'C绫�' END AS cost_Type,goods.GOODS_TEMPLATE_NAME ,goods.BASE_GOODS_MODELS_NAME ,goods.UNIT unit,COUNt(goods.id) kucun FROM L_WH_GOODS goods LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON goods.BASE_GOODS_TEMPLATE_ID=goodsTemp.id LEFT JOIN BASE_WAREHOUSE ware ON ware.id=goods.WAREHOUSE_ID where 1=1 ";
+ private final String LEDGER_LIST_QUERY_PREFIX = "SELECT ware.AGENCY_NAME ,ware.WAREHOUSE_NAME ,goodsTemp.CATEGORY_NAME ,CASE goods.COST_TYPE WHEN 1 THEN 'A绫�' WHEN 2 THEN 'B绫�' WHEN 3 THEN 'C绫�' END AS cost_Type,goods.GOODS_TEMPLATE_NAME ,goods.BASE_GOODS_MODELS_NAME ,goods.UNIT unit,COUNt(goods.id) kucun FROM L_WH_GOODS goods LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON goods.BASE_GOODS_TEMPLATE_ID=goodsTemp.id LEFT JOIN BASE_WAREHOUSE ware ON ware.id=goods.WAREHOUSE_ID where 1=1 ";
+ private final String LEDGER_LIST_QUERY_GROUP = " GROUP BY ware.AGENCY_NAME,ware.WAREHOUSE_NAME,goodsTemp.CATEGORY_NAME,goods.COST_TYPE,goods.GOODS_TEMPLATE_NAME,goods.BASE_GOODS_MODELS_NAME,goods.UNIT";
public GenericPager<Map<String, Object>> ledgerList(LWhLedgerQry param) {
StringBuilder sql = new StringBuilder(LEDGER_LIST_QUERY_PREFIX);
@@ -32,8 +34,9 @@
}
//鏈烘瀯
if (param.getAgencyId() != null) {
- sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
- paramts.put("lengthAgencyId", param.getAgencyId());
+// sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
+ sql.append(" and ware.AGENCY_ID = :agencyId");
+// paramts.put("lengthAgencyId", param.getAgencyId());
paramts.put("agencyId", param.getAgencyId());
}
//浠撳簱绫诲瀷
@@ -64,7 +67,115 @@
sql.append(" AND goods.COST_TYPE=:costType");
paramts.put("costType", param.getCostType());
}
- sql.append(" GROUP BY ware.AGENCY_NAME,ware.WAREHOUSE_NAME,goodsTemp.CATEGORY_NAME,goods.COST_TYPE,goods.GOODS_TEMPLATE_NAME,goods.BASE_GOODS_MODELS_NAME,goods.UNIT");
+ sql.append(LEDGER_LIST_QUERY_GROUP);
+ return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
+ }
+
+ private final String DEPT_LEDGER_LIST_QUERY_PREFIX = "SELECT tenant.`name` AS AGENCY_NAME,ware.`name` depart_name,goodsTemp.CATEGORY_NAME,CASE goods.COST_TYPE WHEN 1 THEN 'A绫�' WHEN 2 THEN 'B绫�' WHEN 3 THEN 'C绫�' END AS cost_Type,goods.GOODS_TEMPLATE_NAME,goods.BASE_GOODS_MODELS_NAME,goods.UNIT unit,COUNt(goods.id) kucun FROM L_WH_GOODS goods LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON goods.BASE_GOODS_TEMPLATE_ID=goodsTemp.id LEFT JOIN fin_sys_tenant_department ware ON ware.id=goods.WAREHOUSE_ID LEFT JOIN fin_sys_tenant tenant ON ware.TENANT_ID=tenant.id WHERE 1=1 ";
+ private final String DEPT_LEDGER_LIST_QUERY_GROUP = " GROUP BY tenant.`name`,ware.`name`,goodsTemp.CATEGORY_NAME,goods.COST_TYPE,goods.GOODS_TEMPLATE_NAME,goods.BASE_GOODS_MODELS_NAME,goods.UNIT";
+
+ public GenericPager<Map<String, Object>> depLedgerList(LWhLedgerQry param) {
+ StringBuilder sql = new StringBuilder(DEPT_LEDGER_LIST_QUERY_PREFIX);
+ Map<String, Object> paramts = new HashMap<>();
+ //鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾 4 闆舵槦鍑哄簱锛�
+ if (param.getStates() != null) {
+ sql.append(" and goods.states = :states");
+ paramts.put("states", param.getStates());
+ }
+ if (!CollectionUtils.isEmpty(param.getStatesList())){
+ sql.append(" and goods.states in(:statesList)");
+ paramts.put("statesList", param.getStatesList());
+ }
+ //鏈烘瀯
+ if (param.getAgencyId() != null) {
+ sql.append(" and ware.TENANT_ID= :agencyId");
+ paramts.put("lengthAgencyId", param.getAgencyId());
+ paramts.put("agencyId", param.getAgencyId());
+ }
+ // 閮ㄩ棬
+ if (param.getDepartmentId() != null) {
+ sql.append(" and goods.WAREHOUSE_ID= :departmentId");
+ paramts.put("departmentId", param.getDepartmentId());
+ }
+ //浠撳簱绫诲瀷
+ if (param.getWarehouseType() != null) {
+ sql.append(" AND goods.WAREHOUSE_TYPE = :warehouseType");
+ paramts.put("warehouseType", param.getWarehouseType());
+ }
+// if (param.getWarehouseId() != null) {
+// sql.append(" AND goods.WAREHOUSE_ID = :warehouseId");
+// paramts.put("warehouseId", param.getWarehouseId());
+// }
+ //鐗╁搧鍚嶇О
+ if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
+ sql.append(" AND goods.GOODS_TEMPLATE_NAME like :goodsTemplateName");
+ paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ }
+ if (param.getGoodsTemplateId() != null) {
+ sql.append(" AND goods.BASE_GOODS_TEMPLATE_ID=:goodsTemplateId");
+ paramts.put("goodsTemplateId", param.getGoodsTemplateId());
+ }
+ //鍒嗙被
+ if (param.getCategoryId() != null) {
+ sql.append(" AND goodsTemp.CATEGORY_ID=:categoryId");
+ paramts.put("categoryId", param.getCategoryId());
+ }
+ //浠峰�肩被鍨�
+ if (param.getCostType() != null) {
+ sql.append(" AND goods.COST_TYPE=:costType");
+ paramts.put("costType", param.getCostType());
+ }
+ sql.append(DEPT_LEDGER_LIST_QUERY_GROUP);
+ return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
+ }
+
+ private final String DEPART_LEDGER_LIST_QUERY_PREFIX = "SELECT tenant.id tenantId,tenant.NAME AS AGENCY_NAME,ware.NAME AS depart_name,goodsTemp.CATEGORY_NAME,CASE goods.COST_TYPE WHEN 1 THEN 'A绫�' WHEN 2 THEN 'B绫�' WHEN 3 THEN 'C绫�' END AS cost_Type,goods.GOODS_TEMPLATE_NAME,goods.BASE_GOODS_MODELS_NAME,goods.UNIT unit,COUNt(goods.id) kucun FROM L_WH_GOODS goods LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON goods.BASE_GOODS_TEMPLATE_ID=goodsTemp.id LEFT JOIN fin_sys_tenant_department ware ON ware.id=goods.WAREHOUSE_ID AND goods.WAREHOUSE_TYPE=1 LEFT JOIN fin_sys_tenant tenant ON tenant.id=ware.TENANT_ID WHERE 1=1 ";
+ private final String DEPART_LEDGER_LIST_QUERY_GROUP = " GROUP BY tenant.id,tenant.NAME,ware.NAME,goodsTemp.CATEGORY_NAME,goods.COST_TYPE,goods.GOODS_TEMPLATE_NAME,goods.BASE_GOODS_MODELS_NAME,goods.UNIT";
+
+ public GenericPager<Map<String, Object>> departLedgerList(LWhLedgerQry param) {
+ StringBuilder sql = new StringBuilder(DEPART_LEDGER_LIST_QUERY_PREFIX);
+ Map<String, Object> paramts = new HashMap<>();
+ //鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾 4 闆舵槦鍑哄簱锛�
+ if (param.getStates() != null) {
+ sql.append(" and goods.states = :states");
+ paramts.put("states", param.getStates());
+ }
+ //鏈烘瀯
+ if (param.getAgencyId() != null) {
+// sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
+ sql.append(" and ware.AGENCY_ID = :agencyId");
+// paramts.put("lengthAgencyId", param.getAgencyId());
+ paramts.put("agencyId", param.getAgencyId());
+ }
+ //浠撳簱绫诲瀷
+ if (param.getWarehouseType() != null) {
+ sql.append(" AND goods.WAREHOUSE_TYPE = :warehouseType");
+ paramts.put("warehouseType", param.getWarehouseType());
+ }
+ if (param.getWarehouseId() != null) {
+ sql.append(" AND goods.WAREHOUSE_ID = :warehouseId");
+ paramts.put("warehouseId", param.getWarehouseId());
+ }
+ //鐗╁搧鍚嶇О
+ if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
+ sql.append(" AND goods.GOODS_TEMPLATE_NAME like :goodsTemplateName");
+ paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ }
+ if (param.getGoodsTemplateId() != null) {
+ sql.append(" AND goods.BASE_GOODS_TEMPLATE_ID=:goodsTemplateId");
+ paramts.put("goodsTemplateId", param.getGoodsTemplateId());
+ }
+ //鍒嗙被
+ if (param.getCategoryId() != null) {
+ sql.append(" AND goodsTemp.CATEGORY_ID=:categoryId");
+ paramts.put("categoryId", param.getCategoryId());
+ }
+ //浠峰�肩被鍨�
+ if (param.getCostType() != null) {
+ sql.append(" AND goods.COST_TYPE=:costType");
+ paramts.put("costType", param.getCostType());
+ }
+ sql.append(DEPART_LEDGER_LIST_QUERY_GROUP);
return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
}
}
--
Gitblit v1.9.1