From b8dc4ccc6ee580b084aa860e64af2d90d1cb5979 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 29 十一月 2023 10:11:52 +0800
Subject: [PATCH] feat: 1、首页接口对接 2、部门物品分发
---
consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java | 68 ++++++++++++++++++++++++++++-----
1 files changed, 57 insertions(+), 11 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
index 288bee8..3104725 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
@@ -2,12 +2,9 @@
import com.consum.base.Constants;
import com.consum.base.core.CodeGeneratorService;
+import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.BaseGoodsTemplateParam;
-import com.consum.base.util.IdUtil;
-import com.consum.model.po.BaseCategory;
-import com.consum.model.po.BaseGoodsModels;
-import com.consum.model.po.BaseGoodsTemplate;
-import com.consum.model.po.S_dict_data;
+import com.consum.model.po.*;
import com.consum.model.vo.BaseGoodsTemplateVo;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -63,7 +60,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/24
*/
- public int add(BaseGoodsTemplateParam param, S_user_core currentUser) {
+ public int add(BaseGoodsTemplateParam param, FinSysTenantUser currentUser) {
//1.鏂板鐗╁搧妯℃澘
BaseGoodsTemplate baseGoodsTemplate = new BaseGoodsTemplate();
BeanUtils.copyProperties(param, baseGoodsTemplate);
@@ -85,7 +82,9 @@
//褰撳墠鏈烘瀯鐨勭埗绾ф満鏋勭紪鍙�
//鏈烘瀯灞傜骇
//鏈烘瀯缂栧彿
+ baseGoodsTemplate.setAgencyId(Long.valueOf(currentUser.getTenantId()));
//鏈烘瀯鍚嶇О
+ baseGoodsTemplate.setAgencyName(currentUser.getTenantName());
//鍒涘缓鏃堕棿
long createTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
baseGoodsTemplate.setCreateDate(createTime);
@@ -198,7 +197,12 @@
}
int flag1 = this.update(baseGoodsTemplate);
//2.淇敼瑙勬牸鍨嬪彿鐨勫崟浣�
+ // TODO id 鐗╁搧鍨嬪彿淇敼寰呮暣鐞�
List<BaseGoodsModels> modelsList = param.getModels();
+ for (BaseGoodsModels baseGoodsModel : modelsList) {
+ BaseGoodsModels baseGoodsModels = new BaseGoodsModels();
+ BeanUtils.copyProperties(baseGoodsModel, baseGoodsModels);
+ }
int flag2 = this.update(modelsList);
if (flag1 > 0 && flag2 > 0) {
@@ -233,7 +237,7 @@
* @param modelId
* @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 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 ";
public Map<String, Object> queryGoodsInfoByModelId(Long modelId) {
StringBuilder sqlStr = new StringBuilder(QUERY_GOODSINFO_BY_MODELID);
@@ -251,6 +255,7 @@
/**
* 淇敼鐘舵��
+ *
* @author 鍗㈠簡闃�
* @date 2023/10/25
*/
@@ -274,13 +279,54 @@
}
/**
- * @Description 鏌ヨ浠撳簱绫诲瀷(鏁版嵁瀛楀吀)
+ * @return
+ * @Description 鏌ヨ浠撳簱绫诲瀷(鏁版嵁瀛楀吀)
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
+ */
+ 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());
+ }
+
+ /**
+ * @Description 鏍规嵁鍒嗙被id鏌ヨ鐗╁搧妯℃澘
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/30
+ */
+ public List<BaseGoodsTemplate> queryByCategoryId(Long categoryId) {
+ BaseGoodsTemplate goodsTemplate = new BaseGoodsTemplate();
+ goodsTemplate.setCategoryId(categoryId);
+ return this.select(goodsTemplate);
+ }
+
+ /**
+ * @param agencyId
+ * @param categoryId
+ * @param states
+ * @param goodsName 鍏ㄥ尮閰嶏紒锛侊紒
* @return
*/
- public List<S_dict_data> 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 S_dict_data());
+
+ 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) {
+ sql.append("AND AGENCY_ID=:agencyId ");
+ params.put("agencyId", agencyId);
+ }
+ if (categoryId != null) {
+ sql.append("AND CATEGORY_ID=:categoryId ");
+ params.put("categoryId", categoryId);
+ }
+ if (states != null) {
+ sql.append("AND STATES=:states ");
+ params.put("states", states);
+ }
+ if (StringUtils.isNotEmpty(goodsName)) {
+ sql.append(" and GOODS_NAME =:goodsName ");
+ params.put("goodsName", goodsName);
+ }
+ return this.select(sql.toString(), params, new BaseGoodsTemplate());
}
}
--
Gitblit v1.9.1