From 8032ea1be3c31c35206689d5d37ab0824ce44056 Mon Sep 17 00:00:00 2001
From: "kuang.yifei@iwhalecloud.com" <kuang.yifei@iwhalecloud.com>
Date: Thu, 30 Jun 2022 16:43:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8=E7=B1=BB=E7=9B=AE?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=88=AB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/goods/deptcategory/edit.html   | 6 +++---
 .../main/java/com/ghy/goods/domain/DeptGoodsCategory.java   | 3 +++
 .../main/resources/mapper/goods/DeptGoodsCategoryMapper.xml | 6 +++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ghy-admin/src/main/resources/templates/goods/deptcategory/edit.html b/ghy-admin/src/main/resources/templates/goods/deptcategory/edit.html
index 139f5fcc..01208e67 100644
--- a/ghy-admin/src/main/resources/templates/goods/deptcategory/edit.html
+++ b/ghy-admin/src/main/resources/templates/goods/deptcategory/edit.html
@@ -118,10 +118,10 @@
             </div>
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">备注：</label>
+                    <label class="col-sm-3 control-label">别名：</label>
                     <div class="col-sm-9">
-                        <textarea name="remark" maxlength="500" class="form-control" rows="3"
-                                  th:field="*{remark}"></textarea>
+                        <input name="deptCategoryName" placeholder="请输入别名" class="form-control" type="text" maxlength="12"
+                               th:field="*{deptCategoryName}">
                     </div>
                 </div>
             </div>
diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java b/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java
index 3c6ae75d..15d74253 100644
--- a/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java
+++ b/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java
@@ -20,6 +20,9 @@ public class DeptGoodsCategory extends GoodsCategory {
 
     @Excel(name = "分公司id", cellType = Excel.ColumnType.NUMERIC)
     private Long deptId;
+    
+    @Excel(name = "分公司备注类目名称", cellType = Excel.ColumnType.STRING)
+    private String deptCategoryName;
 
     @Excel(name = "是否热门类目 0.不是,1.是", cellType = Excel.ColumnType.NUMERIC)
     private Integer isHot;
diff --git a/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml b/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml
index 79c0f1bb..0baef0f4 100644
--- a/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml
@@ -7,6 +7,7 @@
         <result property="deptId"                   column="dept_id"/>
         <result property="goodsCategoryId"          column="goods_category_id"/>
         <result property="goodsCategoryName"        column="goods_category_name"/>
+        <result property="deptCategoryName"         column="dept_category_name" />
         <result property="parentCategoryId"         column="parent_category_id"     />
         <result property="level"                    column="level"     />
         <result property="status"                   column="status"     />
@@ -37,7 +38,7 @@
         SELECT dgc.dept_goods_category_id, dgc.dept_id, dgc.goods_category_id, dgc.category_sort,
                dgc.one_rate, dgc.two_rate, dgc.three_rate, dgc.create_by, dgc.create_time, dgc.remark,
                dgc.is_hot, dgc.dept_rate, dgc.dept_money, dgc.retain_rate, dgc.retain_money,
-               gc.goods_category_name, gc.level, gc.parent_category_id, gc.type, gc.status
+               dgc.dept_category_name, gc.goods_category_name, gc.level, gc.parent_category_id, gc.type, gc.status
         FROM dept_goods_category dgc LEFT JOIN goods_category gc ON dgc.goods_category_id = gc.goods_category_id
     </sql>
 
@@ -58,6 +59,7 @@
     <update id="updateDeptGoodsCategory" parameterType="com.ghy.goods.domain.DeptGoodsCategory">
         UPDATE dept_goods_category
         <set>
+            <if test="deptCategoryName != null and deptCategoryName != ''">dept_category_name = #{deptCategoryName},</if>
             <if test="isHot != null">is_hot = #{isHot},</if>
             <if test="deptRate != null and deptRate != ''">dept_rate = #{deptRate},</if>
             <if test="deptMoney != null and deptMoney != ''">dept_money = #{deptMoney},</if>
@@ -89,6 +91,7 @@
     keyProperty="goodsCategoryId">
         insert into dept_goods_category(
         <if test="isHot != null and isHot != ''">is_hot,</if>
+        <if test="deptCategoryName != null and deptCategoryName != ''">dept_category_name,</if>
         <if test="deptRate != null and deptRate != ''">dept_rate,</if>
         <if test="deptMoney != null and deptMoney != ''">dept_money,</if>
         <if test="retainRate != null and retainRate != ''">retain_rate,</if>
@@ -103,6 +106,7 @@
         create_time
         )values(
         <if test="isHot != null and isHot != ''">#{isHot},</if>
+        <if test="deptCategoryName != null and deptCategoryName != ''">#{deptCategoryName},</if>
         <if test="deptRate != null and deptRate != ''">#{deptRate},</if>
         <if test="deptMoney != null and deptMoney != ''">#{deptMoney},</if>
         <if test="retainRate != null and retainRate != ''">#{retainRate},</if>