From 2af69a47b08aa4988cc9733a361a733a671a5f81 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 17:37:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java
index a0a051d..a776d44 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java
@@ -21,6 +21,31 @@
**/
@Service
public class LWhWarningServiceImpl extends BaseServiceImpl {
+ private static String GET_WARNING_TYPE_NUM = "SELECT COUNT(1) AS total_num,count(CASE WHEN wareWarn.WARNING_TYPE=1 THEN 1 ELSE NULL END) AS up_num,count(CASE WHEN wareWarn.WARNING_TYPE=2 THEN 1 ELSE NULL END) AS low_num FROM WH_WARNING wareWarn LEFT JOIN BASE_WAREHOUSE ware ON ware.id=wareWarn.BASE_WAREHOUSE_ID WHERE 1=1 ";
+
+ public Map<String, Object> getWarningTypeNum(WhWarningQry param) {
+ StringBuilder sql = new StringBuilder(GET_WARNING_TYPE_NUM);
+ HashMap<String, Object> paramts = new HashMap<>();
+ if (param.getStates() != null) {
+ sql.append(" AND wareWarn.states = :states");
+ paramts.put("states", param.getStates());
+ }
+ //鏈烘瀯
+ if (param.getAgencyId() != null) {
+ sql.append(" and ware.AGENCY_ID=:agencyId");
+ paramts.put("agencyId", param.getAgencyId());
+ }
+ List<Map<String, Object>> mapList = select(sql.toString(), paramts, new MapperUtil());
+ if (CollectionUtils.isEmpty(mapList)) {
+ Map<String, Object> rtnMap = new HashMap<>();
+ rtnMap.put("totalNum", 0);
+ rtnMap.put("upNum", 0);
+ rtnMap.put("lowNum", 0);
+ return rtnMap;
+ }
+ return mapList.get(0);
+
+ }
private static String GET_LIST_WITH_PAGE = "SELECT wareWarn.*,ware.WAREHOUSE_NAME,goodsTemp.CATEGORY_NAME,CONCAT(cate.CLASSIFICATION,'绫�') cost_Type,goodsTemp.GOODS_NAME,baseModel.MODEL_NAME,basemodel.UNIT FROM WH_WARNING wareWarn LEFT JOIN BASE_GOODS_MODELS baseModel ON baseModel.ID=wareWarn.BASE_GOODS_MODELS_ID LEFT JOIN BASE_GOODS_TEMPLATE goodsTemp ON wareWarn.BASE_GOODS_TEMPLATE_ID=goodsTemp.id LEFT JOIN BASE_CATEGORY cate ON cate.id=goodsTemp.CATEGORY_ID LEFT JOIN BASE_WAREHOUSE ware ON ware.id=wareWarn.BASE_WAREHOUSE_ID WHERE 1=1 ";
@@ -33,8 +58,8 @@
}
//鏈烘瀯
if (param.getAgencyId() != null) {
- sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
- paramts.put("lengthAgencyId", param.getAgencyId());
+ sql.append(" and ware.AGENCY_ID=:agencyId");
+// paramts.put("lengthAgencyId", param.getAgencyId());
paramts.put("agencyId", param.getAgencyId());
}
//浠撳簱绫诲瀷
@@ -67,7 +92,15 @@
sql.append(" AND cate.CLASSIFICATION=':costType'");
paramts.put("costType", costType);
}
-
+ if (param.getWarningType() != null) {
+ sql.append(" AND wareWarn.WARNING_TYPE=:warningType");
+ paramts.put("warningType", param.getWarningType());
+ }
+ //瑙勬牸鍨嬪彿
+ if (param.getBaseGoodsModelsId() != null) {
+ sql.append(" AND wareWarn.BASE_GOODS_MODELS_ID=:baseGoodsModelsId");
+ paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
+ }
sql.append(" ORDER BY wareWarn.DEAL_TIME DESC ");
return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
--
Gitblit v1.9.1