From 89495b208235d2e30244ce9485c75ac2f1690c79 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 28 十一月 2023 20:48:08 +0800
Subject: [PATCH] 部门分发
---
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java | 91 +++++++++++++--------------------------------
1 files changed, 26 insertions(+), 65 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 501c5ec..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,14 +2,20 @@
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 java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import org.apache.commons.compress.utils.Lists;
import org.springframework.stereotype.Service;
/**
@@ -76,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());
- }
/**
* 鍙拌处鏌ヨ
@@ -255,7 +204,7 @@
}
- public GenericPager<Map<String, Object>> queryAllBusinessFlow(LWhFormOutputQry param) {
+ 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"
@@ -302,13 +251,13 @@
}
//鐗╁搧鍚嶇О
- if (StringUtils.isNotEmpty(param.getGoodsName())) {
+ if (StringUtils.isNotEmpty(param.getGoodsTempName())) {
sql.append(" AND record.GOODS_TEMPLATE_NAME like :goodsTemplateName");
- paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsName() + StringUtils.CHAR_PERCENT);
+ paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTempName() + StringUtils.CHAR_PERCENT);
}
- if (param.getBaseGoodsId() != null) {
- sql.append(" AND record.BASE_GOODS_TEMPLATE_ID=:goodsTemplateId");
- paramts.put("goodsTemplateId", param.getBaseGoodsId());
+ if (param.getGoodsTemplateId() != null) {
+ sql.append(" AND record.BASE_GOODS_TEMPLATE_ID =:goodsTemplateId");
+ paramts.put("goodsTemplateId", param.getGoodsTemplateId());
}
//瑙勬牸鍨嬪彿
if (param.getBaseGoodsModelsId() != null) {
@@ -316,7 +265,7 @@
paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
}
// 鍚岀爜琛紝1閲囪喘鍏ュ簱 2閫�杩樺叆搴� 3璋冩嫧鍏ュ簱 4鐩樼泩鍏ュ簱 5鐢抽鍑哄簱 6璋冩嫧鍑哄簱 7鐩樹簭鍑哄簱 8鎶ュ簾鍑哄簱 9鍏朵粬鍑哄簱
- Integer flowType = param.getStates();
+ Integer flowType = param.getFlowType();
if (flowType != null) {
Map<String, Short> typeByFlowType = WhBusinessEnum.getTypeByFlowType(flowType.shortValue());
//鏈璋冩暣绫诲瀷锛�1=璋冨锛�2=璋冨噺锛�
@@ -353,6 +302,18 @@
paramts.put("dealTimeEnd", param.getEndTime() * 1000000 + 240000);
}
sql.append(" ORDER BY record.DEAL_TIME desc,record.id DESC ");
- return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
+ 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