From 4695b1501f8dd6850730aeb4131f88fef0e14c9f Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 12 十二月 2023 10:28:56 +0800
Subject: [PATCH] 物品导入
---
consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java | 103 +++++++++++++++++++++++++++++----------------------
1 files changed, 58 insertions(+), 45 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
index 9a063c0..1df8590 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
@@ -1,6 +1,14 @@
package com.consum.base.service.impl;
-import cn.hutool.core.convert.Convert;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
import com.consum.base.Constants;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.utils.IdUtil;
@@ -8,21 +16,19 @@
import com.consum.base.service.BaseCategoryService;
import com.consum.base.service.BaseGoodsModelsService;
import com.consum.base.service.BaseGoodsTemplateService;
-import com.consum.model.po.*;
+import com.consum.model.po.BaseCategory;
+import com.consum.model.po.BaseGoodsModels;
+import com.consum.model.po.BaseGoodsTemplate;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.SDictData;
import com.consum.model.vo.BaseGoodsTemplateVo;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import cn.hutool.core.convert.Convert;
/**
* @Description 鐗╁搧妯℃澘
@@ -50,7 +56,7 @@
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
- //鍒嗙被id
+ // 鍒嗙被id
if (categoryId != null) {
sql.append(" and category_id =:category_id ");
paramts.put("category_id", categoryId);
@@ -67,35 +73,38 @@
*/
@Override
public int add(BaseGoodsTemplateParam param, FinSysTenantUser currentUser) {
- //1.鏂板鐗╁搧妯℃澘
+ // 1.鏂板鐗╁搧妯℃澘
BaseGoodsTemplate baseGoodsTemplate = new BaseGoodsTemplate();
BeanUtils.copyProperties(param, baseGoodsTemplate);
long goodsTemplatesId = IdUtil.generateId();
baseGoodsTemplate.setId(goodsTemplatesId);
- //鏍规嵁鍒嗙被id鏌ヨ鍒嗙被
+ // 鏍规嵁鍒嗙被id鏌ヨ鍒嗙被
BaseCategory baseCategory = this.baseCategoryService.get(new BaseCategory(param.getCategoryId()));
if (baseCategory != null) {
baseGoodsTemplate.setCategoryName(baseCategory.getCategoryName());
String classification = baseCategory.getClassification();
- //鐗╁搧缂栫爜
- String goodsCode = codeGeneratorService.createGoodsTemplateCode(Convert.toStr(classification,"C"));
+ // 鐗╁搧缂栫爜
+ String goodsCode = codeGeneratorService.createGoodsTemplateCode(Convert.toStr(classification, "C"));
baseGoodsTemplate.setGoodsCode(goodsCode);
- //绫诲埆
+ // 绫诲埆
baseGoodsTemplate.setClassification(classification);
}
- //TODO 涓�绾т簩绾т笁绾ф満鏋勭紪鍙�
- //褰撳墠鏈烘瀯鐨勭埗绾ф満鏋勭紪鍙�
- //鏈烘瀯灞傜骇
- //鏈烘瀯缂栧彿
- baseGoodsTemplate.setAgencyId(Long.valueOf(currentUser.getTenantId()));
- //鏈烘瀯鍚嶇О
- baseGoodsTemplate.setAgencyName(currentUser.getTenantName());
- //鍒涘缓鏃堕棿
+ // TODO 涓�绾т簩绾т笁绾ф満鏋勭紪鍙�
+ // 褰撳墠鏈烘瀯鐨勭埗绾ф満鏋勭紪鍙�
+ // 鏈烘瀯灞傜骇
+ if (currentUser != null) {
+ // 鏈烘瀯缂栧彿
+ baseGoodsTemplate.setAgencyId(Long.valueOf(currentUser.getTenantId()));
+ // 鏈烘瀯鍚嶇О
+ baseGoodsTemplate.setAgencyName(currentUser.getTenantName());
+ }
+
+ // 鍒涘缓鏃堕棿
long createTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
baseGoodsTemplate.setCreateDate(createTime);
int flag1 = this.insert(baseGoodsTemplate);
- //2.鏂板瑙勬牸鍨嬪彿
+ // 2.鏂板瑙勬牸鍨嬪彿
List<BaseGoodsModels> models = param.getModels();
int flag2 = 0;
if (!CollectionUtils.isEmpty(models)) {
@@ -125,32 +134,32 @@
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
- //鐗╁搧鍚嶇О
+ // 鐗╁搧鍚嶇О
if (!StringUtils.isEmpty(param.getGoodsName())) {
sql.append(" and goods_name like:goods_name ");
paramts.put("goods_name", StringUtils.CHAR_PERCENT + param.getGoodsName() + StringUtils.CHAR_PERCENT);
}
- //鐗╁搧缂栧彿
+ // 鐗╁搧缂栧彿
if (!StringUtils.isEmpty(param.getGoodsCode())) {
sql.append(" and goods_code like:goods_code ");
paramts.put("goods_code", StringUtils.CHAR_PERCENT + param.getGoodsCode() + StringUtils.CHAR_PERCENT);
}
- //鍒嗙被id
+ // 鍒嗙被id
if (param.getCategoryId() != null) {
sql.append(" and category_id =:category_id ");
paramts.put("category_id", param.getCategoryId());
}
- //绫诲埆
+ // 绫诲埆
if (!StringUtils.isEmpty(param.getClassification())) {
sql.append(" and classification =:classification ");
paramts.put("classification", param.getClassification());
}
- //鎵�灞炴満鏋�
+ // 鎵�灞炴満鏋�
if (param.getAgencyId() != null) {
sql.append(" and agency_id =:agency_id ");
paramts.put("agency_id", param.getAgencyId());
}
- //鐘舵��
+ // 鐘舵��
if (param.getStates() != null) {
sql.append(" and states =:states ");
paramts.put("states", param.getStates());
@@ -168,17 +177,17 @@
*/
@Override
public BaseGoodsTemplateVo getById(Long id) {
- //1.鏍规嵁鐗╁搧id鏌ヨ鐗╁搧妯℃澘
+ // 1.鏍规嵁鐗╁搧id鏌ヨ鐗╁搧妯℃澘
BaseGoodsTemplate goodsTemplate = this.get(new BaseGoodsTemplate(id));
- //2.鏍规嵁鐗╁搧id鏌ヨ瑙勬牸鍨嬪彿
+ // 2.鏍规嵁鐗╁搧id鏌ヨ瑙勬牸鍨嬪彿
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_models WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
- //鎵�灞炵墿鍝佹ā鐗堢紪鍙�
+ // 鎵�灞炵墿鍝佹ā鐗堢紪鍙�
sql.append(" and goods_templates_id =:goods_templates_id ");
paramts.put("goods_templates_id", id);
List<BaseGoodsModels> modelsList = this.select(sql.toString(), paramts, new BaseGoodsModels());
- //3.灏佽
+ // 3.灏佽
BaseGoodsTemplateVo vo = new BaseGoodsTemplateVo();
if (goodsTemplate != null) {
BeanUtils.copyProperties(goodsTemplate, vo);
@@ -196,7 +205,7 @@
*/
@Override
public int updateBaseGoodsTemplate(BaseGoodsTemplateParam param) {
- //1.淇敼鐗╁搧妯℃澘
+ // 1.淇敼鐗╁搧妯℃澘
BaseGoodsTemplate baseGoodsTemplate = new BaseGoodsTemplate();
BeanUtils.copyProperties(param, baseGoodsTemplate);
BaseCategory baseCategory = this.baseCategoryService.get(new BaseCategory(param.getCategoryId()));
@@ -204,7 +213,7 @@
baseGoodsTemplate.setCategoryName(baseCategory.getCategoryName());
}
int flag1 = this.update(baseGoodsTemplate);
- //2.淇敼瑙勬牸鍨嬪彿鐨勫崟浣�
+ // 2.淇敼瑙勬牸鍨嬪彿鐨勫崟浣�
// TODO id 鐗╁搧鍨嬪彿淇敼寰呮暣鐞�
List<BaseGoodsModels> modelsList = param.getModels();
for (BaseGoodsModels baseGoodsModel : modelsList) {
@@ -230,10 +239,10 @@
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
- //鐗╁搧鍚嶇О
+ // 鐗╁搧鍚嶇О
sql.append(" and goods_name =:goods_name ");
paramts.put("goods_name", goodsName);
- //鍒嗙被id
+ // 鍒嗙被id
sql.append(" and category_id =:category_id ");
paramts.put("category_id", categoryId);
@@ -247,7 +256,9 @@
* @return
*/
- private static String QUERY_GOODSINFO_BY_MODELID = "SELECT model.MODEL_NAME modelName,model.UNIT,temp.id goodsId, temp.GOODS_CODE goodsCode,temp.GOODS_NAME goodsName,temp.CLASSIFICATION classification,temp.CATEGORY_ID categoryId FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE temp ON model.GOODS_TEMPLATES_ID=temp.id WHERE 1=1 ";
+ private static String QUERY_GOODSINFO_BY_MODELID =
+ "SELECT model.MODEL_NAME modelName,model.UNIT,temp.id goodsId, temp.GOODS_CODE goodsCode,temp.GOODS_NAME goodsName,temp.CLASSIFICATION classification,temp.CATEGORY_ID categoryId FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE temp ON model.GOODS_TEMPLATES_ID=temp.id WHERE 1=1 ";
+
@Override
public Map<String, Object> queryGoodsInfoByModelId(Long modelId) {
StringBuilder sqlStr = new StringBuilder(QUERY_GOODSINFO_BY_MODELID);
@@ -282,9 +293,9 @@
@Override
public int updateById(BaseGoodsTemplate goodsTemplate, S_user_core currentUser) {
goodsTemplate.setStates(Constants.STATES_DELETED);
- //鍒犻櫎鏃堕棿
+ // 鍒犻櫎鏃堕棿
goodsTemplate.setDTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
- //鍒犻櫎浜篿d鍜屽垹闄や汉濮撳悕
+ // 鍒犻櫎浜篿d鍜屽垹闄や汉濮撳悕
goodsTemplate.setDUserId(currentUser.getId());
goodsTemplate.setDUserName(currentUser.getUser_name());
return this.update(goodsTemplate);
@@ -298,8 +309,9 @@
*/
@Override
public List<SDictData> queryClassificationCode() {
- StringBuilder sql = new StringBuilder("SELECT * FROM s_dict_data WHERE dict_type = 'CLASSIFICATION_CODE' order by dict_sort");
- return this.select(sql.toString(), new Object[]{}, new SDictData());
+ StringBuilder sql =
+ new StringBuilder("SELECT * FROM s_dict_data WHERE dict_type = 'CLASSIFICATION_CODE' order by dict_sort");
+ return this.select(sql.toString(), new Object[] {}, new SDictData());
}
/**
@@ -318,11 +330,12 @@
* @param agencyId
* @param categoryId
* @param states
- * @param goodsName 鍏ㄥ尮閰嶏紒锛侊紒
+ * @param goodsName 鍏ㄥ尮閰嶏紒锛侊紒
* @return
*/
@Override
- public List<BaseGoodsTemplate> queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId, Short states, String goodsName) {
+ public List<BaseGoodsTemplate> queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId, Short states,
+ String goodsName) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1=1 ");
Map<String, Object> params = new HashMap<>();
if (agencyId != null) {
--
Gitblit v1.9.1