From 2b20f8284d8c59549ebcb9dabca36b5bd5b35702 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期三, 29 十一月 2023 13:17:14 +0800
Subject: [PATCH] feat: 首页统计预警条数；部门台账物品查询导出
---
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java | 206 +++++++++++++++++++++++++++++++++------------------
1 files changed, 134 insertions(+), 72 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
index 00c4b06..7b08e06 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
@@ -2,16 +2,21 @@
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.utils.MapRowMapper;
+import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.core.utils.MixType;
+import com.consum.base.core.utils.PageUtil;
import com.consum.base.pojo.LWarehouseFlowParam;
import com.consum.base.pojo.query.LWhFormOutputQry;
+import com.consum.base.pojo.response.OutAndInDetailVO;
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.List;
import java.util.Map;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.stereotype.Service;
/**
* @ClassName LWarehouseFlowService
@@ -42,7 +47,7 @@
}
if (StringUtils.isNotEmpty(param.getBusinessFormCode())) {
sql.append(" AND CASE WHEN flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUSINESS_FORM_CODE=:businessFormCode"
- + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE=:businessFormCode END");
+ + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE=:businessFormCode END");
paramts.put("businessFormCode", param.getBusinessFormCode());
// sql.append(" AND CASE WHEN flow.BUSINESS_TYPE = 1 THEN flow.BUSINESS_FORM_CODE=?");
// params.add(param.getBusinessFormCode());
@@ -63,7 +68,7 @@
}
if (param.getCreatedName() != null) {
sql.append(" AND CASE" + " WHEN flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUYER_NAME LIKE :createdName"
- + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.OPERATOR_NAME LIKE :createdName END");
+ + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.OPERATOR_NAME LIKE :createdName END");
paramts.put("createdName", StringUtils.CHAR_PERCENT + param.getCreatedName() + StringUtils.CHAR_PERCENT);
}
if (param.getDealTimeStart() != null) {
@@ -77,63 +82,6 @@
return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapRowMapper());
}
- public GenericPager<Map<String, Object>> queryBusinessFlowDetail(LWhFormOutputQry param) {
- StringBuilder sql = new StringBuilder(QUERY_BUSINESS_FLOW);
- Map<String, Object> paramts = new HashMap<>();
- if (StringUtils.isNotEmpty(param.getBusinessFormCode())) {
- sql.append("AND CASE WHEN flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUSINESS_FORM_CODE=:businessFormCode"
- + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE=:businessFormCode END ");
- paramts.put("businessFormCode", param.getBusinessFormCode());
- }
- if (StringUtils.isNotEmpty(param.getGoodsName())) {
- sql.append("AND record.GOODS_TEMPLATE_NAME like :goodsTemplateName ");
- paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsName() + StringUtils.CHAR_PERCENT);
- }
-
- if (param.getBaseGoodsModelsId() != null) {
- sql.append("AND record.BASE_GOODS_MODELS_ID =:baseGoodsModelsId ");
- paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
- }
- if (param.getAgencyId() != null) {
- sql.append("AND tCaiGou.AGENCY_id=:agencyId ");
- paramts.put("agencyId", param.getAgencyId());
- }
-
- if (StringUtils.isNotEmpty(param.getCreateName())) {
- sql.append("AND CASE WHEN flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUYER_NAME = :createdName"
- + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.OPERATOR_NAME = :createdName END ");
- paramts.put("createdName", param.getCreateName());
- }
- if (param.getStartTime() != null) {
- sql.append("and flow.DEAL_TIME >=:dealTimeStart ");
- paramts.put("dealTimeStart", param.getStartTime() * 1000000);
- }
- if (param.getEndTime() != null) {
- sql.append("and flow.DEAL_TIME <:dealTimeEnd ");
- paramts.put("dealTimeEnd", param.getEndTime() * 1000000 + 240000);
- }
- if (param.getStates() != null) {
-
- switch (param.getStates()) {
- case 1:
- sql.append("and flow.BUSINESS_TYPE =:businessType");
- break;
- case 2:
- sql.append("and flow.FLOW_STATE = 2 ");
- break;
- default:
- sql.append("and flow.FLOW_STATE = 3 ");
- }
-
- }
-
-// if (param.getBusinessType() != null) {
-// sql.append(" and flow.BUSINESS_TYPE =:businessType");
-// paramts.put("businessType", param.getBusinessType());
-// }
-
- return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
- }
/**
* 鍙拌处鏌ヨ
@@ -222,10 +170,10 @@
paramts.put("panDianBusinessFormCode", businessFormCode);
sqlEnd.append(" and case when flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUSINESS_FORM_CODE" +
- " WHEN ( flow.BUSINESS_TYPE = 2 OR flow.BUSINESS_TYPE = 4 OR flow.BUSINESS_TYPE = 6 ) THEN tTrans.BUSINESS_FORM_CODE" +
- " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE" +
- " WHEN flow.BUSINESS_TYPE = 5 THEN tScrapped.BUSINESS_FORM_CODE" +
- " WHEN flow.BUSINESS_TYPE = 7 THEN tInventory.BUSINESS_FORM_CODE end =:whereBusinessFormCode");
+ " WHEN ( flow.BUSINESS_TYPE = 2 OR flow.BUSINESS_TYPE = 4 OR flow.BUSINESS_TYPE = 6 ) THEN tTrans.BUSINESS_FORM_CODE" +
+ " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE" +
+ " WHEN flow.BUSINESS_TYPE = 5 THEN tScrapped.BUSINESS_FORM_CODE" +
+ " WHEN flow.BUSINESS_TYPE = 7 THEN tInventory.BUSINESS_FORM_CODE end =:whereBusinessFormCode");
paramts.put("whereBusinessFormCode", businessFormCode);
@@ -243,15 +191,129 @@
StringBuilder sql = new StringBuilder();
sql.append(sqlQuery)
- .append(sqlEndRecord)
- .append(sqlCaiGou)
- .append(sqlDiaoBo)
- .append(sqlChuKu)
- .append(sqlBaoFei)
- .append(sqlPanDian)
+ .append(sqlEndRecord)
+ .append(sqlCaiGou)
+ .append(sqlDiaoBo)
+ .append(sqlChuKu)
+ .append(sqlBaoFei)
+ .append(sqlPanDian)
- .append(sqlEnd);
+ .append(sqlEnd);
return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
}
+
+
+ public PageUtil queryAllBusinessFlow(LWhFormOutputQry param) {
+ StringBuilder sql = new StringBuilder("SELECT\n"
+ + "CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.id \n"
+ + "WHEN (flow.BUSINESS_TYPE=2 OR flow.BUSINESS_TYPE=4 OR flow.BUSINESS_TYPE=6) THEN tTrans.id \n"
+ + "WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.id \n"
+ + "WHEN flow.BUSINESS_TYPE=5 THEN tScrapped.id \n"
+ + "WHEN flow.BUSINESS_TYPE=7 THEN tInventory.id END id,\n"
+ + "\n"
+ + "CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUSINESS_FORM_CODE \n"
+ + "WHEN (flow.BUSINESS_TYPE=2 OR flow.BUSINESS_TYPE=4 OR flow.BUSINESS_TYPE=6) THEN tTrans.BUSINESS_FORM_CODE \n"
+ + "WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.BUSINESS_FORM_CODE \n"
+ + "WHEN flow.BUSINESS_TYPE=5 THEN tScrapped.BUSINESS_FORM_CODE \n"
+ + "WHEN flow.BUSINESS_TYPE=7 THEN tInventory.BUSINESS_FORM_CODE END BUSINESS_FORM_CODE,\n"
+ + "\n"
+ + "CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.AGENCY_NAME \n"
+ + "WHEN (flow.BUSINESS_TYPE=2 OR flow.BUSINESS_TYPE=4 OR flow.BUSINESS_TYPE=6) THEN tTrans.OPERATOR_NAME \n"
+ + "WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.AGENCY_NAME \n"
+ + "WHEN flow.BUSINESS_TYPE=5 THEN tScrapped.AGENCY_NAME \n"
+ + "WHEN flow.BUSINESS_TYPE=7 THEN tInventory.AGENCY_NAME END AGENCY_NAME,\n"
+ + "\n"
+ + "record.GOODS_TEMPLATE_NAME,\n"
+ + "record.BASE_GOODS_MODELS_NAME,\n"
+ + "record.THIS_TYPE,\n"
+ + "flow.BUSINESS_TYPE,\n"
+ + "record.THIS_COUNT,\n"
+ + "flow.DEAL_TIME,\n"
+ + "flow.OPERATOR_NAME,\n"
+ + "record.TOTAL_PRICE\n"
+ + "FROM L_WAREHOUSE_FLOW flow\n"
+ + "LEFT JOIN L_WH_GOODS_RECORD record ON flow.id=record.WAREHOUSE_FLOW_ID\n"
+ + "LEFT JOIN L_WH_FORM_PROCURE tCaiGou ON flow.BUSINESS_TYPE=1 AND tCaiGou.id=flow.BUSINESS_FORM_ID\n"
+ + "LEFT JOIN L_WH_FORM_TRANSFER tTrans ON (flow.BUSINESS_TYPE=2 or flow.BUSINESS_TYPE=4 or flow.BUSINESS_TYPE=6) AND tTrans.id=flow.BUSINESS_FORM_ID\n"
+ + "LEFT JOIN L_WH_FORM_OUTPUT tFormOut ON flow.BUSINESS_TYPE=3 AND tFormOut.id=flow.BUSINESS_FORM_ID\n"
+ + "LEFT JOIN L_WH_FORM_INVENTORY tInventory ON flow.BUSINESS_TYPE=7 AND tInventory.id=flow.BUSINESS_FORM_ID\n"
+ + "LEFT JOIN L_WH_FORM_SCRAPPED tScrapped ON flow.BUSINESS_TYPE=5 AND tScrapped.id=flow.BUSINESS_FORM_ID\n"
+ + "LEFT JOIN base_warehouse bw ON flow.WAREHOUSE_ID = bw.id\n"
+ + "LEFT JOIN fin_sys_tenant fst ON fst.id = bw.AGENCY_ID\n"
+ + "WHERE record.id IS NOT NULL ");
+
+ HashMap<String, Object> paramts = new HashMap<>();
+ //鏈烘瀯
+ if (param.getAgencyId() != null) {
+ sql.append("AND fst.id like :agencyId ");
+ paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
+ }
+
+ //鐗╁搧鍚嶇О
+ if (StringUtils.isNotEmpty(param.getGoodsTempName())) {
+ sql.append(" AND record.GOODS_TEMPLATE_NAME like :goodsTemplateName");
+ paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTempName() + StringUtils.CHAR_PERCENT);
+ }
+ if (param.getGoodsTemplateId() != null) {
+ sql.append(" AND record.BASE_GOODS_TEMPLATE_ID =:goodsTemplateId");
+ paramts.put("goodsTemplateId", param.getGoodsTemplateId());
+ }
+ //瑙勬牸鍨嬪彿
+ if (param.getBaseGoodsModelsId() != null) {
+ sql.append(" AND record.BASE_GOODS_MODELS_ID=:baseGoodsModelsId");
+ paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
+ }
+ // 鍚岀爜琛紝1閲囪喘鍏ュ簱 2閫�杩樺叆搴� 3璋冩嫧鍏ュ簱 4鐩樼泩鍏ュ簱 5鐢抽鍑哄簱 6璋冩嫧鍑哄簱 7鐩樹簭鍑哄簱 8鎶ュ簾鍑哄簱 9鍏朵粬鍑哄簱
+ Integer flowType = param.getFlowType();
+ if (flowType != null) {
+ Map<String, Short> typeByFlowType = WhBusinessEnum.getTypeByFlowType(flowType.shortValue());
+ //鏈璋冩暣绫诲瀷锛�1=璋冨锛�2=璋冨噺锛�
+ Short flowThisType = typeByFlowType.get("flowThisType");
+ //鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
+ Short flowBusinessType = typeByFlowType.get("flowBusinessType");
+ if (flowThisType != null) {
+ sql.append(" AND flow.THIS_TYPE=:flowThisType");
+ paramts.put("flowThisType", flowThisType);
+ }
+ if (flowBusinessType != null) {
+ sql.append(" AND flow.BUSINESS_TYPE=:flowBusinessType");
+ paramts.put("flowBusinessType", flowBusinessType);
+ }
+ }
+ // 鍗曞彿
+ String businessFormCode = param.getBusinessFormCode();
+ if (StringUtils.isNotEmpty(businessFormCode)) {
+ sql.append(" and case when flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUSINESS_FORM_CODE =:whereBusinessFormCode" +
+ " WHEN ( flow.BUSINESS_TYPE = 2 OR flow.BUSINESS_TYPE = 4 OR flow.BUSINESS_TYPE = 6 ) THEN tTrans.BUSINESS_FORM_CODE =:whereBusinessFormCode" +
+ " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE=:whereBusinessFormCode" +
+ " WHEN flow.BUSINESS_TYPE = 5 THEN tScrapped.BUSINESS_FORM_CODE =:whereBusinessFormCode" +
+ " WHEN flow.BUSINESS_TYPE = 7 THEN tInventory.BUSINESS_FORM_CODE =:whereBusinessFormCode end");
+ paramts.put("whereBusinessFormCode", businessFormCode);
+
+ }
+ // 鎿嶄綔鏃堕棿
+ if (param.getStartTime() != null) {
+ sql.append(" and flow.DEAL_TIME >=:dealTimeStart ");
+ paramts.put("dealTimeStart", param.getStartTime() * 1000000);
+ }
+ if (param.getEndTime() != null) {
+ sql.append(" and flow.DEAL_TIME <:dealTimeEnd ");
+ paramts.put("dealTimeEnd", param.getEndTime() * 1000000 + 240000);
+ }
+ sql.append(" ORDER BY record.DEAL_TIME desc,record.id DESC ");
+ GenericPager<Map<String, Object>> mapGenericPager = selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
+ PageUtil pageUtil = new PageUtil(mapGenericPager);
+ List<OutAndInDetailVO> result = Lists.newArrayList();
+ mapGenericPager.getDatas().forEach(map -> {
+ OutAndInDetailVO outAndInDetailVO = MapUtils.convertMapToObj(map, OutAndInDetailVO.class);
+ Integer thisType = outAndInDetailVO.getThisType();
+ Integer businessType = outAndInDetailVO.getBusinessType();
+ String mixType = MixType.getMixType(businessType + "" + thisType);
+ outAndInDetailVO.setMixType(mixType);
+ result.add(outAndInDetailVO);
+ });
+ pageUtil.setDatas(result);
+ return pageUtil;
+ }
}
--
Gitblit v1.9.1