From 20c30d26f8bab22a4cb6b6459962fa92d6da490f Mon Sep 17 00:00:00 2001 From: cy <1664593601@qq.com> Date: 星期一, 27 十一月 2023 14:20:29 +0800 Subject: [PATCH] feat: 漏洞修改 --- consum-base/src/main/java/com/consum/base/service/FinWarehouseLedgerServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 52 insertions(+), 2 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..12ed86d 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 @@ -20,7 +20,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 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 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); @@ -64,7 +65,56 @@ 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 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 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"); + 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