From ceecebe477faf5a45b19f3b258f7add8f93b4583 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 05 十二月 2023 10:00:24 +0800
Subject: [PATCH] 代码优化 结构调整
---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 108 +++++++++++++++++++++++++++---------------------------
1 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
index 8978da5..40b28e2 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
@@ -1,5 +1,15 @@
package com.consum.base.service;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
@@ -23,15 +33,8 @@
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
/**
* @Description 鍑哄簱鍗�
@@ -57,22 +60,22 @@
private static String QUERY_FORM_OUTPUT_LIST = "SELECT * FROM l_wh_form_output WHERE 1 = 1";
-
/**
* @Description 鏂板鍑哄簱鍗�
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
public int add(LWhFormOutputParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
- //1.鏂板鍑哄簱鍗曡褰�
+ // 1.鏂板鍑哄簱鍗曡褰�
LWhFormOutput lWhFormOutput = new LWhFormOutput();
- //鍑哄叆搴搃d
+ // 鍑哄叆搴搃d
long lWhFormOutputId = IdUtil.generateId();
lWhFormOutput.setId(lWhFormOutputId);
- lWhFormOutput.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.OutPut_Warehouse));
+ lWhFormOutput
+ .setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.OutPut_Warehouse));
Long warehouseId = param.getWarehouseId();
lWhFormOutput.setWarehouseId(warehouseId);
- //鏍规嵁浠撳簱id鏌ヨ浠撳簱
+ // 鏍规嵁浠撳簱id鏌ヨ浠撳簱
BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId);
if (warehouse == null) {
log.error("浠撳簱id涓嶅瓨鍦�");
@@ -93,7 +96,7 @@
log.error("鏂板鍑哄簱鍗曡褰�");
return 0;
}
- //2.鏂板鐗╁搧鍨嬪彿璁板綍
+ // 2.鏂板鐗╁搧鍨嬪彿璁板綍
List<LWFormsOutputGoodsInfoParam> goodsList = param.getGoods();
List<LWhProcureModel> modelList = new ArrayList<>();
for (LWFormsOutputGoodsInfoParam goods : goodsList) {
@@ -104,14 +107,16 @@
lWhProcureModel.setBusinessType(3);
lWhProcureModel.setBusinessId(lWhFormOutputId);
lWhProcureModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId());
- //鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿
- BaseGoodsModels baseGoodsModels = this.baseGoodsModelsService.get(new BaseGoodsModels(model.getBaseGoodsModelsId()));
+ // 鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿
+ BaseGoodsModels baseGoodsModels =
+ this.baseGoodsModelsService.get(new BaseGoodsModels(model.getBaseGoodsModelsId()));
if (baseGoodsModels != null) {
lWhProcureModel.setBaseGoodsModelsName(baseGoodsModels.getModelName());
}
lWhProcureModel.setCounts(model.getCounts());
- //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, model.getBaseGoodsModelsId(), 1, null);
+ // 鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
+ int goodsNum =
+ this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, model.getBaseGoodsModelsId(), 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
modelList.add(lWhProcureModel);
}
@@ -123,8 +128,9 @@
return 0;
}
- //3.鏍规嵁鍑哄簱鍗曞嚭搴�
- Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, WhBusinessEnum.CHUKU, currentUser, param.getDealTime(), null);
+ // 3.鏍规嵁鍑哄簱鍗曞嚭搴�
+ Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, WhBusinessEnum.CHUKU,
+ currentUser, param.getDealTime(), null);
if (lWarehouseFlowId == null) {
log.error("鏍规嵁鍑哄簱鍗曞嚭搴撳け璐�");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -142,33 +148,34 @@
public GenericPager queryFormOutputList(LWhFormOutputQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(QUERY_FORM_OUTPUT_LIST);
- //鍑哄簱鍗曞彿
+ // 鍑哄簱鍗曞彿
if (!StringUtils.isEmpty(param.getBusinessFormCode())) {
sql.append(" and BUSINESS_FORM_CODE = :businessFormCode ");
paramts.put("businessFormCode", param.getBusinessFormCode());
}
- //鐗╁搧鍚嶇О
+ // 鐗╁搧鍚嶇О
if (!StringUtils.isEmpty(param.getGoodsName())) {
sql.append(
" AND id IN (SELECT BUSINESS_ID FROM L_WH_PROCURE_MODEL procureModel LEFT JOIN BASE_GOODS_MODELS baseModel ON procureModel.BASE_GOODS_MODELS_ID=baseModel.ID LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseModel.GOODS_TEMPLATES_ID=baseTemp.id WHERE procureModel.BUSINESS_TYPE=3 AND baseTemp.GOODS_NAME LIKE :goodsTemplateName)");
- paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsName() + StringUtils.CHAR_PERCENT);
+ paramts.put("goodsTemplateName",
+ StringUtils.CHAR_PERCENT + param.getGoodsName() + StringUtils.CHAR_PERCENT);
}
- //鏈烘瀯
+ // 鏈烘瀯
if (param.getAgencyId() != null) {
sql.append(" and AGENCY_ID like :agencyId ");
paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
}
- //鍒涘缓浜�
+ // 鍒涘缓浜�
if (!StringUtils.isEmpty(param.getCreateName())) {
sql.append(" and operator_name =:operator_name ");
paramts.put("operator_name", param.getCreateName());
}
- //鐘舵��
+ // 鐘舵��
if (param.getStates() != null) {
sql.append(" and states =:states ");
paramts.put("states", param.getStates());
}
- //鍑哄簱鏃堕棿
+ // 鍑哄簱鏃堕棿
if (param.getStartTime() != null) {
sql.append(" and DEAL_TIME >=:outputTimeStart ");
paramts.put("outputTimeStart", param.getStartTime() * 1000000);
@@ -185,69 +192,62 @@
public GenericPager<Map<String, Object>> queryFormOutputDetailList(LWhFormOutputQry param) {
HashMap<String, Object> paramts = new HashMap<>();
- StringBuilder sql = new StringBuilder("SELECT pm.id,fp.BUSINESS_FORM_CODE,fpg.GOODS_TEMPLATE_NAME,pm.PRICE,pm.COUNTS, "
- + "( pm.PRICE * pm.COUNTS ) amount,fp.AGENCY_NAME,fp.BUYER_NAME,fp.PROCURE_TIME,pm.BUSINESS_ID,pm.BASE_GOODS_MODELS_NAME FROM l_wh_procure_model pm "
- + "LEFT JOIN l_wh_form_procure fp ON pm.BUSINESS_ID = fp.id "
- + "LEFT JOIN l_wh_form_procure_goods fpg ON fp.id = fpg.WH_FORM_PROCURE_ID WHERE pm.BUSINESS_TYPE = 1 ");
- //鍏ュ簱鍗曞彿
+ StringBuilder sql =
+ new StringBuilder("SELECT pm.id,fp.BUSINESS_FORM_CODE,fpg.GOODS_TEMPLATE_NAME,pm.PRICE,pm.COUNTS, "
+ + "( pm.PRICE * pm.COUNTS ) amount,fp.AGENCY_NAME,fp.BUYER_NAME,fp.PROCURE_TIME,pm.BUSINESS_ID,pm.BASE_GOODS_MODELS_NAME FROM l_wh_procure_model pm "
+ + "LEFT JOIN l_wh_form_procure fp ON pm.BUSINESS_ID = fp.id "
+ + "LEFT JOIN l_wh_form_procure_goods fpg ON fp.id = fpg.WH_FORM_PROCURE_ID WHERE pm.BUSINESS_TYPE = 1 ");
+ // 鍏ュ簱鍗曞彿
if (!StringUtils.isEmpty(param.getBusinessFormCode())) {
sql.append("and BUSINESS_FORM_CODE = :businessFormCode ");
paramts.put("businessFormCode", param.getBusinessFormCode());
}
- //鐗╁搧鍚嶇О
+ // 鐗╁搧鍚嶇О
if (!StringUtils.isEmpty(param.getGoodsName())) {
sql.append("and fpg.GOODS_TEMPLATE_NAME like :goodsTemplateName ");
- paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsName() + StringUtils.CHAR_PERCENT);
+ paramts.put("goodsTemplateName",
+ StringUtils.CHAR_PERCENT + param.getGoodsName() + StringUtils.CHAR_PERCENT);
}
if (param.getAgencyId() != null) {
sql.append("and AGENCY_ID like :agencyId ");
paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
}
- //鍒涘缓浜�
+ // 鍒涘缓浜�
if (!StringUtils.isEmpty(param.getCreateName())) {
sql.append("and buyer_Name =:buyerName ");
paramts.put("buyerName", param.getCreateName());
}
- //鍏ュ簱寮�濮嬫椂闂�
+ // 鍏ュ簱寮�濮嬫椂闂�
if (param.getStartTime() != null) {
sql.append("and INCOME_TIME >=:incomeTimeStart ");
paramts.put("incomeTimeStart", param.getStartTime() * 1000000);
}
- //鍏ュ簱缁撴潫鏃堕棿
+ // 鍏ュ簱缁撴潫鏃堕棿
if (param.getEndTime() != null) {
sql.append("and INCOME_TIME <:incomeTimeEnd ");
paramts.put("incomeTimeEnd", param.getEndTime() * 1000000 + 240000);
}
- //瑙勬牸鍨嬪彿
+ // 瑙勬牸鍨嬪彿
if (param.getBaseGoodsModelsId() != null) {
sql.append("and pm.BASE_GOODS_MODELS_ID =:baseGoodsModelsId ");
paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
}
sql.append("ORDER BY PROCURE_TIME DESC");
- GenericPager genericPager = selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
+ GenericPager genericPager =
+ selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
return genericPager;
}
public List<OutputExcelTemplate> getExportList(Long id) {
- String sql = "SELECT\n"
- + "\tfo.BUSINESS_FORM_CODE,\n"
- + "\tfo.AGENCY_NAME tenantName,\n"
- + "\tGOODS_NAME templateName,\n"
- + "\tpm.BASE_GOODS_MODELS_NAME baseModelName,\n"
- + "\tcounts num,\n"
- + "\ttotal_amount totalAmount,\n"
- + "\tfo.DEAL_TIME createTime,\n"
- + "\tfo.OPERATOR_NAME,\n"
- + "\tBEIZ remark\n"
- + "FROM\n"
- + "\tl_wh_procure_model pm\n"
+ String sql = "SELECT\n" + "\tfo.BUSINESS_FORM_CODE,\n" + "\tfo.AGENCY_NAME tenantName,\n"
+ + "\tGOODS_NAME templateName,\n" + "\tpm.BASE_GOODS_MODELS_NAME baseModelName,\n" + "\tcounts num,\n"
+ + "\ttotal_amount totalAmount,\n" + "\tfo.DEAL_TIME createTime,\n" + "\tfo.OPERATOR_NAME,\n"
+ + "\tBEIZ remark\n" + "FROM\n" + "\tl_wh_procure_model pm\n"
+ "\tLEFT JOIN base_goods_models bgm ON pm.BASE_GOODS_MODELS_ID = bgm.id\n"
+ "\tLEFT JOIN base_goods_template bgt ON bgm.GOODS_TEMPLATES_ID = bgt.id\n"
- + "\tLEFT JOIN l_wh_form_output fo ON fo.ID = pm.BUSINESS_ID\n"
- + "WHERE\n"
- + "\tpm.BUSINESS_ID = :id";
+ + "\tLEFT JOIN l_wh_form_output fo ON fo.ID = pm.BUSINESS_ID\n" + "WHERE\n" + "\tpm.BUSINESS_ID = :id";
Map<String, Object> param = new HashMap<>();
param.put("id", id);
--
Gitblit v1.9.1