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 @@
- +
- +
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 @@ + @@ -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 @@ -58,6 +59,7 @@ UPDATE dept_goods_category + dept_category_name = #{deptCategoryName}, is_hot = #{isHot}, dept_rate = #{deptRate}, dept_money = #{deptMoney}, @@ -89,6 +91,7 @@ keyProperty="goodsCategoryId"> insert into dept_goods_category( is_hot, + dept_category_name, dept_rate, dept_money, retain_rate, @@ -103,6 +106,7 @@ create_time )values( #{isHot}, + #{deptCategoryName}, #{deptRate}, #{deptMoney}, #{retainRate},