12 changed files with 407 additions and 16 deletions
@ -0,0 +1,113 @@ |
|||
package com.epmet.dto.form.demand; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
import org.springframework.format.annotation.DateTimeFormat; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import javax.validation.constraints.NotNull; |
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
@Data |
|||
public class DemandAddFromDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1589287946950749226L; |
|||
|
|||
public interface AddUserInternalGroup { |
|||
} |
|||
|
|||
public interface AddUserShowGroup extends CustomerClientShowGroup { |
|||
} |
|||
|
|||
private String customerId; |
|||
private String currentUserId; |
|||
|
|||
|
|||
/** |
|||
* 网格id |
|||
*/ |
|||
@NotBlank(message = "所属网格不能为空",groups = AddUserShowGroup.class) |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 组织id |
|||
*/ |
|||
private String agencyId; |
|||
|
|||
/** |
|||
* 网格的所有上级id |
|||
*/ |
|||
private String gridPids; |
|||
|
|||
|
|||
|
|||
|
|||
/** |
|||
* 二级需求分类编码 |
|||
*/ |
|||
@NotBlank(message = "需求类型不能为空",groups = AddUserShowGroup.class) |
|||
private String categoryCode; |
|||
|
|||
/** |
|||
* 父级需求分类编码 |
|||
*/ |
|||
@NotBlank(message = "需求类型不能为空",groups = AddUserShowGroup.class) |
|||
private String parentCode; |
|||
|
|||
/** |
|||
* 需求内容1000字 |
|||
*/ |
|||
@NotBlank(message = "需求类型不能为空",groups = AddUserShowGroup.class) |
|||
private String content; |
|||
|
|||
/** |
|||
* 社区帮办:community;楼长帮办:building_caption;党员帮办:party;自身上报:self_help |
|||
*/ |
|||
@NotBlank(message = "上报类型不能为空",groups = AddUserShowGroup.class) |
|||
private String reportType; |
|||
|
|||
/** |
|||
* 上报人姓名 |
|||
*/ |
|||
@NotBlank(message = "上报人不能为空",groups = AddUserShowGroup.class) |
|||
private String reportUserName; |
|||
|
|||
/** |
|||
* 上报人联系方式。自身上报时存储注册居民的手机号 |
|||
*/ |
|||
@NotBlank(message = "上报人联系方式不能为空",groups = AddUserShowGroup.class) |
|||
private String reportUserMobile; |
|||
|
|||
/** |
|||
* 上报时间 |
|||
*/ |
|||
@NotNull(message = "上报时间不能为空",groups = AddUserShowGroup.class) |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
private Date reportTime; |
|||
|
|||
/** |
|||
* 需求人:user.id或者ic_resi_user.id |
|||
*/ |
|||
@NotNull(message = "需求人不能为空",groups = AddUserShowGroup.class) |
|||
private String demandUserId; |
|||
|
|||
/** |
|||
* 需求人姓名 |
|||
*/ |
|||
@NotNull(message = "需求人不能为空",groups = AddUserShowGroup.class) |
|||
private String demandUserName; |
|||
|
|||
/** |
|||
* 需求人联系电话 |
|||
*/ |
|||
@NotNull(message = "需求人不能为空",groups = AddUserShowGroup.class) |
|||
private String demandUserMobile; |
|||
|
|||
/** |
|||
* 希望服务时间 |
|||
*/ |
|||
@NotNull(message = "服务时间不能为空",groups = AddUserShowGroup.class) |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
private Date wantServiceTime; |
|||
} |
@ -0,0 +1,10 @@ |
|||
package com.epmet.dto.form.demand; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
@Data |
|||
public class DemandRecId implements Serializable { |
|||
private String demandRecId; |
|||
} |
@ -0,0 +1,78 @@ |
|||
package com.epmet.dto.form.demand; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
@Data |
|||
public class UserDemandPageFormDTO extends PageFormDTO implements Serializable { |
|||
|
|||
private String customerId; |
|||
private String currentStaffId; |
|||
private String gridPids; |
|||
|
|||
|
|||
/** |
|||
* 网格id |
|||
*/ |
|||
private String gridId; |
|||
|
|||
|
|||
|
|||
/** |
|||
* 分类的编码 |
|||
*/ |
|||
private String categoryCode; |
|||
|
|||
/** |
|||
* 分类的级别 |
|||
*/ |
|||
private Integer level; |
|||
|
|||
|
|||
|
|||
/** |
|||
* 需求人姓名 |
|||
*/ |
|||
private String demandUserName; |
|||
|
|||
/** |
|||
* 上报时间开始 |
|||
*/ |
|||
private Date reportStartTime; |
|||
|
|||
/** |
|||
* 上报时间截止 |
|||
*/ |
|||
private Date reportEndTime; |
|||
|
|||
/** |
|||
* 待处理:pending;已取消canceled;已派单:assigned;已接单:have_order;已完成:finished |
|||
*/ |
|||
private String status; |
|||
|
|||
|
|||
|
|||
|
|||
/** |
|||
* 服务方类型:志愿者:volunteer;社会组织:social_org;社区自组织:community_org;区域党建单位:party_unit; |
|||
*/ |
|||
private String serviceType; |
|||
|
|||
/** |
|||
* 服务方id |
|||
*/ |
|||
private String serverId; |
|||
|
|||
/** |
|||
* 希望服务时间开始 |
|||
*/ |
|||
private Date wantServiceStartTime; |
|||
|
|||
/** |
|||
* 希望截止 |
|||
*/ |
|||
private Date wantServiceEndTime; |
|||
} |
@ -0,0 +1,44 @@ |
|||
package com.epmet.dto.result.demand; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
|
|||
@Data |
|||
public class DemandRecResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 1140730681599839420L; |
|||
|
|||
private String demandRecId; |
|||
@JsonIgnore |
|||
private String gridId; |
|||
private String gridName; |
|||
|
|||
@JsonIgnore |
|||
private String categoryCode; |
|||
@JsonIgnore |
|||
private String parentCode; |
|||
private String categoryName; |
|||
private String content; |
|||
private String reportType; |
|||
private String reportUserName; |
|||
|
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date reportTime; |
|||
|
|||
private String demandUserName; |
|||
|
|||
@JsonIgnore |
|||
private String serviceType; |
|||
@JsonIgnore |
|||
private String serverId; |
|||
|
|||
private String serviceName; |
|||
|
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private String wantServiceTime; |
|||
private String status; |
|||
} |
@ -0,0 +1,38 @@ |
|||
package com.epmet.constant; |
|||
|
|||
public interface UserDemandConstant { |
|||
|
|||
|
|||
/** |
|||
* 小程序用户自己上报:mini_resi;居民信息录入的居民:ic_resi_user |
|||
*/ |
|||
String MINI_RESI = "mini_resi"; |
|||
String IC_RESI_USER = "ic_resi_user"; |
|||
|
|||
/** |
|||
* 待处理:pending;已取消canceled;已派单:assigned;已接单:have_order;已完成:finished |
|||
*/ |
|||
String PENDING = "pending"; |
|||
String CANCELED = "canceled"; |
|||
String ASSIGNED = "assigned"; |
|||
String HAVE_ORDER = "have_order"; |
|||
String FINISHED = "finished"; |
|||
|
|||
|
|||
|
|||
/** |
|||
* 当前操作用户属于哪个端?工作端:staff;居民端:resi |
|||
*/ |
|||
String STAFF="staff"; |
|||
String RESI="resi"; |
|||
|
|||
|
|||
/** |
|||
* 创建需求:create;撤销需求:cancel;指派:assign;接单:take_order;完成:finish;; |
|||
*/ |
|||
String CREATE="create"; |
|||
String CANCEL="cancel"; |
|||
String ASSIGN="assign"; |
|||
String TAKE_ORDER="take_order"; |
|||
String FINISH="finish"; |
|||
} |
Loading…
Reference in new issue