From 6579ca226c537d52b1b5e7436a6182b86d9959fb Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 16 十一月 2023 16:26:15 +0800
Subject: [PATCH] feat: 调拨单流水id
---
consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 2c12708..81a2cde 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
@@ -3,11 +3,11 @@
import com.consum.base.Constants;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.pojo.BaseGoodsTemplateParam;
-import com.consum.base.util.IdUtil;
+import com.consum.base.core.utils.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.SDictData;
import com.consum.model.vo.BaseGoodsTemplateVo;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -284,9 +284,9 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
- public List<S_dict_data> queryClassificationCode() {
+ 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 S_dict_data());
+ return this.select(sql.toString(), new Object[]{}, new SDictData());
}
/**
@@ -304,11 +304,11 @@
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");
+ sql.append("AND AGENCY_ID=:agencyId ");
params.put("agencyId", agencyId);
}
if (categoryId != null) {
- sql.append("AND CATEGORY_ID=:categoryId");
+ sql.append("AND CATEGORY_ID=:categoryId ");
params.put("categoryId", categoryId);
}
return this.select(sql.toString(), params, new BaseGoodsTemplate());
--
Gitblit v1.9.1