From 83ec5bcd06eece9b9867ecb3302980b92dd17504 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 14 十二月 2023 15:39:49 +0800
Subject: [PATCH] 修改型号查询列表
---
consum-base/src/main/java/com/consum/base/core/type/StatesType.java | 47 +++++++++++++++++++++++
consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateService.java | 11 +++--
consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java | 6 ++-
consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java | 2
consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java | 15 +++++--
consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java | 19 +++++----
6 files changed, 79 insertions(+), 21 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java b/consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java
index a282ed8..e956fae 100644
--- a/consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java
+++ b/consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java
@@ -1,7 +1,10 @@
package com.consum.base.config;
-import cn.afterturn.easypoi.excel.entity.result.ExcelVerifyHandlerResult;
-import cn.afterturn.easypoi.handler.inter.IExcelVerifyHandler;
+import java.util.HashMap;
+import java.util.List;
+import java.util.StringJoiner;
+
+import com.consum.base.core.type.StatesType;
import com.consum.base.pojo.WarnConfImEntity;
import com.consum.base.service.BaseGoodsModelsService;
import com.consum.base.service.BaseGoodsTemplateService;
@@ -11,9 +14,9 @@
import com.consum.model.po.BaseWarehouse;
import com.iplatform.core.BeanContextAware;
import com.walker.infrastructure.utils.CollectionUtils;
-import java.util.HashMap;
-import java.util.List;
-import java.util.StringJoiner;
+
+import cn.afterturn.easypoi.excel.entity.result.ExcelVerifyHandlerResult;
+import cn.afterturn.easypoi.handler.inter.IExcelVerifyHandler;
/**
* @ClassName WhWarningImportVerifyHandler
@@ -24,7 +27,7 @@
**/
public class WhWarningImportVerifyHandler implements IExcelVerifyHandler<WarnConfImEntity> {
- //淇濆瓨鎵�鏈夋暟鎹�
+ // 淇濆瓨鎵�鏈夋暟鎹�
private HashMap<String, Integer> containMap;
// 褰撳墠浜烘満鏋�
private Long agencyId;
@@ -40,7 +43,6 @@
this.baseGoodsModelsService = BeanContextAware.getBeanByType(BaseGoodsModelsService.class);
}
-
@Override
public ExcelVerifyHandlerResult verifyHandler(WarnConfImEntity param) {
@@ -73,7 +75,8 @@
param.setBaseWarehouseId(warehouse.getId());
}
- List<BaseGoodsTemplate> baseGoodsTemplates = baseGoodsTemplateService.queryGoodsTemplateByCategoryId(agencyId, null, (short) 1, goodsTemplateName);
+ List<BaseGoodsTemplate> baseGoodsTemplates = baseGoodsTemplateService.queryGoodsTemplateByCategoryId(agencyId,
+ null, StatesType.NORMAL.getValue(), goodsTemplateName);
if (CollectionUtils.isEmpty(baseGoodsTemplates)) {
joiner.add("鐗╁搧鍚嶇О鏈夎");
String errMsg = joiner.toString();
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
index 991539d..79e8593 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
@@ -22,6 +22,7 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.exception.ExcelDataConvertException;
import com.consum.base.BaseController;
+import com.consum.base.core.type.StatesType;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
@@ -179,8 +180,10 @@
*
* @author 鍗㈠簡闃�
* @date 2023/10/25
+ * <p>
+ * 鐗╁搧鐨勭鐢ㄦ垨鍒犻櫎锛屼笉褰卞搷宸茬粡閲囪喘鍏ヨ繃搴撶殑鐗╁搧淇℃伅銆�
+ * <p>
*/
- // TODO 鐗╁搧鐨勭鐢ㄦ垨鍒犻櫎锛屼笉褰卞搷宸茬粡閲囪喘鍏ヨ繃搴撶殑鐗╁搧淇℃伅銆�
@PostMapping("/updStatus")
public ResponseValue updateStatus() {
BaseGoodsTemplate goodsTemplate = CommonUtil.getObjFromReqBody(BaseGoodsTemplate.class);
@@ -200,8 +203,10 @@
* @Description 鏍规嵁鐗╁搧id鍒犻櫎鐗╁搧
* @Author 鍗㈠簡闃�
* @Date 2023/10/25
+ * <p>
+ * 鐗╁搧鐨勭鐢ㄦ垨鍒犻櫎锛屼笉褰卞搷宸茬粡閲囪喘鍏ヨ繃搴撶殑鐗╁搧淇℃伅銆�
+ * <p/>
*/
- // TODO 鐗╁搧鐨勭鐢ㄦ垨鍒犻櫎锛屼笉褰卞搷宸茬粡閲囪喘鍏ヨ繃搴撶殑鐗╁搧淇℃伅銆�
@DeleteMapping("/del")
public ResponseValue updateById() {
BaseGoodsTemplate goodsTemplate = CommonUtil.getObjFromReqBody(BaseGoodsTemplate.class);
@@ -241,9 +246,9 @@
@GetMapping("/query/goodsTemplate")
public ResponseValue queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId) {
- // TODO 涓嶉檺鍒舵満鏋�
- List<BaseGoodsTemplate> list =
- this.baseGoodsTemplateService.queryGoodsTemplateByCategoryId(null, categoryId, null, null);
+ // 涓嶉檺鍒舵満鏋�
+ List<BaseGoodsTemplate> list = baseGoodsTemplateService.queryGoodsTemplateByCategoryId(null, categoryId,
+ StatesType.NORMAL.getValue(), null);
if (list == null) {
return ResponseValue.error("鏌ヨ澶辫触锛�");
}
diff --git a/consum-base/src/main/java/com/consum/base/core/type/StatesType.java b/consum-base/src/main/java/com/consum/base/core/type/StatesType.java
new file mode 100644
index 0000000..cf80ef8
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/core/type/StatesType.java
@@ -0,0 +1,47 @@
+package com.consum.base.core.type;
+
+/**
+ * 鐘舵�佹灇涓�
+ *
+ * @author asus
+ * @version 2023/12/14 13:41
+ **/
+public enum StatesType {
+ /**
+ * 姝ｅ父
+ */
+ NORMAL(1, "姝ｅ父"),
+ /**
+ * 绂佺敤
+ */
+ DISABLED(2, "绂佺敤"),
+ /**
+ * 宸插垹闄�
+ */
+ DELETE(3, "宸插垹闄�");
+
+ private Integer value;
+
+ private String desc;
+
+ StatesType(Integer value, String desc) {
+ this.value = value;
+ this.desc = desc;
+ }
+
+ public Integer getValue() {
+ return value;
+ }
+
+ public void setValue(Integer value) {
+ this.value = value;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateService.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateService.java
index 249e67b..9aae8ae 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateService.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateService.java
@@ -1,5 +1,8 @@
package com.consum.base.service;
+import java.util.List;
+import java.util.Map;
+
import com.consum.base.pojo.BaseGoodsTemplateParam;
import com.consum.model.po.BaseCategory;
import com.consum.model.po.BaseGoodsTemplate;
@@ -9,8 +12,6 @@
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.jdbc.service.BaseService;
-import java.util.List;
-import java.util.Map;
public interface BaseGoodsTemplateService extends BaseService {
@@ -95,9 +96,9 @@
* @param agencyId
* @param categoryId
* @param states
- * @param goodsName 鍏ㄥ尮閰嶏紒锛侊紒
+ * @param goodsName 鍏ㄥ尮閰嶏紒锛侊紒
* @return
*/
-
- List<BaseGoodsTemplate> queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId, Short states, String goodsName);
+ List<BaseGoodsTemplate> queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId, Integer states,
+ String goodsName);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java
index 9266ab3..f83629a 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsModelsServiceImpl.java
@@ -149,8 +149,10 @@
public List<BaseGoodsModels> queryGoodsModelByGoodsTemplatesId(Long baseGoodsModelsId) {
StringBuilder sql = new StringBuilder("select * from base_goods_models where states != 3 ");
HashMap<String, Object> param = new HashMap<>();
- sql.append("and goods_templates_id=:baseGoodsModelsId");
- param.put("baseGoodsModelsId", baseGoodsModelsId);
+ if (baseGoodsModelsId != null) {
+ sql.append("and goods_templates_id=:baseGoodsModelsId");
+ param.put("baseGoodsModelsId", baseGoodsModelsId);
+ }
return select(sql.toString(), param, new BaseGoodsModels());
}
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 6a47513..2f11f09 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
@@ -334,7 +334,7 @@
* @return
*/
@Override
- public List<BaseGoodsTemplate> queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId, Short states,
+ public List<BaseGoodsTemplate> queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId, Integer states,
String goodsName) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1=1 ");
Map<String, Object> params = new HashMap<>();
--
Gitblit v1.9.1