From 4d5eff3b824dac8e50400b2ec1114cba4ed6a87c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 07 Apr 2021 17:05:43 +0800
Subject: [PATCH] screen-manage 完成sysarea模块查询 拦截器逻辑代码完成 修改organization和accountBug
---
screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationQueryForm.java | 64 ++++++++++----------------------
1 files changed, 20 insertions(+), 44 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationQueryForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationQueryForm.java
index 9151342..242f5be 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationQueryForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationQueryForm.java
@@ -1,14 +1,16 @@
package com.moral.api.pojo.form.organization;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.moral.api.entity.Organization;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.constant.ResponseCodeEnum;
-import com.moral.util.DateUtils;
import com.moral.util.RegexUtils;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.util.ObjectUtils;
import java.util.Date;
+
/**
* @ClassName OrganizationQueryForm
@@ -18,7 +20,7 @@
* @Version TODO
**/
@Data
-public class OrganizationQueryForm {
+public class OrganizationQueryForm {
private Integer page;
@@ -34,10 +36,6 @@
private Integer areaCode;
- private Long townCode;
-
- private Long villageCode;
-
private String phone;
private String email;
@@ -45,6 +43,22 @@
private String wechat;
private String isDelete;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date createStartTime;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date createEndTime;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date expireStartTime;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date expireEndTime;
private String order;
@@ -59,43 +73,5 @@
return true;
}
- public OrganizationDTO paramValid() {
- OrganizationDTO dto = new OrganizationDTO();
- //���������������������������������
- if (!ObjectUtils.isEmpty(phone)) {
- if (!RegexUtils.checkMobile(phone) && !RegexUtils.checkPhone(phone)) {
- dto.setCode(ResponseCodeEnum.PHONE_INVALID.getCode());
- dto.setMsg(ResponseCodeEnum.PHONE_INVALID.getMsg());
- return dto;
- }
- }
- //������������������������������
- if (!ObjectUtils.isEmpty(email)) {
- if (!RegexUtils.checkEmail(email)) {
- dto.setCode(ResponseCodeEnum.EMAIL_INVALID.getCode());
- dto.setMsg(ResponseCodeEnum.EMAIL_INVALID.getMsg());
- return dto;
- }
- }
- dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
- dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
- return dto;
- }
-
- public Organization formConvertEntity() {
- Organization organization = new Organization();
- organization.setParentId(parentId);
- organization.setName(name);
- organization.setProvinceCode(provinceCode);
- organization.setCityCode(cityCode);
- organization.setAreaCode(areaCode);
- organization.setTownCode(townCode);
- organization.setVillageCode(villageCode);
- organization.setPhone(phone);
- organization.setEmail(email);
- organization.setWechat(wechat);
- organization.setIsDelete(isDelete);
- return organization;
- }
}
--
Gitblit v1.8.0