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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
gaowdong 2025-04-18 16:22:57 +08:00
parent db1cb776fc 8109fd4291
commit 144559884a
5 changed files with 9 additions and 12 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/domain/MenuDishesType.java
View File

@ -25,18 +25,18 @@ public class MenuDishesType extends Model<MenuDishesType> {
private String aliasName; private String aliasName;
@ApiModelProperty("是否默认(1-默认,2-非默认)") @ApiModelProperty("是否默认(1-默认,2-非默认)")
private Integer defaultFlag; private Integer defaultFlag;
@ApiModelProperty("删除标识") @ApiModelProperty("删除标识(0-正常,2-删除)")
private Integer delFlag; private Integer delFlag;
@ApiModelProperty("乐观锁") @ApiModelProperty("乐观锁")
private Integer revision; private Integer revision;
@ApiModelProperty("创建人") @ApiModelProperty("创建人")
private String crby; private String createBy;
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
private LocalDateTime crtime; private LocalDateTime createTime;
@ApiModelProperty("更新人") @ApiModelProperty("更新人")
private String upby; private String updateBy;
@ApiModelProperty("更新时间") @ApiModelProperty("更新时间")
private LocalDateTime uptime; private LocalDateTime updateTime;
} }

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

@ -184,9 +184,6 @@ public class MenuNutrition extends BaseEntity {
@ApiModelProperty(value = "维生素e(mg/100g)") @ApiModelProperty(value = "维生素e(mg/100g)")
private Double vitaminE; private Double vitaminE;
/** 删除标识(1删除,2正常) */
private Integer delFlag;
/** 胆碱(mg/100g) */ /** 胆碱(mg/100g) */
@Excel(name = "胆碱(mg/100g)") @Excel(name = "胆碱(mg/100g)")
@ApiModelProperty(value = "胆碱(mg/100g)") @ApiModelProperty(value = "胆碱(mg/100g)")

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

@ -57,7 +57,7 @@ public class MenuDishesTypeServiceImpl extends ServiceImpl<MenuDishesTypeMapper
String username = SecurityUtils.getUsername(); String username = SecurityUtils.getUsername();
MenuDishesType dishesType = new MenuDishesType(); MenuDishesType dishesType = new MenuDishesType();
BeanUtil.copyProperties(content, dishesType, new String[0]); BeanUtil.copyProperties(content, dishesType, new String[0]);
dishesType.setCrby(username); dishesType.setCreateBy(username);
dishesType.setTypeId(Id.next()); dishesType.setTypeId(Id.next());
return this.baseMapper.insert(dishesType); return this.baseMapper.insert(dishesType);
} }

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

@ -432,7 +432,7 @@ public class MenuRecipeServiceImpl extends ServiceImpl<MenuRecipeMapper, MenuRec
return this.baseMapper.getAllDishCategories(Wrappers.lambdaQuery(MenuDishesType.class) return this.baseMapper.getAllDishCategories(Wrappers.lambdaQuery(MenuDishesType.class)
.eq(MenuDishesType::getDelFlag, DelFlagEnum.DEL_FALSE.key()) .eq(MenuDishesType::getDelFlag, DelFlagEnum.DEL_FALSE.key())
.orderByAsc(MenuDishesType::getDefaultFlag) .orderByAsc(MenuDishesType::getDefaultFlag)
.orderByDesc(MenuDishesType::getCrtime)); .orderByDesc(MenuDishesType::getCreateTime));
} }
@Override @Override

4
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesTypeMapper.xml
View File

@ -5,8 +5,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.bonus.canteen.core.menu.mapper.MenuDishesTypeMapper"> <mapper namespace="com.bonus.canteen.core.menu.mapper.MenuDishesTypeMapper">
<select id="getAllMenuDishesTypeList" resultType="com.bonus.canteen.core.menu.vo.MenuDishesTypeAllVO"> <select id="getAllMenuDishesTypeList" resultType="com.bonus.canteen.core.menu.vo.MenuDishesTypeAllVO">
select type_id, type_name from menu_dishes_type where del_flag = 2 select type_id, type_name from menu_dishes_type where del_flag = '0'
order by crtime desc order by create_time desc
</select> </select>
<select id="selectAllList" resultType="com.bonus.canteen.core.menu.vo.DrpUnitPageVO" parameterType="com.bonus.canteen.core.menu.vo.DrpUnitPageVO"> <select id="selectAllList" resultType="com.bonus.canteen.core.menu.vo.DrpUnitPageVO" parameterType="com.bonus.canteen.core.menu.vo.DrpUnitPageVO">