diff --git a/bonus-common-biz/src/main/java/com/bonus/common/houqin/constant/DelFlagEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/houqin/constant/DelFlagEnum.java index a24cf4f..11f2fef 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/houqin/constant/DelFlagEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/houqin/constant/DelFlagEnum.java @@ -1,8 +1,8 @@ package com.bonus.common.houqin.constant; public enum DelFlagEnum { - DEL_TRUE(2, "删除"), - DEL_FALSE(0, "正常"); + DEL_FALSE(0, "正常"), + DEL_TRUE(2, "删除"); private final Integer key; private final String value; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/mapper/AllocAreaMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/mapper/AllocAreaMapper.java index ceaac5f..13ac1c7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/mapper/AllocAreaMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/mapper/AllocAreaMapper.java @@ -18,6 +18,8 @@ public interface AllocAreaMapper { */ public AllocArea selectAllocAreaByAreaId(Long areaId); + public AllocArea selectAllocAreaByAreaName(String areaName); + /** * 查询区域列表 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/service/impl/AllocAreaServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/service/impl/AllocAreaServiceImpl.java index d849190..834e5b9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/service/impl/AllocAreaServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/service/impl/AllocAreaServiceImpl.java @@ -3,6 +3,7 @@ package com.bonus.canteen.core.alloc.service.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; import com.bonus.canteen.core.common.domain.TreeSelect; import com.bonus.canteen.core.alloc.mapper.AllocAreaMapper; @@ -63,9 +64,13 @@ public class AllocAreaServiceImpl implements IAllocAreaService { public int insertAllocArea(AllocArea allocArea) { allocArea.setCreateTime(DateUtils.getNowDate()); try { + AllocArea checkResult = allocAreaMapper.selectAllocAreaByAreaName(allocArea.getAreaName()); + if (Objects.nonNull(checkResult)) { + throw new ServiceException("区域名称已存在"); + } return allocAreaMapper.insertAllocArea(allocArea); } catch (Exception e) { - throw new ServiceException("错误信息描述"); + throw new ServiceException("新增异常," + e.getMessage()); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml index 6ecd878..6d32a6a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml @@ -432,7 +432,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{accStatus} - and (t2.nick_name = #{accountInfoQueryParam.searchValue} + and (t2.nick_name like CONCAT('%',#{accountInfoQueryParam.searchValue},'%') or t2.phonenumber = #{encryptedSearchValue} ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml index c31dfa7..654b9bf 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml @@ -35,7 +35,7 @@ and aop.create_by like #{param.createBy} - and (su.nick_name = #{param.searchValue} + and (su.nick_name like CONCAT('%',#{param.searchValue},'%') or su.phonenumber = #{encryptedSearchValue} ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml index 3bdfd42..7c47403 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml @@ -264,7 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and (su.nick_name = #{param.searchValue} + and (su.nick_name like CONCAT('%',#{param.searchValue},'%') or su.phonenumber = #{encryptedSearchValue} or su.user_id like CONCAT('%',#{param.searchValue},'%') ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocAreaMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocAreaMapper.xml index 86bc3a3..ed29103 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocAreaMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocAreaMapper.xml @@ -42,6 +42,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where area_id = #{areaId} + + insert into alloc_area diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml index d03b131..dc4aa29 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml @@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and atwd.trade_time = ]]> #{param.startDateTime} and atwd.trade_time #{param.endDateTime} - and (su.nick_name = #{param.searchValue} + and (su.nick_name like CONCAT('%',#{param.searchValue},'%') or su.user_id like CONCAT('%',#{param.searchValue},'%') ) @@ -205,7 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where 1 = 1 - and (b.nick_name = #{param.searchValue} + and (b.nick_name like CONCAT('%',#{param.searchValue},'%') or b.phonenumber = #{encryptedSearchValue} or c.user_id like CONCAT('%',#{param.searchValue},'%') ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml index 5023659..2526943 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml @@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ( - su.nick_name = #{param.searchValue} + su.nick_name like CONCAT('%',#{param.searchValue},'%') or su.phonenumber = #{encryptedSearchValue} or su.user_id like concat('%', #{param.searchValue}, '%') ) @@ -311,7 +311,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ( - su.nick_name = #{param.searchValue} + su.nick_name like CONCAT('%',#{param.searchValue},'%') or su.phonenumber = #{encryptedSearchValue} or su.user_id like concat('%', #{param.searchValue}, '%') )