From 16ceaf052b9cfa1d613757af4c9c614c851853dc Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 24 Sep 2025 10:38:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor(product):=E4=BC=98=E5=8C=96=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E6=9F=A5=E8=AF=A2=E5=B9=B6=E4=BF=AE=E6=AD=A3Excel?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将QueryWrapper替换为LambdaQueryWrapper以提高类型安全性-修正产品类型字段的Excel字典转换表达式
-修正是否启用字段的Excel字典转换表达式
- 移除分类名称字段的Excel导出注解
---
 .../src/main/java/com/gear/oa/domain/vo/GearProductVo.java   | 5 ++---
 .../com/gear/oa/service/impl/GearProductServiceImpl.java     | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearProductVo.java b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearProductVo.java
index 18222fc..1b2d2dc 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearProductVo.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearProductVo.java
@@ -61,14 +61,14 @@ public class GearProductVo {
      * 产品类型（product=产品，semi=半成品，raw=原料）
      */
     @ExcelProperty(value = "产品类型", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "p=roduct=产品，semi=半成品，raw=原料")
+    @ExcelDictFormat(readConverterExp = "product=产品，semi=半成品，raw=原料")
     private String type;
 
     /**
      * 是否启用（0=否，1=是）
      */
     @ExcelProperty(value = "是否启用", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "0==否，1=是")
+    @ExcelDictFormat(readConverterExp = "0=否，1=是")
     private Integer isEnabled;
 
     /**
@@ -86,7 +86,6 @@ public class GearProductVo {
     //新增图像字段
     private String image;
      //    分类名称
-    @ExcelProperty(value = "分类名称")
     private String categoryName;
 }
 
diff --git a/gear-oa/src/main/java/com/gear/oa/service/impl/GearProductServiceImpl.java b/gear-oa/src/main/java/com/gear/oa/service/impl/GearProductServiceImpl.java
index 8973114..b2ef6ee 100644
--- a/gear-oa/src/main/java/com/gear/oa/service/impl/GearProductServiceImpl.java
+++ b/gear-oa/src/main/java/com/gear/oa/service/impl/GearProductServiceImpl.java
@@ -92,7 +92,7 @@ public class GearProductServiceImpl implements IGearProductService {
      */
     @Override
     public List<GearProductVo> queryList(GearProductBo bo) {
-        QueryWrapper<GearProduct> lqw = buildQueryWrapperPlus(bo);
+        LambdaQueryWrapper<GearProduct> lqw = buildQueryWrapper(bo);
         return baseMapper.selectVoList(lqw);
     }