bonus
/
Bonus-Cloud-Houqin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug 5460

This commit is contained in:
sxu 2025-03-27 18:48:10 +08:00
parent 2cb0b3c60b
commit feffac06b9
5 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuDishesTypeEditDTO.java
View File

@ -14,6 +14,8 @@ public class MenuDishesTypeEditDTO implements Serializable {
private String typeName;
@ApiModelProperty("类别别称")
private String aliasName;
@ApiModelProperty(value = "区域id")
private Long areaId;
public Long getTypeId() {
return this.typeId;
@ -38,4 +40,12 @@ public class MenuDishesTypeEditDTO implements Serializable {
public void setAliasName(final String aliasName) {
this.aliasName = aliasName;
}
public Long getAreaId() {
return areaId;
}
public void setAreaId(Long areaId) {
this.areaId = areaId;
}
}

10
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/entity/MenuDishesType.java
View File

@ -21,6 +21,8 @@ public class MenuDishesType extends Model<MenuDishesType> {
private String typeName;
@ApiModelProperty("类别别称")
private String aliasName;
@ApiModelProperty(value = "区域id")
private Long areaId;
@ApiModelProperty("是否默认(1-默认,2-非默认)")
private Integer defaultFlag;
@ApiModelProperty("删除标识")
@ -52,6 +54,14 @@ public class MenuDishesType extends Model<MenuDishesType> {
return this.aliasName;
}
public Long getAreaId() {
return areaId;
}
public void setAreaId(Long areaId) {
this.areaId = areaId;
}
public Integer getDefaultFlag() {
return this.defaultFlag;
}

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuDishesTypeMapper.java
View File

@ -27,6 +27,9 @@ public interface MenuDishesTypeMapper extends BaseMapper<MenuDishesType> {
@Select({"select type_id, type_name from menu_dishes_type ${ew.customSqlSegment}"})
List<MenuDishesTypeAllVO> selectAllListByWrapper(@Param("ew") Wrapper<MenuDishesType> wrapper);
@Select({"select type_id, type_name, area_id from menu_dishes_type ${ew.customSqlSegment}"})
List<MenuDishesTypeAllVO> selectAllListByWrapper2(@Param("ew") Wrapper<MenuDishesType> wrapper);
@Select({"select type_name from menu_dishes_type where del_flag = 2"})
List<String> selectDishesTypeNameList();
}

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesTypeServiceImpl.java
View File

@ -161,7 +161,7 @@ public class MenuDishesTypeServiceImpl extends ServiceImpl<MenuDishesTypeMapper,
@Override
public List<MenuDishesTypeAllVO> getAllMenuDishesTypeList() {
return this.baseMapper.selectAllListByWrapper(Wrappers.lambdaQuery(MenuDishesType.class)
return this.baseMapper.selectAllListByWrapper2(Wrappers.lambdaQuery(MenuDishesType.class)
.eq(MenuDishesType::getDelFlag, DelFlagEnum.DEL_FALSE.key())
.orderByAsc(MenuDishesType::getDefaultFlag)
.orderByDesc(MenuDishesType::getCrtime));

9
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/vo/MenuDishesTypeAllVO.java
View File

@ -11,6 +11,8 @@ public class MenuDishesTypeAllVO implements Serializable {
private Long typeId;
@ApiModelProperty("菜品类型名称")
private String typeName;
@ApiModelProperty(value = "区域id")
private Long areaId;
public Long getTypeId() {
return this.typeId;
@ -28,4 +30,11 @@ public class MenuDishesTypeAllVO implements Serializable {
this.typeName = typeName;
}
public Long getAreaId() {
return areaId;
}
public void setAreaId(Long areaId) {
this.areaId = areaId;
}
}