From 9650d2144e4858e59c732376842fecd80b6696b0 Mon Sep 17 00:00:00 2001
From: lzq <2495532633@qq.com>
Date: Wed, 21 Jan 2026 14:59:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods/controller/GoodsController.java     |  2 +-
 .../dispose/goods/mapper/GoodsMapper.java     |  2 +
 .../dispose/goods/service/GoodsService.java   |  2 +-
 .../goods/service/impl/GoodsServiceImpl.java  |  7 +-
 .../resources/mapper/goods/GoodsMapper.xml    | 79 +++++++++++--------
 5 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/controller/GoodsController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/controller/GoodsController.java
index 22cdef0..a660c2a 100644
--- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/controller/GoodsController.java
+++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/controller/GoodsController.java
@@ -58,7 +58,7 @@ public class GoodsController {
      * 详情
      */
     @GetMapping("/detail")
-    public R<GoodsEntity> detail(@RequestParam("id") Long id) {
+    public R<SearchGoodsResult> detail(@RequestParam("id") Long id) {
         return R.success(goodsService.detail(id));
     }
 
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/mapper/GoodsMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/mapper/GoodsMapper.java
index 542f634..2067b72 100644
--- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/mapper/GoodsMapper.java
+++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/mapper/GoodsMapper.java
@@ -16,6 +16,8 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface GoodsMapper extends BaseMapper<GoodsEntity> {
     IPage<SearchGoodsResult> paging(Page<Object> page, @Param("ew") QueryWrapper<Object> ew);
+
+    SearchGoodsResult detail(@Param("ew") QueryWrapper<Object> ew);
 }
 
 
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/GoodsService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/GoodsService.java
index 5e685f1..9674b26 100644
--- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/GoodsService.java
+++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/GoodsService.java
@@ -22,7 +22,7 @@ public interface GoodsService extends IService<GoodsEntity> {
 
     void del(List<Long> ids);
 
-    GoodsEntity detail(Long id);
+    SearchGoodsResult detail(Long id);
 
     PageResult<SearchGoodsResult> paging(PageParam pageParam, GoodsEntity goodsEntity);
 
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/impl/GoodsServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/impl/GoodsServiceImpl.java
index 36d81f1..e9d1682 100644
--- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/impl/GoodsServiceImpl.java
+++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/service/impl/GoodsServiceImpl.java
@@ -85,11 +85,8 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, GoodsEntity> impl
     }
 
     @Override
-    public GoodsEntity detail(Long id) {
-        GoodsEntity goodsEntity = this.getById(id);
-        goodsEntity.setExpenseItem(expenseItemService.getOne(Wrappers.<ExpenseItemEntity>lambdaQuery()
-            .eq(ExpenseItemEntity::getGoodsId, id)));
-        return this.getById(id);
+    public SearchGoodsResult detail(Long id) {
+        return baseMapper.detail(Wrappers.query().eq("a.id", id));
     }
 
     @Override
diff --git a/njzscloud-svr/src/main/resources/mapper/goods/GoodsMapper.xml b/njzscloud-svr/src/main/resources/mapper/goods/GoodsMapper.xml
index b8f119f..1ff7dfb 100644
--- a/njzscloud-svr/src/main/resources/mapper/goods/GoodsMapper.xml
+++ b/njzscloud-svr/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -24,43 +24,52 @@
             <result property="goodsScope" column="goods_scope" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
         </association>
     </resultMap>
-    <select id="paging" resultMap="SearchGoodsResultMap">
+    <sql id="SearchGoodsResultSql">
         SELECT a.id,
-        a.goods_category_id,
-        a.sn,
-        a.goods_name,
-        a.spec_params,
-        a.picture,
-        a.unit,
-        a.sort,
-        a.canuse,
-        a.memo,
-        a.create_time,
-        b.biz_type,
-        b.category_name,
-        b.picture b_picture,
-        b.sort b_sort,
-        b.create_time b_create_time,
-        c.id c_id,
-        c.expense_item_category,
-        c.expense_item_name,
-        c.expense_strategy,
-        c.unit c_unit,
-        c.tax_rate,
-        c.payer,
-        c.unit_price,
-        c.initial_price,
-        c.initial_quantity,
-        c.every_quantity,
-        c.user_scope,
-        c.station_scope,
-        c.goods_scope,
-        c.canuse c_canuse,
-        c.memo c_memo,
-        c.create_time c_create_time
+               a.goods_category_id,
+               a.sn,
+               a.goods_name,
+               a.spec_params,
+               a.picture,
+               a.unit,
+               a.sort,
+               a.canuse,
+               a.memo,
+               a.create_time,
+               b.biz_type,
+               b.category_name,
+               b.picture     b_picture,
+               b.sort        b_sort,
+               b.create_time b_create_time,
+               c.id          c_id,
+               c.expense_item_category,
+               c.expense_item_name,
+               c.expense_strategy,
+               c.unit        c_unit,
+               c.tax_rate,
+               c.payer,
+               c.unit_price,
+               c.initial_price,
+               c.initial_quantity,
+               c.every_quantity,
+               c.user_scope,
+               c.station_scope,
+               c.goods_scope,
+               c.canuse      c_canuse,
+               c.memo        c_memo,
+               c.create_time c_create_time
         FROM gds_goods a
-        INNER JOIN gds_goods_category b ON a.goods_category_id = b.id
-        LEFT JOIN fin_expense_item c ON c.goods_id = a.id
+                 INNER JOIN gds_goods_category b ON a.goods_category_id = b.id
+                 LEFT JOIN fin_expense_item c ON c.goods_id = a.id
+    </sql>
+    <select id="paging" resultMap="SearchGoodsResultMap">
+        <include refid="SearchGoodsResultSql"/>
+        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+            ${ew.customSqlSegment}
+        </if>
+    </select>
+    <select id="detail" resultMap="SearchGoodsResultMap">
+        <include refid="SearchGoodsResultSql"/>
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}
         </if>