From b2a9367b562ae3c664ee46745beab73b4568d4d9 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 18 十二月 2023 10:59:28 +0800
Subject: [PATCH] 过滤仓库管理员的显示

---
 consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 54 insertions(+), 1 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
index 8c66969..4b178c1 100644
--- a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
@@ -52,7 +52,7 @@
     @Resource
     private SDictDataServiceImpl sDictDataService;
     @Resource
-    private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+    private BaseGoodsModelsService baseGoodsModelsService;
 
     @Resource
     private DepFormScrappedCoreServiceImpl depFormScrappedCoreService;
@@ -341,6 +341,59 @@
         return select(sql.append(EXPORT_SQL_END).toString(), paramts, new MapperUtil());
     }
 
+    public GenericPager<Map<String, Object>> listByModel2(LDeptFormScrappedQry param) {
+        HashMap<String, Object> paramts = new HashMap<>();
+        StringBuilder sql = new StringBuilder(EXPORT_SQL);
+        //鎶ュ簾鍗昳d
+        if (param.getId() != null) {
+            sql.append(" and scrap.id = :id");
+            paramts.put("id", param.getId());
+        }
+        //鎶ュ簾鍗曞彿
+        if (param.getBusinessFormCode() != null) {
+            sql.append(" and scrap.BUSINESS_FORM_CODE= :businessFormCode");
+            paramts.put("businessFormCode", param.getBusinessFormCode());
+        }
+        //鐗╁搧鍚嶇О
+        if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
+            sql.append(" and model.BASE_GOODS_TEMPLATE_NAME LIKE :goodsTemplateName ");
+            paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+        }
+        //瑙勬牸鍨嬪彿
+        if (param.getBaseGoodsModelsId() != null) {
+            sql.append("and model.BASE_GOODS_MODELS_ID =:baseGoodsModelsId ");
+            paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
+        }
+
+        //鏈烘瀯
+        if (param.getAgencyId() != null) {
+            sql.append(" and scrap.AGENCY_ID = :agencyId ");
+            paramts.put("agencyId", param.getAgencyId());
+        }
+        // 閮ㄩ棬 姝ゅ鎸夌殑鏄墿鍝佷娇鐢ㄩ儴闂� 鑰屼笉鏄� 鎿嶄綔浜烘墍鍦ㄩ儴闂�
+        if (param.getDepartmentId() != null) {
+            sql.append(" and scrap.OUT_WAREHOUSE_ID= :departmentId");
+            paramts.put("departmentId", param.getDepartmentId());
+        }
+        //鍒涘缓浜�
+        if (!StringUtils.isEmpty(param.getOperatorName())) {
+            sql.append(" and scrap.OPERATOR_NAME LIKE :operatorName ");
+            paramts.put("operatorName", StringUtils.CHAR_PERCENT + param.getOperatorName() + StringUtils.CHAR_PERCENT);
+        }
+        //鎶ュ簾鏃堕棿
+        if (param.getStartTime() != null) {
+            sql.append(" and scrap.DEAL_TIME >=:dealTimeStart ");
+            paramts.put("dealTimeStart", param.getStartTime() * 1000000);
+        }
+        if (param.getEndTime() != null) {
+            sql.append(" and scrap.DEAL_TIME <:dealTimeEnd ");
+            paramts.put("dealTimeEnd", param.getEndTime() * 1000000 + 240000);
+        }
+        return selectSplit(sql.append(EXPORT_SQL_END).toString(),paramts, param.getPageNum(), param.getPageSize(),  new MapperUtil());
+
+//        return select(sql.append(EXPORT_SQL_END).toString(), paramts, new MapperUtil());
+    }
+
     private static String GET_BF_MODEL_LIST = "SELECT\n" +
             "\tscrGoods.TRANS_BUSINESS_ID,\n" +
             "\tscrGoods.BUSINESS_FORM_CODE,\n" +

--
Gitblit v1.9.1