From 3e9a4b3480e6508f3c6f7ac8723509d8b1120d20 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 22 十二月 2023 11:26:33 +0800
Subject: [PATCH] 代码整理
---
consum-base/src/main/java/com/consum/base/service/impl/DepFormScrappedServiceImpl.java | 201 +++++++++++++++++++++++++------------------------
1 files changed, 102 insertions(+), 99 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/impl/DepFormScrappedServiceImpl.java
similarity index 76%
rename from consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/DepFormScrappedServiceImpl.java
index 4b178c1..3c8c399 100644
--- a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/DepFormScrappedServiceImpl.java
@@ -1,9 +1,19 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
-import cn.hutool.core.convert.Convert;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
-import com.consum.base.core.DepFormScrappedCoreServiceImpl;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.DepFormScrappedGoodsParam;
@@ -11,7 +21,21 @@
import com.consum.base.pojo.LDeptFormScrappedParam;
import com.consum.base.pojo.query.LDeptFormScrappedQry;
import com.consum.base.pojo.response.DepFormScrappedExtendVo;
-import com.consum.model.po.*;
+import com.consum.base.service.BaseCategoryService;
+import com.consum.base.service.BaseGoodsModelsService;
+import com.consum.base.service.DepFormScrappedService;
+import com.consum.base.service.FinSysTenantDepartmentService;
+import com.consum.base.service.LWhFormTransferService;
+import com.consum.base.service.SDictDataService;
+import com.consum.base.service.core.DepFormScrappedCoreService;
+import com.consum.model.po.BaseCategory;
+import com.consum.model.po.DepFormScrapped;
+import com.consum.model.po.DepFormScrappedGoods;
+import com.consum.model.po.DepFormScrappedModel;
+import com.consum.model.po.FinSysTenantDepartment;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.SDictData;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -19,17 +43,8 @@
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import com.walker.web.ResponseValue;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import cn.hutool.core.convert.Convert;
/**
* @ClassName DepFormScrappedServiceImpl
@@ -39,7 +54,7 @@
* @Version 1.0
**/
@Service
-public class DepFormScrappedServiceImpl extends BaseServiceImpl {
+public class DepFormScrappedServiceImpl extends BaseServiceImpl implements DepFormScrappedService {
@Resource
private CodeGeneratorService codeGeneratorService;
@@ -50,20 +65,21 @@
@Resource
private BaseCategoryService baseCategoryService;
@Resource
- private SDictDataServiceImpl sDictDataService;
+ private SDictDataService sDictDataService;
@Resource
private BaseGoodsModelsService baseGoodsModelsService;
@Resource
- private DepFormScrappedCoreServiceImpl depFormScrappedCoreService;
+ private DepFormScrappedCoreService depFormScrappedCoreService;
@Transactional
- public ResponseValue add(LDeptFormScrappedParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
+ @Override
+ public void add(LDeptFormScrappedParam param, S_user_core currentUser, FinSysTenantUser sysInfo) throws Exception {
long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
- //1.鏂板鎶ュ簾鍗曡褰�
+ // 1.鏂板鎶ュ簾鍗曡褰�
DepFormScrapped lDeptFormScrapped = new DepFormScrapped();
- //鎶ュ簾鍗昳d
+ // 鎶ュ簾鍗昳d
long lWhFormScrappedId = IdUtil.generateId();
lDeptFormScrapped.setId(lWhFormScrappedId);
lDeptFormScrapped.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Scrapped));
@@ -74,7 +90,7 @@
FinSysTenantDepartment sysTenantDepartment = departmentService.getById(param.getDepartmentId());
if (sysTenantDepartment == null) {
log.error("閮ㄩ棬涓嶅瓨鍦�");
- return ResponseValue.error("閮ㄩ棬涓嶅瓨鍦�");
+ throw new RuntimeException("閮ㄩ棬涓嶅瓨鍦�");
}
lDeptFormScrapped.setOutWarehouseName(sysTenantDepartment.getName());
@@ -83,7 +99,7 @@
lDeptFormScrapped.setDealTime(param.getDealTime());
lDeptFormScrapped.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
lDeptFormScrapped.setAgencyName(sysInfo.getTenantName());
- //鏍规嵁閮ㄩ棬id鏌ヨ閮ㄩ棬
+ // 鏍规嵁閮ㄩ棬id鏌ヨ閮ㄩ棬
FinSysTenantDepartment department = this.departmentService.getById(sysInfo.getSysDeptId());
if (department != null) {
lDeptFormScrapped.setDepartmentId(sysInfo.getSysDeptId());
@@ -93,10 +109,10 @@
lDeptFormScrapped.setCreateTime(dealTime);
lDeptFormScrapped.setStates(1);
- //2.鎶ュ簾鍗曠墿鍝併�怐EP_FORM_SCRAPPED_GOODS銆�
+ // 2.鎶ュ簾鍗曠墿鍝併�怐EP_FORM_SCRAPPED_GOODS銆�
List<DepFormScrappedGoodsParam> scrappedGoodsInfo = param.getGoods();
if (CollectionUtils.isEmpty(scrappedGoodsInfo)) {
- return ResponseValue.error("鎶ュ簾鍗曠墿鍝佷笉鑳戒负绌�");
+ throw new RuntimeException("鎶ュ簾鍗曠墿鍝佷笉鑳戒负绌�");
}
ArrayList<DepFormScrappedGoods> scrappedGoodsArrayList = new ArrayList<>();
ArrayList<DepFormScrappedModel> modelArrayList = new ArrayList<>();
@@ -119,7 +135,7 @@
Long transBusinessId = depFormScrappedGoodsParam.getTransBusinessId();
LWhFormTransfer lWhFormTransfer = lWhFormTransferService.get(new LWhFormTransfer(transBusinessId));
if (lWhFormTransfer == null) {
- return ResponseValue.error("鎶ュ簾鍗曠墿鍝佷笉鑳戒负绌�");
+ throw new RuntimeException("鎶ュ簾鍗曠墿鍝佷笉鑳戒负绌�");
}
depFormScrappedGoods.setTransBusinessId(transBusinessId);
@@ -130,32 +146,34 @@
// 鍨嬪彿淇℃伅
List<DepFormScrappedModelParam> modelList = depFormScrappedGoodsParam.getModels();
if (CollectionUtils.isEmpty(modelList)) {
- return ResponseValue.error("鎶ュ簾鍗曠墿鍝佸瀷鍙蜂笉鑳戒负绌�");
+ throw new RuntimeException("鎶ュ簾鍗曠墿鍝佸瀷鍙蜂笉鑳戒负绌�");
}
- //鑾峰彇鎶ュ簾鍘熷洜code
- List<Long> scrappedCodeList = modelList.stream().map(params -> params.getScrappedCode()).collect(Collectors.toList());
- //鏍规嵁鎶ュ簾鍘熷洜code鏌ヨ鏁版嵁瀛楀吀
+ // 鑾峰彇鎶ュ簾鍘熷洜code
+ List<Long> scrappedCodeList =
+ modelList.stream().map(params -> params.getScrappedCode()).collect(Collectors.toList());
+ // 鏍规嵁鎶ュ簾鍘熷洜code鏌ヨ鏁版嵁瀛楀吀
List<SDictData> SDictDataList = sDictDataService.selectByScrappedCodeList(scrappedCodeList);
- Map<Long, String> scrappedNameMap = SDictDataList.stream().collect(Collectors.toMap(s -> s.getDict_code(), s -> s.getDict_label()));
+ Map<Long, String> scrappedNameMap =
+ SDictDataList.stream().collect(Collectors.toMap(s -> s.getDict_code(), s -> s.getDict_label()));
for (DepFormScrappedModelParam depFormScrappedModelParam : modelList) {
DepFormScrappedModel depFormScrappedModel = new DepFormScrappedModel();
depFormScrappedModel.setId(IdUtil.generateId());
depFormScrappedModel.setDepFormScrappedId(lWhFormScrappedId);
depFormScrappedModel.setDepFormScrappedGoodsId(depFormScrappedGoods.getId());
- //鎶ュ簾鍘熷洜
+ // 鎶ュ簾鍘熷洜
depFormScrappedModel.setScrappedCode(depFormScrappedModelParam.getScrappedCode());
depFormScrappedModel.setScrappedName(scrappedNameMap.get(depFormScrappedModel.getScrappedCode()));
// 鐗╁搧 鍙� 鍨嬪彿 淇℃伅
Long baseGoodsModelsId = depFormScrappedModelParam.getBaseGoodsModelsId();
if (baseGoodsModelsId == null) {
- return ResponseValue.error("鎶ュ簾鍗曠墿鍝佸瀷鍙蜂笉鑳戒负绌�");
+ throw new RuntimeException("鎶ュ簾鍗曠墿鍝佸瀷鍙蜂笉鑳戒负绌�");
}
List<Map<String, Object>> modelInfoList = baseGoodsModelsService.queryGoodsModelInfo(baseGoodsModelsId);
if (CollectionUtils.isEmpty(modelInfoList)) {
- return ResponseValue.error("鏈煡璇㈠埌鎶ュ簾鍗曠墿鍝佸瀷鍙�");
+ throw new RuntimeException("鏈煡璇㈠埌鎶ュ簾鍗曠墿鍝佸瀷鍙�");
}
Map<String, Object> modelInfo = modelInfoList.get(0);
depFormScrappedModel.setBaseGoodsTemplateId(Convert.toLong(modelInfo.get("goodsId")));
@@ -165,62 +183,64 @@
depFormScrappedModel.setBaseGoodsModelsId(baseGoodsModelsId);
depFormScrappedModel.setBaseGoodsModelsName(Convert.toStr(modelInfo.get("modelName")));
- //璋冩嫧鍗曚俊鎭�
+ // 璋冩嫧鍗曚俊鎭�
depFormScrappedModel.setProcureModelUserId(depFormScrappedModelParam.getModelUserId());
depFormScrappedModel.setGoodsUserName(depFormScrappedModelParam.getNowUserName());
depFormScrappedModel.setInitialCount(depFormScrappedModelParam.getGoodsNum());
depFormScrappedModel.setUseCount(depFormScrappedModelParam.getUserUseCount());
depFormScrappedModel.setCounts(depFormScrappedModelParam.getCounts());
- //澧炲姞鍒版壒閲忔彃鍏ist
+ // 澧炲姞鍒版壒閲忔彃鍏ist
modelArrayList.add(depFormScrappedModel);
}
- //澧炲姞鍒版壒閲忔彃鍏ist
+ // 澧炲姞鍒版壒閲忔彃鍏ist
scrappedGoodsArrayList.add(depFormScrappedGoods);
}
int flag1 = this.insert(lDeptFormScrapped);
if (flag1 == 0) {
log.error("鏂板鎶ュ簾鍗曞け璐�");
- return ResponseValue.error("鏂板鎶ュ簾鍗曞け璐�");
+ throw new RuntimeException("鏂板鎶ュ簾鍗曞け璐�");
}
- int i = insertBatch(scrappedGoodsArrayList);
- int i2 = insertBatch(modelArrayList);
- depFormScrappedCoreService.updateScrapped(lWhFormScrappedId,currentUser,dealTime);
- return ResponseValue.success();
+ insertBatch(scrappedGoodsArrayList);
+ insertBatch(modelArrayList);
+ depFormScrappedCoreService.updateScrapped(lWhFormScrappedId, currentUser, dealTime);
}
-
/**
* @Description 鍒楄〃鏌ヨ
*/
- private static String QUERY_LIST = "SELECT scrap.id,scrap.BUSINESS_FORM_CODE,scrap.AGENCY_NAME,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,model.BASE_GOODS_TEMPLATE_ID,model.BASE_GOODS_TEMPLATE_NAME,SUM(model.COUNTS) total_Count,model.unit FROM DEP_FORM_SCRAPPED scrap LEFT JOIN DEP_FORM_SCRAPPED_MODEL model ON scrap.id=model.DEP_FORM_SCRAPPED_ID where 1=1";
- private static String QUERY_LIST_END = " GROUP BY scrap.id,scrap.BUSINESS_FORM_CODE,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,model.BASE_GOODS_TEMPLATE_ID,model.BASE_GOODS_TEMPLATE_NAME ORDER BY scrap.DEAL_TIME DESC";
+ private static String QUERY_LIST =
+ "SELECT scrap.id,scrap.BUSINESS_FORM_CODE,scrap.AGENCY_NAME,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,model.BASE_GOODS_TEMPLATE_ID,model.BASE_GOODS_TEMPLATE_NAME,SUM(model.COUNTS) total_Count,model.unit FROM DEP_FORM_SCRAPPED scrap LEFT JOIN DEP_FORM_SCRAPPED_MODEL model ON scrap.id=model.DEP_FORM_SCRAPPED_ID where 1=1";
+ private static String QUERY_LIST_END =
+ " GROUP BY scrap.id,scrap.BUSINESS_FORM_CODE,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,model.BASE_GOODS_TEMPLATE_ID,model.BASE_GOODS_TEMPLATE_NAME ORDER BY scrap.DEAL_TIME DESC";
+ @Override
public GenericPager<Map<String, Object>> queryList(LDeptFormScrappedQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(QUERY_LIST);
- //鎶ュ簾鍗曞彿
+ // 鎶ュ簾鍗曞彿
if (!StringUtils.isEmpty(param.getBusinessFormCode())) {
sql.append(" and scrap.BUSINESS_FORM_CODE = :businessFormCode ");
paramts.put("businessFormCode", param.getBusinessFormCode());
}
- //鏈烘瀯
+ // 鏈烘瀯
if (param.getAgencyId() != null) {
sql.append(" and scrap.AGENCY_ID = :agencyId ");
paramts.put("agencyId", param.getAgencyId());
}
- //鐗╁搧鍚嶇О
+ // 鐗╁搧鍚嶇О
if (!StringUtils.isEmpty(param.getGoodsTemplateName())) {
sql.append(" and model.BASE_GOODS_TEMPLATE_NAME LIKE :goodsTemplateName ");
- paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ paramts.put("goodsTemplateName",
+ StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
- //鍒涘缓浜�
+ // 鍒涘缓浜�
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);
@@ -233,20 +253,20 @@
return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
}
-
/**
* @Description 鏍规嵁id鏌ヨ璇︽儏
*/
+ @Override
public DepFormScrappedExtendVo getById(Long id) {
DepFormScrappedExtendVo scrappedExtend = new DepFormScrappedExtendVo();
- //1.鏌ヨ鎶ュ簾鍗�
+ // 1.鏌ヨ鎶ュ簾鍗�
DepFormScrapped lWhFormScrapped = this.get(new DepFormScrapped(id));
if (lWhFormScrapped != null) {
BeanUtils.copyProperties(lWhFormScrapped, scrappedExtend);
}
ObjectMapper objectMapper = new ObjectMapper();
- //2.鏌ヨ鎶ュ簾鍗曠墿鍝�
+ // 2.鏌ヨ鎶ュ簾鍗曠墿鍝�
DepFormScrappedGoods goodsQuery = new DepFormScrappedGoods();
goodsQuery.setDepFormScrappedId(id);
List<DepFormScrappedGoods> formScrappedGoodsList = select(goodsQuery);
@@ -259,10 +279,8 @@
depFormScrappedModel.setDepFormScrappedGoodsId(scrappedGoodsId);
List<DepFormScrappedModel> scrappedModelList = select(depFormScrappedModel);
List<List<DepFormScrappedModel>> modelList = scrappedModelList.stream()
- .collect(Collectors.groupingBy(DepFormScrappedModel::getBaseGoodsModelsId))
- .values().stream()
- .map(list -> list.stream().collect(Collectors.toList()))
- .collect(Collectors.toList());
+ .collect(Collectors.groupingBy(DepFormScrappedModel::getBaseGoodsModelsId)).values().stream()
+ .map(list -> list.stream().collect(Collectors.toList())).collect(Collectors.toList());
scrappedGoodsMap.put("models", modelList);
goodsList.add(scrappedGoodsMap);
@@ -271,18 +289,20 @@
return scrappedExtend;
}
- private static String EXPORT_SQL = "SELECT scrap.id,scrap.BUSINESS_FORM_CODE,model.BASE_GOODS_TEMPLATE_NAME,model.BASE_GOODS_MODELS_NAME,model.COUNTS,scrap.AGENCY_NAME,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,scrap.OUT_WAREHOUSE_NAME,ROUND( IFNULL( TOTAL_AMOUNT, 0 )/ 100, 2 ) AS TOTAL_PRICE,model.SCRAPPED_NAME,NULL AS bz FROM DEP_FORM_SCRAPPED scrap LEFT JOIN DEP_FORM_SCRAPPED_MODEL model ON scrap.id=model.DEP_FORM_SCRAPPED_ID WHERE 1=1 ";
+ private static String EXPORT_SQL =
+ "SELECT scrap.id,scrap.BUSINESS_FORM_CODE,model.BASE_GOODS_TEMPLATE_NAME,model.BASE_GOODS_MODELS_NAME,model.COUNTS,scrap.AGENCY_NAME,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,scrap.OUT_WAREHOUSE_NAME,ROUND( IFNULL( TOTAL_AMOUNT, 0 )/ 100, 2 ) AS TOTAL_PRICE,model.SCRAPPED_NAME,NULL AS bz FROM DEP_FORM_SCRAPPED scrap LEFT JOIN DEP_FORM_SCRAPPED_MODEL model ON scrap.id=model.DEP_FORM_SCRAPPED_ID WHERE 1=1 ";
private static String EXPORT_SQL_END = "order by scrap.DEAL_TIME DESC";
+ @Override
public List<Map<String, Object>> export(Long id, String agencyId) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(EXPORT_SQL);
- //鎶ュ簾鍗曞彿
+ // 鎶ュ簾鍗曞彿
if (id != null) {
sql.append(" and scrap.id = :id");
paramts.put("id", id);
}
- //鏈烘瀯
+ // 鏈烘瀯
sql.append(" and scrap.AGENCY_ID = :agencyId ");
if (agencyId != null) {
paramts.put("agencyId", agencyId);
@@ -290,31 +310,33 @@
return select(sql.append(EXPORT_SQL_END).toString(), paramts, new MapperUtil());
}
+ @Override
public List<Map<String, Object>> listByModel(LDeptFormScrappedQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(EXPORT_SQL);
- //鎶ュ簾鍗昳d
+ // 鎶ュ簾鍗昳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);
+ 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());
@@ -324,12 +346,12 @@
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);
@@ -341,31 +363,33 @@
return select(sql.append(EXPORT_SQL_END).toString(), paramts, new MapperUtil());
}
+ @Override
public GenericPager<Map<String, Object>> listByModel2(LDeptFormScrappedQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(EXPORT_SQL);
- //鎶ュ簾鍗昳d
+ // 鎶ュ簾鍗昳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);
+ 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());
@@ -375,12 +399,12 @@
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);
@@ -389,30 +413,9 @@
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 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" +
- "\tscrGoods.TRANS_OUT_WAREHOUSE_TYPE,\n" +
- "\tscrGoods.TRANS_OUT_WAREHOUSE_ID,\n" +
- "\tgoodsModel.BASE_GOODS_TEMPLATE_ID,\n" +
- "\tgoodsModel.COUNTS,\n" +
- "\tgoodsModel.PROCURE_MODEL_USER_ID,\n" +
- "\tgoodsModel.GOODS_USER_NAME \n" +
- "FROM\n" +
- "\tDEP_FORM_SCRAPPED_GOODS scrGoods\n" +
- "\tLEFT JOIN DEP_FORM_SCRAPPED_MODEL goodsModel ON scrgoods.id = goodsModel.DEP_FORM_SCRAPPED_GOODS_ID";
-
- public List<Map<String, Object>> getBfModelList(Long lWhFormScrappedId) {
- HashMap<String, Object> paramts = new HashMap<>();
- StringBuilder sql = new StringBuilder(GET_BF_MODEL_LIST);
- //鎶ュ簾鍗昳d
- sql.append(" and scrGoods.DEP_FORM_SCRAPPED_ID = :lWhFormScrappedId");
- paramts.put("lWhFormScrappedId", lWhFormScrappedId);
- return select(sql.toString(), paramts, new MapperUtil());
- }
}
--
Gitblit v1.9.1