调整

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/user/AccountInfoPageRequest.java

@@ -0,0 +1,52 @@
+package cn.com.taiji.core.repo.request.user;
+
+import cn.com.taiji.common.pub.dao.HqlBuilder;
+import cn.com.taiji.common.repo.request.jpa.JpaDateTimePageableDataRequest;
+import cn.com.taiji.core.entity.dict.msgw.MessageType;
+import cn.com.taiji.core.entity.user.AccountInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AccountInfoPageRequest extends JpaDateTimePageableDataRequest<AccountInfo>{
+
+	private String mobile;// 手机号
+	private String userName;// 用户姓名/企业名称
+	private MessageType type;// 消息类型
+
+	public AccountInfoPageRequest() {
+		this.orderBy="id";
+		this.desc=true;
+	}
+
+	@Override
+	public HqlBuilder toSelectHql(){
+		HqlBuilder hql = new HqlBuilder("from AccountInfo where 1=1 ");
+		hql.append(" and mobile=:mobile", mobile);
+		hql.append(" and userName=:userName", userName);
+		if (type != null) {
+			// APP
+			if (MessageType.APP.equals(type)) {
+				hql.append(" and registrationId is not null");
+			}
+			//微信公众号
+			else if (MessageType.OFFICIAL_ACCOUNTS.equals(type)) {
+				hql.append(" and mpOpenid is not null");
+			}
+			//微信小程序
+			else if (MessageType.MINI_PROGRAM.equals(type)) {
+				hql.append(" and wxOpenid is not null");
+			}
+			//短信
+			else if (MessageType.SHORT.equals(type)) {
+			}
+		}
+		return hql;
+	}
+
+
+
+
+
+}

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/user/StaffPageRequest.java

@@ -0,0 +1,33 @@
+package cn.com.taiji.core.repo.request.user;
+
+import cn.com.taiji.common.pub.dao.HqlBuilder;
+import cn.com.taiji.common.repo.request.jpa.JpaDateTimePageableDataRequest;
+import cn.com.taiji.core.entity.user.Staff;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class StaffPageRequest extends JpaDateTimePageableDataRequest<Staff>{
+
+	private String mobile;// 手机号
+	private String userName;// 用户姓名/企业名称
+
+	public StaffPageRequest() {
+		this.orderBy="id";
+		this.desc=true;
+	}
+
+	@Override
+	public HqlBuilder toSelectHql(){
+		HqlBuilder hql = new HqlBuilder("from Staff where 1=1 ");
+		hql.append(" and mobile=:mobile", mobile);
+		hql.append(" and userName=:userName", userName);
+		return hql;
+	}
+
+
+
+
+
+}