diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicAccountEntity.java b/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicAccountEntity.java index 8eea117..ac72ea3 100644 --- a/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicAccountEntity.java +++ b/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicAccountEntity.java @@ -12,6 +12,7 @@ public class ScenicAccountEntity { private Long scenicId; private Integer isSuper; private String name; + private String phone; private String account; private String password; private Integer status; diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicAccountReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicAccountReqQuery.java index 5798713..547560b 100644 --- a/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicAccountReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicAccountReqQuery.java @@ -19,6 +19,9 @@ public class ScenicAccountReqQuery extends BaseQueryParameterReq { @ApiModelProperty("账号名称") private String account; + @ApiModelProperty("手机号") + private String phone; + @ApiModelProperty("账号状态(1启用/0关闭)") private Integer status; diff --git a/src/main/resources/mapper/ScenicAccountMapper.xml b/src/main/resources/mapper/ScenicAccountMapper.xml index 7cb70ad..f630b36 100644 --- a/src/main/resources/mapper/ScenicAccountMapper.xml +++ b/src/main/resources/mapper/ScenicAccountMapper.xml @@ -2,8 +2,8 @@ - insert into scenic_account(id, scenic_id, is_super, name, account, password, create_time, update_time) - values (#{id}, #{scenicId}, #{isSuper}, #{name}, #{account}, #{password}, now(), now()) + insert into scenic_account(id, scenic_id, is_super, name, phone, account, password, create_time, update_time) + values (#{id}, #{scenicId}, #{isSuper}, #{name}, #{phone}, #{account}, #{password}, now(), now()) update scenic_account @@ -11,6 +11,9 @@ name = #{name}, + + phone = #{phone}, + account = #{account}, @@ -40,12 +43,12 @@ @@ -60,9 +63,12 @@ AND scenic_id = #{scenicId} - + AND account LIKE CONCAT('%', #{account}, '%') + + AND phone LIKE CONCAT('%', #{phone}, '%') + AND status = #{status}