diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/form/PsychologyAnswerFormDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/form/PsychologyAnswerFormDTO.java index 2de267c..2425c97 100644 --- a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/form/PsychologyAnswerFormDTO.java +++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/form/PsychologyAnswerFormDTO.java @@ -49,16 +49,17 @@ public class PsychologyAnswerFormDTO implements Serializable { * 页码 */ @NotBlank(message = "页码不能为空") - private String pageIndex; + private Integer pageIndex; /** * 页容量 */ @NotBlank(message = "页容量不能为空") - private String pageSize; + private Integer pageSize; /** * 第一页查询发起时的时间 */ private String timestamp; + } \ No newline at end of file diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/form/PsychologyUnansweredFormDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/form/PsychologyUnansweredFormDTO.java new file mode 100644 index 0000000..c9fc62e --- /dev/null +++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/form/PsychologyUnansweredFormDTO.java @@ -0,0 +1,70 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.psychology.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +/** + * 心理问题答复表 + * + * @author zhangyuan qu@elink-cn.com + * @since v1.0.0 2020-06-08 + */ +@Data +public class PsychologyUnansweredFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 网格ID + */ + private Long gridId; + + /** + * 用户ID + */ + private String userId; + + /** + * 页码 + */ + @NotBlank(message = "页码不能为空") + private Integer pageIndex; + + /** + * 页容量 + */ + @NotBlank(message = "页容量不能为空") + private Integer pageSize; + + /** + * 第一页查询发起时的时间 + */ + private String timestamp; + + /** + * 是否已指定咨询师 0否 1是 。传0查询公共问题 + */ + @NotBlank(message = "问题类型不能为空") + private String designated_flag; + +} \ No newline at end of file diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/result/PsychologyUnansweredResultDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/result/PsychologyUnansweredResultDTO.java new file mode 100644 index 0000000..0513e8a --- /dev/null +++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/psychology/result/PsychologyUnansweredResultDTO.java @@ -0,0 +1,92 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.psychology.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 心理问题答复表 + * + * @author zhangyuan qu@elink-cn.com + * @since v1.0.0 2020-06-08 + */ +@Data +public class PsychologyUnansweredResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 问题id + */ + private String questionId; + + /** + * 咨询师id(被绑定的管理端用户id) + */ + private String psychologistId; + + /** + * 咨询师名称 + */ + private String psychologistName; + + /** + * 回复问题的内容 + */ + private String answerContent; + + /** + * 删除标记 0:未删除,1:已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file