From eb8577aac0f1f7d783ecd067e7eef05e53e7fd10 Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期五, 27 十月 2023 17:24:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 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 f268ab2..6e44892 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
@@ -227,15 +227,43 @@
* @param modelId
* @return
*/
- private static String QUERY_GOODSINFO_BY_MODELID = "SELECT model.MODEL_NAME,model.UNIT,temp.GOODS_CODE,temp.GOODS_NAME,temp.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 FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE temp ON model.GOODS_TEMPLATES_ID=temp.id WHERE 1=1 ";
- public List<Map<String, Object>> queryGoodsInfoByModelId(Long modelId) {
+ public Map<String, Object> queryGoodsInfoByModelId(Long modelId) {
StringBuilder sqlStr = new StringBuilder(QUERY_GOODSINFO_BY_MODELID);
Map<String, Object> params = new HashMap<>();
if (modelId != null) {
sqlStr.append(" AND model.id=:modelId");
params.put("modelId", modelId);
}
- return this.select(sqlStr.toString(), params);
+ List<Map<String, Object>> tempGoodsInfo = this.select(sqlStr.toString(), params);
+ if (CollectionUtils.isEmpty(tempGoodsInfo)) {
+ return null;
+ }
+ return tempGoodsInfo.get(0);
+ }
+
+ /**
+ * 淇敼鐘舵��
+ * @author 鍗㈠簡闃�
+ * @date 2023/10/25
+ */
+ public int updateStatus(BaseGoodsTemplate goodsTemplate) {
+ return this.update(goodsTemplate);
+ }
+
+ /**
+ * @Description 鏍规嵁鐗╁搧id鍒犻櫎鐗╁搧
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/25
+ */
+ public int updateById(BaseGoodsTemplate goodsTemplate, S_user_core currentUser) {
+ goodsTemplate.setStates(Constants.STATES_DELETED);
+ //鍒犻櫎鏃堕棿
+ goodsTemplate.setDTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+ //鍒犻櫎浜篿d鍜屽垹闄や汉濮撳悕
+ goodsTemplate.setDUserId(currentUser.getId());
+ goodsTemplate.setDUserName(currentUser.getUser_name());
+ return this.update(goodsTemplate);
}
}
--
Gitblit v1.9.1