From c2343ece827e48aba494eda8519eafb442db3f2c Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Sun, 31 Aug 2025 22:33:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/material/ma/controller/TypeController.java   | 1 +
 .../src/main/resources/mapper/material/ma/TypeMapper.xml   | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java
index 2a66e8eb..174400f9 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java
@@ -263,6 +263,7 @@ public class TypeController extends BaseController {
     public AjaxResult add(@RequestBody Type type) {
         return toAjax(typeService.insertType(type));
     }
+
     @ApiOperation(value = "修改物资库存")
     @PreventRepeatSubmit
 //    @RequiresPermissions("ma:type:updateNum")
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
index 6ab58175..96dbcb40 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
@@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isEnter" column="is_enter" />
         <result property="keeperUserId" column="keep_user_id" />
         <result property="isCheck" column="is_check" />
+        <result property="jiJuType" column="jiju_type" />
     </resultMap>
 
     <resultMap type="com.bonus.material.ma.domain.vo.MaTypeVo" id="MaTypeVoResult">
@@ -176,7 +177,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             GROUP_CONCAT(distinct su2.user_id) as repairerId,
             hi.house_name,
             t.sampling_ratio,
-            t.is_check
+            t.is_check,
+            t.jiju_type
         FROM ma_type AS t
                  left join ma_type mt2 on t.parent_id  = mt2.type_id
                  left join ma_type mt3 on mt2.parent_id = mt3.type_id
@@ -257,6 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isTest != null">is_test,</if>
             <if test="samplingRatio != null">sampling_ratio,</if>
             <if test="isEnter != null">is_enter,</if>
+            <if test="jiJuType != null">jiJu_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="typeName != null and typeName != ''">#{typeName},</if>
@@ -293,6 +296,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isTest != null">#{isTest},</if>
             <if test="samplingRatio != null">#{samplingRatio},</if>
             <if test="isEnter != null">#{isEnter},</if>
+            <if test="jiJuType != null">#{jiJuType},</if>
          </trim>
     </insert>
 
@@ -335,6 +339,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isEnter != null">is_enter = #{isEnter},</if>
             <if test="keeperUserId != null">keep_user_id = #{keeperUserId},</if>
             <if test="isCheck != null and isCheck != ''">is_check = #{isCheck},</if>
+            <if test="jiJuType != null and jiJuType != ''">jiJu_type = #{jiJuType},</if>
         </trim>
         where type_id = #{typeId}
     </update>