Commit 0584fcd3 authored by 赵啸非's avatar 赵啸非

修改用户登录,数据库表,删除资源resource

parent a283f243
...@@ -35,7 +35,7 @@ CREATE TABLE mortals_xhx_role( ...@@ -35,7 +35,7 @@ CREATE TABLE mortals_xhx_role(
`roleSort` int(4) COMMENT '角色排序字段', `roleSort` int(4) COMMENT '角色排序字段',
`roleType` tinyint(2) COMMENT '角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)', `roleType` tinyint(2) COMMENT '角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)',
`remark` varchar(256) COMMENT '备注', `remark` varchar(256) COMMENT '备注',
`roleType` tinyint(2) COMMENT '角色状态(0.停用,1.启用)', `status` tinyint(2) COMMENT '角色状态(0.停用,1.启用)',
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户', `createUserId` bigint(20) COMMENT '创建用户',
`createUserName` varchar(50) COMMENT '创建用户名称', `createUserName` varchar(50) COMMENT '创建用户名称',
...@@ -216,4 +216,5 @@ INSERT INTO `mortals_xhx_role` VALUES (1, '管理员', '类似admin', 0, now(), ...@@ -216,4 +216,5 @@ INSERT INTO `mortals_xhx_role` VALUES (1, '管理员', '类似admin', 0, now(),
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_task` VALUES (2, '分表创建任务', 'tableIndexService', 0, 'tableIndexService', NULL, NULL, 1, 0, '00:30', NULL, '192.168.1.106', '2021-08-18 00:30:01', 0, '2021-08-12 11:07:23', 1, '系统管理员'); INSERT INTO `mortals_xhx_task` VALUES (2, '分表创建任务', 'tableIndexService', 0, 'tableIndexService', NULL, NULL, 1, 0, '00:30', NULL, '192.168.1.106', '2021-08-18 00:30:01', 0, '2021-08-12 11:07:23', 1, '系统管理员');
INSERT INTO `mortals_xhx_user` VALUES (1, 'admin', '43442676c74ae59f219c2d87fd6bad52', NULL, '系统管理员', '13808095770', NULL, NULL, 1,"","","", 1, 1, now(), 1, 'admin', now(), '127.0.0.1');
INSERT INTO `mortals_xhx_user` VALUES (1, 'admin', '43442676c74ae59f219c2d87fd6bad52', NULL, '系统管理员', '13808095770', NULL, NULL,NULL, 0,"","", 1, now(), 1, 'admin', now(), '127.0.0.1');
\ No newline at end of file
...@@ -37,8 +37,8 @@ INSERT INTO `mortals_xhx_resource` VALUES (null, '角色信息-菜单管理-维 ...@@ -37,8 +37,8 @@ INSERT INTO `mortals_xhx_resource` VALUES (null, '角色信息-菜单管理-维
INSERT INTO `mortals_xhx_param` VALUES (null, '角色类型', 'Role', 'roleType', '0', '系统内置角色', 1, 4, 0, 'roleType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '角色类型', 'Role', 'roleType', '0', '系统内置角色', 1, 4, 0, 'roleType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '角色类型', 'Role', 'roleType', '1', '默认系统角色', 1, 4, 0, 'roleType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '角色类型', 'Role', 'roleType', '1', '默认系统角色', 1, 4, 0, 'roleType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '角色类型', 'Role', 'roleType', '2', '普通角色', 1, 4, 0, 'roleType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '角色类型', 'Role', 'roleType', '2', '普通角色', 1, 4, 0, 'roleType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '角色状态', 'Role', 'roleType', '0', '停用', 1, 4, 0, 'roleType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '角色状态', 'Role', 'status', '0', '停用', 1, 4, 0, 'status', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '角色状态', 'Role', 'roleType', '1', '启用', 1, 4, 0, 'roleType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '角色状态', 'Role', 'status', '1', '启用', 1, 4, 0, 'status', NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- 角色用户关联菜单 SQL -- 角色用户关联菜单 SQL
-- ---------------------------- -- ----------------------------
......
...@@ -7,142 +7,142 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,142 +7,142 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.role.model.vo.RoleVo; import com.mortals.xhx.module.role.model.vo.RoleVo;
/** /**
* 角色信息实体对象 * 角色信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-06-02 * @date 2022-06-02
*/ */
public class RoleEntity extends RoleVo { public class RoleEntity extends RoleVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 角色名称 * 角色名称
*/ */
private String name; private String name;
/** /**
* 角色编码 * 角色编码
*/ */
private String roleCode; private String roleCode;
/** /**
* 角色排序字段 * 角色排序字段
*/ */
private Integer roleSort; private Integer roleSort;
/** /**
* 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色) * 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)
*/ */
private Integer roleType; private Integer roleType;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/** /**
* 角色状态(0.停用,1.启用) * 角色状态(0.停用,1.启用)
*/ */
private Integer roleType; private Integer status;
/** /**
* 创建用户名称 * 创建用户名称
*/ */
private String createUserName; private String createUserName;
public RoleEntity(){} public RoleEntity(){}
/** /**
* 获取 角色名称 * 获取 角色名称
* @return String * @return String
*/ */
public String getName(){ public String getName(){
return name; return name;
} }
/** /**
* 设置 角色名称 * 设置 角色名称
* @param name * @param name
*/ */
public void setName(String name){ public void setName(String name){
this.name = name; this.name = name;
} }
/** /**
* 获取 角色编码 * 获取 角色编码
* @return String * @return String
*/ */
public String getRoleCode(){ public String getRoleCode(){
return roleCode; return roleCode;
} }
/** /**
* 设置 角色编码 * 设置 角色编码
* @param roleCode * @param roleCode
*/ */
public void setRoleCode(String roleCode){ public void setRoleCode(String roleCode){
this.roleCode = roleCode; this.roleCode = roleCode;
} }
/** /**
* 获取 角色排序字段 * 获取 角色排序字段
* @return Integer * @return Integer
*/ */
public Integer getRoleSort(){ public Integer getRoleSort(){
return roleSort; return roleSort;
} }
/** /**
* 设置 角色排序字段 * 设置 角色排序字段
* @param roleSort * @param roleSort
*/ */
public void setRoleSort(Integer roleSort){ public void setRoleSort(Integer roleSort){
this.roleSort = roleSort; this.roleSort = roleSort;
} }
/** /**
* 获取 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色) * 获取 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)
* @return Integer * @return Integer
*/ */
public Integer getRoleType(){ public Integer getRoleType(){
return roleType; return roleType;
} }
/** /**
* 设置 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色) * 设置 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)
* @param roleType * @param roleType
*/ */
public void setRoleType(Integer roleType){ public void setRoleType(Integer roleType){
this.roleType = roleType; this.roleType = roleType;
} }
/** /**
* 获取 备注 * 获取 备注
* @return String * @return String
*/ */
public String getRemark(){ public String getRemark(){
return remark; return remark;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remark * @param remark
*/ */
public void setRemark(String remark){ public void setRemark(String remark){
this.remark = remark; this.remark = remark;
} }
/** /**
* 获取 角色状态(0.停用,1.启用) * 获取 角色状态(0.停用,1.启用)
* @return Integer * @return Integer
*/ */
public Integer getRoleType(){ public Integer getStatus(){
return roleType; return status;
} }
/** /**
* 设置 角色状态(0.停用,1.启用) * 设置 角色状态(0.停用,1.启用)
* @param roleType * @param status
*/ */
public void setRoleType(Integer roleType){ public void setStatus(Integer status){
this.roleType = roleType; this.status = status;
} }
/** /**
* 获取 创建用户名称 * 获取 创建用户名称
* @return String * @return String
*/ */
public String getCreateUserName(){ public String getCreateUserName(){
return createUserName; return createUserName;
} }
/** /**
* 设置 创建用户名称 * 设置 创建用户名称
* @param createUserName * @param createUserName
*/ */
public void setCreateUserName(String createUserName){ public void setCreateUserName(String createUserName){
this.createUserName = createUserName; this.createUserName = createUserName;
} }
...@@ -152,7 +152,7 @@ public class RoleEntity extends RoleVo { ...@@ -152,7 +152,7 @@ public class RoleEntity extends RoleVo {
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -160,7 +160,7 @@ public class RoleEntity extends RoleVo { ...@@ -160,7 +160,7 @@ public class RoleEntity extends RoleVo {
if (obj instanceof RoleEntity) { if (obj instanceof RoleEntity) {
RoleEntity tmp = (RoleEntity) obj; RoleEntity tmp = (RoleEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -173,25 +173,25 @@ public class RoleEntity extends RoleVo { ...@@ -173,25 +173,25 @@ public class RoleEntity extends RoleVo {
sb.append(",roleSort:").append(getRoleSort()); sb.append(",roleSort:").append(getRoleSort());
sb.append(",roleType:").append(getRoleType()); sb.append(",roleType:").append(getRoleType());
sb.append(",remark:").append(getRemark()); sb.append(",remark:").append(getRemark());
sb.append(",roleType:").append(getRoleType()); sb.append(",status:").append(getStatus());
sb.append(",createUserName:").append(getCreateUserName()); sb.append(",createUserName:").append(getCreateUserName());
return sb.toString(); return sb.toString();
} }
public void initAttrValue(){ public void initAttrValue(){
this.name = ""; this.name = "";
this.roleCode = ""; this.roleCode = "";
this.roleSort = 0; this.roleSort = 0;
this.roleType = 2; this.roleType = 2;
this.remark = ""; this.remark = "";
this.roleType = 0; this.status = 0;
this.createUserName = ""; this.createUserName = "";
} }
} }
\ No newline at end of file
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.role.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.role.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.role.model.RoleEntity; import com.mortals.xhx.module.role.model.RoleEntity;
/** /**
* 角色信息查询对象 * 角色信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-06-02 * @date 2022-06-02
*/ */
public class RoleQuery extends RoleEntity { public class RoleQuery extends RoleEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
private Long idStart; private Long idStart;
...@@ -55,16 +55,16 @@ public class RoleQuery extends RoleEntity { ...@@ -55,16 +55,16 @@ public class RoleQuery extends RoleEntity {
private List<String> remarkList; private List<String> remarkList;
/** 开始 角色状态(0.停用,1.启用) */ /** 开始 角色状态(0.停用,1.启用) */
private Integer roleTypeStart; private Integer statusStart;
/** 结束 角色状态(0.停用,1.启用) */ /** 结束 角色状态(0.停用,1.启用) */
private Integer roleTypeEnd; private Integer statusEnd;
/** 增加 角色状态(0.停用,1.启用) */ /** 增加 角色状态(0.停用,1.启用) */
private Integer roleTypeIncrement; private Integer statusIncrement;
/** 角色状态(0.停用,1.启用)列表 */ /** 角色状态(0.停用,1.启用)列表 */
private List <Integer> roleTypeList; private List <Integer> statusList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -96,747 +96,747 @@ public class RoleQuery extends RoleEntity { ...@@ -96,747 +96,747 @@ public class RoleQuery extends RoleEntity {
public RoleQuery(){} public RoleQuery(){}
/** /**
* 获取 开始 序号,主键,自增长 * 获取 开始 序号,主键,自增长
* @return idStart * @return idStart
*/ */
public Long getIdStart(){ public Long getIdStart(){
return this.idStart; return this.idStart;
} }
/** /**
* 设置 开始 序号,主键,自增长 * 设置 开始 序号,主键,自增长
* @param idStart * @param idStart
*/ */
public void setIdStart(Long idStart){ public void setIdStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
} }
/** /**
* 获取 结束 序号,主键,自增长 * 获取 结束 序号,主键,自增长
* @return $idEnd * @return $idEnd
*/ */
public Long getIdEnd(){ public Long getIdEnd(){
return this.idEnd; return this.idEnd;
} }
/** /**
* 设置 结束 序号,主键,自增长 * 设置 结束 序号,主键,自增长
* @param idEnd * @param idEnd
*/ */
public void setIdEnd(Long idEnd){ public void setIdEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
} }
/** /**
* 获取 增加 序号,主键,自增长 * 获取 增加 序号,主键,自增长
* @return idIncrement * @return idIncrement
*/ */
public Long getIdIncrement(){ public Long getIdIncrement(){
return this.idIncrement; return this.idIncrement;
} }
/** /**
* 设置 增加 序号,主键,自增长 * 设置 增加 序号,主键,自增长
* @param idIncrement * @param idIncrement
*/ */
public void setIdIncrement(Long idIncrement){ public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
} }
/** /**
* 获取 序号,主键,自增长 * 获取 序号,主键,自增长
* @return idList * @return idList
*/ */
public List<Long> getIdList(){ public List<Long> getIdList(){
return this.idList; return this.idList;
} }
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param idList * @param idList
*/ */
public void setIdList(List<Long> idList){ public void setIdList(List<Long> idList){
this.idList = idList; this.idList = idList;
} }
/** /**
* 获取 角色名称 * 获取 角色名称
* @return nameList * @return nameList
*/ */
public List<String> getNameList(){ public List<String> getNameList(){
return this.nameList; return this.nameList;
} }
/** /**
* 设置 角色名称 * 设置 角色名称
* @param nameList * @param nameList
*/ */
public void setNameList(List<String> nameList){ public void setNameList(List<String> nameList){
this.nameList = nameList; this.nameList = nameList;
} }
/** /**
* 获取 角色编码 * 获取 角色编码
* @return roleCodeList * @return roleCodeList
*/ */
public List<String> getRoleCodeList(){ public List<String> getRoleCodeList(){
return this.roleCodeList; return this.roleCodeList;
} }
/** /**
* 设置 角色编码 * 设置 角色编码
* @param roleCodeList * @param roleCodeList
*/ */
public void setRoleCodeList(List<String> roleCodeList){ public void setRoleCodeList(List<String> roleCodeList){
this.roleCodeList = roleCodeList; this.roleCodeList = roleCodeList;
} }
/** /**
* 获取 开始 角色排序字段 * 获取 开始 角色排序字段
* @return roleSortStart * @return roleSortStart
*/ */
public Integer getRoleSortStart(){ public Integer getRoleSortStart(){
return this.roleSortStart; return this.roleSortStart;
} }
/** /**
* 设置 开始 角色排序字段 * 设置 开始 角色排序字段
* @param roleSortStart * @param roleSortStart
*/ */
public void setRoleSortStart(Integer roleSortStart){ public void setRoleSortStart(Integer roleSortStart){
this.roleSortStart = roleSortStart; this.roleSortStart = roleSortStart;
} }
/** /**
* 获取 结束 角色排序字段 * 获取 结束 角色排序字段
* @return $roleSortEnd * @return $roleSortEnd
*/ */
public Integer getRoleSortEnd(){ public Integer getRoleSortEnd(){
return this.roleSortEnd; return this.roleSortEnd;
} }
/** /**
* 设置 结束 角色排序字段 * 设置 结束 角色排序字段
* @param roleSortEnd * @param roleSortEnd
*/ */
public void setRoleSortEnd(Integer roleSortEnd){ public void setRoleSortEnd(Integer roleSortEnd){
this.roleSortEnd = roleSortEnd; this.roleSortEnd = roleSortEnd;
} }
/** /**
* 获取 增加 角色排序字段 * 获取 增加 角色排序字段
* @return roleSortIncrement * @return roleSortIncrement
*/ */
public Integer getRoleSortIncrement(){ public Integer getRoleSortIncrement(){
return this.roleSortIncrement; return this.roleSortIncrement;
} }
/** /**
* 设置 增加 角色排序字段 * 设置 增加 角色排序字段
* @param roleSortIncrement * @param roleSortIncrement
*/ */
public void setRoleSortIncrement(Integer roleSortIncrement){ public void setRoleSortIncrement(Integer roleSortIncrement){
this.roleSortIncrement = roleSortIncrement; this.roleSortIncrement = roleSortIncrement;
} }
/** /**
* 获取 角色排序字段 * 获取 角色排序字段
* @return roleSortList * @return roleSortList
*/ */
public List<Integer> getRoleSortList(){ public List<Integer> getRoleSortList(){
return this.roleSortList; return this.roleSortList;
} }
/** /**
* 设置 角色排序字段 * 设置 角色排序字段
* @param roleSortList * @param roleSortList
*/ */
public void setRoleSortList(List<Integer> roleSortList){ public void setRoleSortList(List<Integer> roleSortList){
this.roleSortList = roleSortList; this.roleSortList = roleSortList;
} }
/** /**
* 获取 开始 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色) * 获取 开始 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)
* @return roleTypeStart * @return roleTypeStart
*/ */
public Integer getRoleTypeStart(){ public Integer getRoleTypeStart(){
return this.roleTypeStart; return this.roleTypeStart;
} }
/** /**
* 设置 开始 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色) * 设置 开始 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)
* @param roleTypeStart * @param roleTypeStart
*/ */
public void setRoleTypeStart(Integer roleTypeStart){ public void setRoleTypeStart(Integer roleTypeStart){
this.roleTypeStart = roleTypeStart; this.roleTypeStart = roleTypeStart;
} }
/** /**
* 获取 结束 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色) * 获取 结束 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)
* @return $roleTypeEnd * @return $roleTypeEnd
*/ */
public Integer getRoleTypeEnd(){ public Integer getRoleTypeEnd(){
return this.roleTypeEnd; return this.roleTypeEnd;
} }
/** /**
* 设置 结束 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色) * 设置 结束 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)
* @param roleTypeEnd * @param roleTypeEnd
*/ */
public void setRoleTypeEnd(Integer roleTypeEnd){ public void setRoleTypeEnd(Integer roleTypeEnd){
this.roleTypeEnd = roleTypeEnd; this.roleTypeEnd = roleTypeEnd;
} }
/** /**
* 获取 增加 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色) * 获取 增加 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)
* @return roleTypeIncrement * @return roleTypeIncrement
*/ */
public Integer getRoleTypeIncrement(){ public Integer getRoleTypeIncrement(){
return this.roleTypeIncrement; return this.roleTypeIncrement;
} }
/** /**
* 设置 增加 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色) * 设置 增加 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)
* @param roleTypeIncrement * @param roleTypeIncrement
*/ */
public void setRoleTypeIncrement(Integer roleTypeIncrement){ public void setRoleTypeIncrement(Integer roleTypeIncrement){
this.roleTypeIncrement = roleTypeIncrement; this.roleTypeIncrement = roleTypeIncrement;
} }
/** /**
* 获取 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色) * 获取 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)
* @return roleTypeList * @return roleTypeList
*/ */
public List<Integer> getRoleTypeList(){ public List<Integer> getRoleTypeList(){
return this.roleTypeList; return this.roleTypeList;
} }
/** /**
* 设置 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色) * 设置 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)
* @param roleTypeList * @param roleTypeList
*/ */
public void setRoleTypeList(List<Integer> roleTypeList){ public void setRoleTypeList(List<Integer> roleTypeList){
this.roleTypeList = roleTypeList; this.roleTypeList = roleTypeList;
} }
/** /**
* 获取 备注 * 获取 备注
* @return remarkList * @return remarkList
*/ */
public List<String> getRemarkList(){ public List<String> getRemarkList(){
return this.remarkList; return this.remarkList;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remarkList * @param remarkList
*/ */
public void setRemarkList(List<String> remarkList){ public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList; this.remarkList = remarkList;
} }
/** /**
* 获取 开始 角色状态(0.停用,1.启用) * 获取 开始 角色状态(0.停用,1.启用)
* @return roleTypeStart * @return statusStart
*/ */
public Integer getRoleTypeStart(){ public Integer getStatusStart(){
return this.roleTypeStart; return this.statusStart;
} }
/** /**
* 设置 开始 角色状态(0.停用,1.启用) * 设置 开始 角色状态(0.停用,1.启用)
* @param roleTypeStart * @param statusStart
*/ */
public void setRoleTypeStart(Integer roleTypeStart){ public void setStatusStart(Integer statusStart){
this.roleTypeStart = roleTypeStart; this.statusStart = statusStart;
} }
/** /**
* 获取 结束 角色状态(0.停用,1.启用) * 获取 结束 角色状态(0.停用,1.启用)
* @return $roleTypeEnd * @return $statusEnd
*/ */
public Integer getRoleTypeEnd(){ public Integer getStatusEnd(){
return this.roleTypeEnd; return this.statusEnd;
} }
/** /**
* 设置 结束 角色状态(0.停用,1.启用) * 设置 结束 角色状态(0.停用,1.启用)
* @param roleTypeEnd * @param statusEnd
*/ */
public void setRoleTypeEnd(Integer roleTypeEnd){ public void setStatusEnd(Integer statusEnd){
this.roleTypeEnd = roleTypeEnd; this.statusEnd = statusEnd;
} }
/** /**
* 获取 增加 角色状态(0.停用,1.启用) * 获取 增加 角色状态(0.停用,1.启用)
* @return roleTypeIncrement * @return statusIncrement
*/ */
public Integer getRoleTypeIncrement(){ public Integer getStatusIncrement(){
return this.roleTypeIncrement; return this.statusIncrement;
} }
/** /**
* 设置 增加 角色状态(0.停用,1.启用) * 设置 增加 角色状态(0.停用,1.启用)
* @param roleTypeIncrement * @param statusIncrement
*/ */
public void setRoleTypeIncrement(Integer roleTypeIncrement){ public void setStatusIncrement(Integer statusIncrement){
this.roleTypeIncrement = roleTypeIncrement; this.statusIncrement = statusIncrement;
} }
/** /**
* 获取 角色状态(0.停用,1.启用) * 获取 角色状态(0.停用,1.启用)
* @return roleTypeList * @return statusList
*/ */
public List<Integer> getRoleTypeList(){ public List<Integer> getStatusList(){
return this.roleTypeList; return this.statusList;
} }
/** /**
* 设置 角色状态(0.停用,1.启用) * 设置 角色状态(0.停用,1.启用)
* @param roleTypeList * @param statusList
*/ */
public void setRoleTypeList(List<Integer> roleTypeList){ public void setStatusList(List<Integer> statusList){
this.roleTypeList = roleTypeList; this.statusList = statusList;
} }
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
*/ */
public String getCreateTimeStart(){ public String getCreateTimeStart(){
return this.createTimeStart; return this.createTimeStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 创建时间
* @param createTimeStart * @param createTimeStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart; this.createTimeStart = createTimeStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 创建时间
* @return createTimeEnd * @return createTimeEnd
*/ */
public String getCreateTimeEnd(){ public String getCreateTimeEnd(){
return this.createTimeEnd; return this.createTimeEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 创建时间
* @param createTimeEnd * @param createTimeEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
*/ */
public Long getCreateUserIdStart(){ public Long getCreateUserIdStart(){
return this.createUserIdStart; return this.createUserIdStart;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public void setCreateUserIdStart(Long createUserIdStart){ public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
} }
/** /**
* 获取 结束 创建用户 * 获取 结束 创建用户
* @return $createUserIdEnd * @return $createUserIdEnd
*/ */
public Long getCreateUserIdEnd(){ public Long getCreateUserIdEnd(){
return this.createUserIdEnd; return this.createUserIdEnd;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public void setCreateUserIdEnd(Long createUserIdEnd){ public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
} }
/** /**
* 获取 增加 创建用户 * 获取 增加 创建用户
* @return createUserIdIncrement * @return createUserIdIncrement
*/ */
public Long getCreateUserIdIncrement(){ public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement; return this.createUserIdIncrement;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){ public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdList * @return createUserIdList
*/ */
public List<Long> getCreateUserIdList(){ public List<Long> getCreateUserIdList(){
return this.createUserIdList; return this.createUserIdList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public void setCreateUserIdList(List<Long> createUserIdList){ public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/** /**
* 获取 创建用户名称 * 获取 创建用户名称
* @return createUserNameList * @return createUserNameList
*/ */
public List<String> getCreateUserNameList(){ public List<String> getCreateUserNameList(){
return this.createUserNameList; return this.createUserNameList;
} }
/** /**
* 设置 创建用户名称 * 设置 创建用户名称
* @param createUserNameList * @param createUserNameList
*/ */
public void setCreateUserNameList(List<String> createUserNameList){ public void setCreateUserNameList(List<String> createUserNameList){
this.createUserNameList = createUserNameList; this.createUserNameList = createUserNameList;
} }
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param id * @param id
*/ */
public RoleQuery id(Long id){ public RoleQuery id(Long id){
setId(id); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 序号,主键,自增长 * 设置 开始 序号,主键,自增长
* @param idStart * @param idStart
*/ */
public RoleQuery idStart(Long idStart){ public RoleQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 序号,主键,自增长 * 设置 结束 序号,主键,自增长
* @param idEnd * @param idEnd
*/ */
public RoleQuery idEnd(Long idEnd){ public RoleQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 序号,主键,自增长 * 设置 增加 序号,主键,自增长
* @param idIncrement * @param idIncrement
*/ */
public RoleQuery idIncrement(Long idIncrement){ public RoleQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param idList * @param idList
*/ */
public RoleQuery idList(List<Long> idList){ public RoleQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/** /**
* 设置 角色名称 * 设置 角色名称
* @param name * @param name
*/ */
public RoleQuery name(String name){ public RoleQuery name(String name){
setName(name); setName(name);
return this; return this;
} }
/** /**
* 设置 角色名称 * 设置 角色名称
* @param nameList * @param nameList
*/ */
public RoleQuery nameList(List<String> nameList){ public RoleQuery nameList(List<String> nameList){
this.nameList = nameList; this.nameList = nameList;
return this; return this;
} }
/** /**
* 设置 角色编码 * 设置 角色编码
* @param roleCode * @param roleCode
*/ */
public RoleQuery roleCode(String roleCode){ public RoleQuery roleCode(String roleCode){
setRoleCode(roleCode); setRoleCode(roleCode);
return this; return this;
} }
/** /**
* 设置 角色编码 * 设置 角色编码
* @param roleCodeList * @param roleCodeList
*/ */
public RoleQuery roleCodeList(List<String> roleCodeList){ public RoleQuery roleCodeList(List<String> roleCodeList){
this.roleCodeList = roleCodeList; this.roleCodeList = roleCodeList;
return this; return this;
} }
/** /**
* 设置 角色排序字段 * 设置 角色排序字段
* @param roleSort * @param roleSort
*/ */
public RoleQuery roleSort(Integer roleSort){ public RoleQuery roleSort(Integer roleSort){
setRoleSort(roleSort); setRoleSort(roleSort);
return this; return this;
} }
/** /**
* 设置 开始 角色排序字段 * 设置 开始 角色排序字段
* @param roleSortStart * @param roleSortStart
*/ */
public RoleQuery roleSortStart(Integer roleSortStart){ public RoleQuery roleSortStart(Integer roleSortStart){
this.roleSortStart = roleSortStart; this.roleSortStart = roleSortStart;
return this; return this;
} }
/** /**
* 设置 结束 角色排序字段 * 设置 结束 角色排序字段
* @param roleSortEnd * @param roleSortEnd
*/ */
public RoleQuery roleSortEnd(Integer roleSortEnd){ public RoleQuery roleSortEnd(Integer roleSortEnd){
this.roleSortEnd = roleSortEnd; this.roleSortEnd = roleSortEnd;
return this; return this;
} }
/** /**
* 设置 增加 角色排序字段 * 设置 增加 角色排序字段
* @param roleSortIncrement * @param roleSortIncrement
*/ */
public RoleQuery roleSortIncrement(Integer roleSortIncrement){ public RoleQuery roleSortIncrement(Integer roleSortIncrement){
this.roleSortIncrement = roleSortIncrement; this.roleSortIncrement = roleSortIncrement;
return this; return this;
} }
/** /**
* 设置 角色排序字段 * 设置 角色排序字段
* @param roleSortList * @param roleSortList
*/ */
public RoleQuery roleSortList(List<Integer> roleSortList){ public RoleQuery roleSortList(List<Integer> roleSortList){
this.roleSortList = roleSortList; this.roleSortList = roleSortList;
return this; return this;
} }
/** /**
* 设置 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色) * 设置 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)
* @param roleType * @param roleType
*/ */
public RoleQuery roleType(Integer roleType){ public RoleQuery roleType(Integer roleType){
setRoleType(roleType); setRoleType(roleType);
return this; return this;
} }
/** /**
* 设置 开始 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色) * 设置 开始 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)
* @param roleTypeStart * @param roleTypeStart
*/ */
public RoleQuery roleTypeStart(Integer roleTypeStart){ public RoleQuery roleTypeStart(Integer roleTypeStart){
this.roleTypeStart = roleTypeStart; this.roleTypeStart = roleTypeStart;
return this; return this;
} }
/** /**
* 设置 结束 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色) * 设置 结束 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)
* @param roleTypeEnd * @param roleTypeEnd
*/ */
public RoleQuery roleTypeEnd(Integer roleTypeEnd){ public RoleQuery roleTypeEnd(Integer roleTypeEnd){
this.roleTypeEnd = roleTypeEnd; this.roleTypeEnd = roleTypeEnd;
return this; return this;
} }
/** /**
* 设置 增加 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色) * 设置 增加 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)
* @param roleTypeIncrement * @param roleTypeIncrement
*/ */
public RoleQuery roleTypeIncrement(Integer roleTypeIncrement){ public RoleQuery roleTypeIncrement(Integer roleTypeIncrement){
this.roleTypeIncrement = roleTypeIncrement; this.roleTypeIncrement = roleTypeIncrement;
return this; return this;
} }
/** /**
* 设置 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色) * 设置 角色类型(0.系统内置角色,1.默认系统角色,2.普通角色)
* @param roleTypeList * @param roleTypeList
*/ */
public RoleQuery roleTypeList(List<Integer> roleTypeList){ public RoleQuery roleTypeList(List<Integer> roleTypeList){
this.roleTypeList = roleTypeList; this.roleTypeList = roleTypeList;
return this; return this;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remark * @param remark
*/ */
public RoleQuery remark(String remark){ public RoleQuery remark(String remark){
setRemark(remark); setRemark(remark);
return this; return this;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remarkList * @param remarkList
*/ */
public RoleQuery remarkList(List<String> remarkList){ public RoleQuery remarkList(List<String> remarkList){
this.remarkList = remarkList; this.remarkList = remarkList;
return this; return this;
} }
/** /**
* 设置 角色状态(0.停用,1.启用) * 设置 角色状态(0.停用,1.启用)
* @param roleType * @param status
*/ */
public RoleQuery roleType(Integer roleType){ public RoleQuery status(Integer status){
setRoleType(roleType); setStatus(status);
return this; return this;
}
/**
* 设置 开始 角色状态(0.停用,1.启用)
* @param roleTypeStart
*/
public RoleQuery roleTypeStart(Integer roleTypeStart){
this.roleTypeStart = roleTypeStart;
return this;
} }
/** /**
* 设置 结束 角色状态(0.停用,1.启用) * 设置 开始 角色状态(0.停用,1.启用)
* @param roleTypeEnd * @param statusStart
*/ */
public RoleQuery roleTypeEnd(Integer roleTypeEnd){ public RoleQuery statusStart(Integer statusStart){
this.roleTypeEnd = roleTypeEnd; this.statusStart = statusStart;
return this; return this;
} }
/** /**
* 设置 增加 角色状态(0.停用,1.启用) * 设置 结束 角色状态(0.停用,1.启用)
* @param roleTypeIncrement * @param statusEnd
*/ */
public RoleQuery roleTypeIncrement(Integer roleTypeIncrement){ public RoleQuery statusEnd(Integer statusEnd){
this.roleTypeIncrement = roleTypeIncrement; this.statusEnd = statusEnd;
return this; return this;
} }
/** /**
* 设置 角色状态(0.停用,1.启用) * 设置 增加 角色状态(0.停用,1.启用)
* @param roleTypeList * @param statusIncrement
*/ */
public RoleQuery roleTypeList(List<Integer> roleTypeList){ public RoleQuery statusIncrement(Integer statusIncrement){
this.roleTypeList = roleTypeList; this.statusIncrement = statusIncrement;
return this; return this;
} }
/**
* 设置 角色状态(0.停用,1.启用)
* @param statusList
*/
public RoleQuery statusList(List<Integer> statusList){
this.statusList = statusList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
*/ */
public RoleQuery createUserId(Long createUserId){ public RoleQuery createUserId(Long createUserId){
setCreateUserId(createUserId); setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public RoleQuery createUserIdStart(Long createUserIdStart){ public RoleQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public RoleQuery createUserIdEnd(Long createUserIdEnd){ public RoleQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public RoleQuery createUserIdIncrement(Long createUserIdIncrement){ public RoleQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public RoleQuery createUserIdList(List<Long> createUserIdList){ public RoleQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
return this; return this;
} }
/** /**
* 设置 创建用户名称 * 设置 创建用户名称
* @param createUserName * @param createUserName
*/ */
public RoleQuery createUserName(String createUserName){ public RoleQuery createUserName(String createUserName){
setCreateUserName(createUserName); setCreateUserName(createUserName);
return this; return this;
} }
/** /**
* 设置 创建用户名称 * 设置 创建用户名称
* @param createUserNameList * @param createUserNameList
*/ */
public RoleQuery createUserNameList(List<String> createUserNameList){ public RoleQuery createUserNameList(List<String> createUserNameList){
this.createUserNameList = createUserNameList; this.createUserNameList = createUserNameList;
return this; return this;
} }
/** /**
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
*/ */
public List<RoleQuery> getOrConditionList(){ public List<RoleQuery> getOrConditionList(){
return this.orConditionList; return this.orConditionList;
} }
/** /**
* 设置 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 设置 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList * @param orConditionList
*/ */
public void setOrConditionList(List<RoleQuery> orConditionList){ public void setOrConditionList(List<RoleQuery> orConditionList){
this.orConditionList = orConditionList; this.orConditionList = orConditionList;
} }
/** /**
* 获取 AND条件集合,列表项之间是AND,项内容之间是OR,如:(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 获取 AND条件集合,列表项之间是AND,项内容之间是OR,如:(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList * @return andConditionList
*/ */
public List<RoleQuery> getAndConditionList(){ public List<RoleQuery> getAndConditionList(){
return this.andConditionList; return this.andConditionList;
} }
/** /**
* 设置 AND条件集合,列表项之间是AND,项内容之间是OR,如:(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 设置 AND条件集合,列表项之间是AND,项内容之间是OR,如:(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList * @param andConditionList
*/ */
public void setAndConditionList(List<RoleQuery> andConditionList){ public void setAndConditionList(List<RoleQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.role.dao.ibatis.RoleDaoImpl"> <mapper namespace="com.mortals.xhx.module.role.dao.ibatis.RoleDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="RoleEntity" id="RoleEntity-Map"> <resultMap type="RoleEntity" id="RoleEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="name" column="name" /> <result property="name" column="name" />
<result property="roleCode" column="roleCode" /> <result property="roleCode" column="roleCode" />
<result property="roleSort" column="roleSort" /> <result property="roleSort" column="roleSort" />
<result property="roleType" column="roleType" /> <result property="roleType" column="roleType" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="roleType" column="roleType" /> <result property="status" column="status" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="createUserName" column="createUserName" /> <result property="createUserName" column="createUserName" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
a.name, a.name,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roleCode') or colPickMode == 1 and data.containsKey('roleCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roleCode') or colPickMode == 1 and data.containsKey('roleCode')))">
a.roleCode, a.roleCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roleSort') or colPickMode == 1 and data.containsKey('roleSort')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roleSort') or colPickMode == 1 and data.containsKey('roleSort')))">
a.roleSort, a.roleSort,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roleType') or colPickMode == 1 and data.containsKey('roleType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roleType') or colPickMode == 1 and data.containsKey('roleType')))">
a.roleType, a.roleType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark, a.remark,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roleType') or colPickMode == 1 and data.containsKey('roleType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.roleType, a.status,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId, a.createUserId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserName') or colPickMode == 1 and data.containsKey('createUserName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserName') or colPickMode == 1 and data.containsKey('createUserName')))">
a.createUserName, a.createUserName,
</if> </if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="RoleEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="RoleEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_role insert into mortals_xhx_role
(name,roleCode,roleSort,roleType,remark,roleType,createTime,createUserId,createUserName) (name,roleCode,roleSort,roleType,remark,status,createTime,createUserId,createUserName)
VALUES VALUES
(#{name},#{roleCode},#{roleSort},#{roleType},#{remark},#{roleType},#{createTime},#{createUserId},#{createUserName}) (#{name},#{roleCode},#{roleSort},#{roleType},#{remark},#{status},#{createTime},#{createUserId},#{createUserName})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_role insert into mortals_xhx_role
(name,roleCode,roleSort,roleType,remark,roleType,createTime,createUserId,createUserName) (name,roleCode,roleSort,roleType,remark,status,createTime,createUserId,createUserName)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.name},#{item.roleCode},#{item.roleSort},#{item.roleType},#{item.remark},#{item.roleType},#{item.createTime},#{item.createUserId},#{item.createUserName}) (#{item.name},#{item.roleCode},#{item.roleSort},#{item.roleType},#{item.remark},#{item.status},#{item.createTime},#{item.createUserId},#{item.createUserName})
</foreach> </foreach>
</insert> </insert>
...@@ -99,11 +99,11 @@ ...@@ -99,11 +99,11 @@
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))"> <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark}, a.remark=#{data.remark},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('roleType')) or (colPickMode==1 and !data.containsKey('roleType'))"> <if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
a.roleType=#{data.roleType}, a.status=#{data.status},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('roleTypeIncrement')) or (colPickMode==1 and !data.containsKey('roleTypeIncrement'))"> <if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.roleType=ifnull(a.roleType,0) + #{data.roleTypeIncrement}, a.status=ifnull(a.status,0) + #{data.statusIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime}, a.createTime=#{data.createTime},
...@@ -129,89 +129,89 @@ ...@@ -129,89 +129,89 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_xhx_role as a update mortals_xhx_role as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="name=(case" suffix="ELSE name end),"> <trim prefix="name=(case" suffix="ELSE name end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))"> <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
when a.id=#{item.id} then #{item.name} when a.id=#{item.id} then #{item.name}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="roleCode=(case" suffix="ELSE roleCode end),"> <trim prefix="roleCode=(case" suffix="ELSE roleCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('roleCode')) or (colPickMode==1 and !item.containsKey('roleCode'))"> <if test="(colPickMode==0 and item.containsKey('roleCode')) or (colPickMode==1 and !item.containsKey('roleCode'))">
when a.id=#{item.id} then #{item.roleCode} when a.id=#{item.id} then #{item.roleCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="roleSort=(case" suffix="ELSE roleSort end),"> <trim prefix="roleSort=(case" suffix="ELSE roleSort end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('roleSort')) or (colPickMode==1 and !item.containsKey('roleSort'))"> <when test="(colPickMode==0 and item.containsKey('roleSort')) or (colPickMode==1 and !item.containsKey('roleSort'))">
when a.id=#{item.id} then #{item.roleSort} when a.id=#{item.id} then #{item.roleSort}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('roleSortIncrement')) or (colPickMode==1 and !item.containsKey('roleSortIncrement'))"> <when test="(colPickMode==0 and item.containsKey('roleSortIncrement')) or (colPickMode==1 and !item.containsKey('roleSortIncrement'))">
when a.id=#{item.id} then ifnull(a.roleSort,0) + #{item.roleSortIncrement} when a.id=#{item.id} then ifnull(a.roleSort,0) + #{item.roleSortIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="roleType=(case" suffix="ELSE roleType end),"> <trim prefix="roleType=(case" suffix="ELSE roleType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('roleType')) or (colPickMode==1 and !item.containsKey('roleType'))"> <when test="(colPickMode==0 and item.containsKey('roleType')) or (colPickMode==1 and !item.containsKey('roleType'))">
when a.id=#{item.id} then #{item.roleType} when a.id=#{item.id} then #{item.roleType}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('roleTypeIncrement')) or (colPickMode==1 and !item.containsKey('roleTypeIncrement'))"> <when test="(colPickMode==0 and item.containsKey('roleTypeIncrement')) or (colPickMode==1 and !item.containsKey('roleTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.roleType,0) + #{item.roleTypeIncrement} when a.id=#{item.id} then ifnull(a.roleType,0) + #{item.roleTypeIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="remark=(case" suffix="ELSE remark end),"> <trim prefix="remark=(case" suffix="ELSE remark end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))"> <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
when a.id=#{item.id} then #{item.remark} when a.id=#{item.id} then #{item.remark}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="roleType=(case" suffix="ELSE roleType end),"> <trim prefix="status=(case" suffix="ELSE status end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('roleType')) or (colPickMode==1 and !item.containsKey('roleType'))"> <when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))">
when a.id=#{item.id} then #{item.roleType} when a.id=#{item.id} then #{item.status}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('roleTypeIncrement')) or (colPickMode==1 and !item.containsKey('roleTypeIncrement'))"> <when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))">
when a.id=#{item.id} then ifnull(a.roleType,0) + #{item.roleTypeIncrement} when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime} when a.id=#{item.id} then #{item.createTime}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))"> <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId} when a.id=#{item.id} then #{item.createUserId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement} when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createUserName=(case" suffix="ELSE createUserName end),"> <trim prefix="createUserName=(case" suffix="ELSE createUserName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createUserName')) or (colPickMode==1 and !item.containsKey('createUserName'))"> <if test="(colPickMode==0 and item.containsKey('createUserName')) or (colPickMode==1 and !item.containsKey('createUserName'))">
when a.id=#{item.id} then #{item.createUserName} when a.id=#{item.id} then #{item.createUserName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -313,249 +313,249 @@ ...@@ -313,249 +313,249 @@
${_conditionType_} a.id=#{${_conditionParam_}.id} ${_conditionType_} a.id=#{${_conditionParam_}.id}
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('id')"> <if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null "> <if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id} ${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null"> <if test="conditionParamRef.id == null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('name')"> <if test="conditionParamRef.containsKey('name')">
<if test="conditionParamRef.name != null and conditionParamRef.name != ''"> <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
${_conditionType_} a.name like #{${_conditionParam_}.name} ${_conditionType_} a.name like #{${_conditionParam_}.name}
</if>
<if test="conditionParamRef.name == null">
${_conditionType_} a.name is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('nameList')"> <if test="conditionParamRef.name == null">
${_conditionType_} a.name in ${_conditionType_} a.name is null
<foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('nameList')">
${_conditionType_} a.name in
<foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roleCode')"> <if test="conditionParamRef.containsKey('roleCode')">
<if test="conditionParamRef.roleCode != null and conditionParamRef.roleCode != ''"> <if test="conditionParamRef.roleCode != null and conditionParamRef.roleCode != ''">
${_conditionType_} a.roleCode like #{${_conditionParam_}.roleCode} ${_conditionType_} a.roleCode like #{${_conditionParam_}.roleCode}
</if>
<if test="conditionParamRef.roleCode == null">
${_conditionType_} a.roleCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('roleCodeList')">
${_conditionType_} a.roleCode in
<foreach collection="conditionParamRef.roleCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roleSort')">
<if test="conditionParamRef.roleSort != null ">
${_conditionType_} a.roleSort = #{${_conditionParam_}.roleSort}
</if>
<if test="conditionParamRef.roleSort == null">
${_conditionType_} a.roleSort is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('roleSortList')"> <if test="conditionParamRef.roleCode == null">
${_conditionType_} a.roleSort in ${_conditionType_} a.roleCode is null
<foreach collection="conditionParamRef.roleSortList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('roleSortStart') and conditionParamRef.roleSortStart != null"> </if>
${_conditionType_} a.roleSort <![CDATA[ >= ]]> #{${_conditionParam_}.roleSortStart} <if test="conditionParamRef.containsKey('roleCodeList')">
${_conditionType_} a.roleCode in
<foreach collection="conditionParamRef.roleCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roleSort')">
<if test="conditionParamRef.roleSort != null ">
${_conditionType_} a.roleSort = #{${_conditionParam_}.roleSort}
</if> </if>
<if test="conditionParamRef.containsKey('roleSortEnd') and conditionParamRef.roleSortEnd != null"> <if test="conditionParamRef.roleSort == null">
${_conditionType_} a.roleSort <![CDATA[ <= ]]> #{${_conditionParam_}.roleSortEnd} ${_conditionType_} a.roleSort is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('roleSortList')">
${_conditionType_} a.roleSort in
<foreach collection="conditionParamRef.roleSortList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roleSortStart') and conditionParamRef.roleSortStart != null">
${_conditionType_} a.roleSort <![CDATA[ >= ]]> #{${_conditionParam_}.roleSortStart}
</if>
<if test="conditionParamRef.containsKey('roleSortEnd') and conditionParamRef.roleSortEnd != null">
${_conditionType_} a.roleSort <![CDATA[ <= ]]> #{${_conditionParam_}.roleSortEnd}
</if>
<if test="conditionParamRef.containsKey('roleType')"> <if test="conditionParamRef.containsKey('roleType')">
<if test="conditionParamRef.roleType != null "> <if test="conditionParamRef.roleType != null ">
${_conditionType_} a.roleType = #{${_conditionParam_}.roleType} ${_conditionType_} a.roleType = #{${_conditionParam_}.roleType}
</if>
<if test="conditionParamRef.roleType == null">
${_conditionType_} a.roleType is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('roleTypeList')"> <if test="conditionParamRef.roleType == null">
${_conditionType_} a.roleType in ${_conditionType_} a.roleType is null
<foreach collection="conditionParamRef.roleTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roleTypeStart') and conditionParamRef.roleTypeStart != null">
${_conditionType_} a.roleType <![CDATA[ >= ]]> #{${_conditionParam_}.roleTypeStart}
</if>
<if test="conditionParamRef.containsKey('roleTypeEnd') and conditionParamRef.roleTypeEnd != null">
${_conditionType_} a.roleType <![CDATA[ <= ]]> #{${_conditionParam_}.roleTypeEnd}
</if> </if>
</if>
<if test="conditionParamRef.containsKey('roleTypeList')">
${_conditionType_} a.roleType in
<foreach collection="conditionParamRef.roleTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roleTypeStart') and conditionParamRef.roleTypeStart != null">
${_conditionType_} a.roleType <![CDATA[ >= ]]> #{${_conditionParam_}.roleTypeStart}
</if>
<if test="conditionParamRef.containsKey('roleTypeEnd') and conditionParamRef.roleTypeEnd != null">
${_conditionType_} a.roleType <![CDATA[ <= ]]> #{${_conditionParam_}.roleTypeEnd}
</if>
<if test="conditionParamRef.containsKey('remark')"> <if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''"> <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
${_conditionType_} a.remark like #{${_conditionParam_}.remark} ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</if>
<if test="conditionParamRef.remark == null">
${_conditionType_} a.remark is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('remarkList')"> <if test="conditionParamRef.remark == null">
${_conditionType_} a.remark in ${_conditionType_} a.remark is null
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('roleType')"> </if>
<if test="conditionParamRef.roleType != null "> <if test="conditionParamRef.containsKey('remarkList')">
${_conditionType_} a.roleType = #{${_conditionParam_}.roleType} ${_conditionType_} a.remark in
</if> <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.roleType == null"> #{item}
${_conditionType_} a.roleType is null </foreach>
</if> </if>
</if> <if test="conditionParamRef.containsKey('status')">
<if test="conditionParamRef.containsKey('roleTypeList')"> <if test="conditionParamRef.status != null ">
${_conditionType_} a.roleType in ${_conditionType_} a.status = #{${_conditionParam_}.status}
<foreach collection="conditionParamRef.roleTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roleTypeStart') and conditionParamRef.roleTypeStart != null">
${_conditionType_} a.roleType <![CDATA[ >= ]]> #{${_conditionParam_}.roleTypeStart}
</if> </if>
<if test="conditionParamRef.containsKey('roleTypeEnd') and conditionParamRef.roleTypeEnd != null"> <if test="conditionParamRef.status == null">
${_conditionType_} a.roleType <![CDATA[ <= ]]> #{${_conditionParam_}.roleTypeEnd} ${_conditionType_} a.status is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('statusList')">
${_conditionType_} a.status in
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
</if>
<if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null">
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.createTime == null">
${_conditionType_} a.createUserId in ${_conditionType_} a.createTime is null
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> </if>
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null"> <if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd} ${_conditionType_} a.createUserId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList')">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('createUserName')"> <if test="conditionParamRef.containsKey('createUserName')">
<if test="conditionParamRef.createUserName != null and conditionParamRef.createUserName != ''"> <if test="conditionParamRef.createUserName != null and conditionParamRef.createUserName != ''">
${_conditionType_} a.createUserName like #{${_conditionParam_}.createUserName} ${_conditionType_} a.createUserName like #{${_conditionParam_}.createUserName}
</if>
<if test="conditionParamRef.createUserName == null">
${_conditionType_} a.createUserName is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserNameList')"> <if test="conditionParamRef.createUserName == null">
${_conditionType_} a.createUserName in ${_conditionType_} a.createUserName is null
<foreach collection="conditionParamRef.createUserNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('createUserNameList')">
${_conditionType_} a.createUserName in
<foreach collection="conditionParamRef.createUserNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} ${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if> <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('name')"> <if test="orderCol.containsKey('name')">
a.name a.name
<if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if> <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('roleCode')"> <if test="orderCol.containsKey('roleCode')">
a.roleCode a.roleCode
<if test='orderCol.roleCode != null and "DESC".equalsIgnoreCase(orderCol.roleCode)'>DESC</if> <if test='orderCol.roleCode != null and "DESC".equalsIgnoreCase(orderCol.roleCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('roleSort')"> <if test="orderCol.containsKey('roleSort')">
a.roleSort a.roleSort
<if test='orderCol.roleSort != null and "DESC".equalsIgnoreCase(orderCol.roleSort)'>DESC</if> <if test='orderCol.roleSort != null and "DESC".equalsIgnoreCase(orderCol.roleSort)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('roleType')"> <if test="orderCol.containsKey('roleType')">
a.roleType a.roleType
<if test='orderCol.roleType != null and "DESC".equalsIgnoreCase(orderCol.roleType)'>DESC</if> <if test='orderCol.roleType != null and "DESC".equalsIgnoreCase(orderCol.roleType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('remark')"> <if test="orderCol.containsKey('remark')">
a.remark a.remark
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if> <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('roleType')"> <if test="orderCol.containsKey('status')">
a.roleType a.status
<if test='orderCol.roleType != null and "DESC".equalsIgnoreCase(orderCol.roleType)'>DESC</if> <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('createUserId')">
a.createUserId a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserName')"> <if test="orderCol.containsKey('createUserName')">
a.createUserName a.createUserName
<if test='orderCol.createUserName != null and "DESC".equalsIgnoreCase(orderCol.createUserName)'>DESC</if> <if test='orderCol.createUserName != null and "DESC".equalsIgnoreCase(orderCol.createUserName)'>DESC</if>
, ,
</if> </if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
...@@ -5,8 +5,8 @@ Authorization: {{authToken}} ...@@ -5,8 +5,8 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"page":1, "page":1,
"size":10 "size":10
} }
...@@ -16,13 +16,13 @@ Authorization: {{authToken}} ...@@ -16,13 +16,13 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"name":"e9e4uu", "name":"9h8jlh",
"roleCode":"tzulbs", "roleCode":"beliak",
"roleSort":0, "roleSort":0,
"roleType":2, "roleType":2,
"remark":"4345a1", "remark":"66tnax",
"roleType":0, "status":0,
"createUserName":"78k9cx" "createUserName":"6qo3fj"
} }
> {% > {%
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment