From 13b0bad30ef1df53492cbab1c1b99dfc02dee63f Mon Sep 17 00:00:00 2001
From: haoyahui <2032914783@qq.com>
Date: 星期二, 21 十一月 2023 17:51:16 +0800
Subject: [PATCH] 台账管理，盘点任务开发
---
consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 24fa924..7db3e79 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,13 @@
import com.consum.base.Constants;
import com.consum.base.core.CodeGeneratorService;
-import com.consum.base.pojo.BaseGoodsTemplateParam;
import com.consum.base.core.utils.IdUtil;
+import com.consum.base.pojo.BaseGoodsTemplateParam;
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.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;
@@ -62,7 +63,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);
@@ -84,7 +85,9 @@
//褰撳墠鏈烘瀯鐨勭埗绾ф満鏋勭紪鍙�
//鏈烘瀯灞傜骇
//鏈烘瀯缂栧彿
+ baseGoodsTemplate.setAgencyId(Long.valueOf(currentUser.getTenantId()));
//鏈烘瀯鍚嶇О
+ baseGoodsTemplate.setAgencyName(currentUser.getTenantName());
//鍒涘缓鏃堕棿
long createTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
baseGoodsTemplate.setCreateDate(createTime);
@@ -284,9 +287,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 +307,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