forked from rongchao/epmet-cloud-rizhao
Browse Source
# Conflicts: # epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java # epmet-user/epmet-user-server/src/main/resources/bootstrap.ymldev
yinzuomei
5 years ago
28 changed files with 427 additions and 28 deletions
@ -0,0 +1,27 @@ |
|||
package com.epmet.commons.tools.dto.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotNull; |
|||
|
|||
/** |
|||
* 分页通用类 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/11/20 17:02 |
|||
*/ |
|||
@Data |
|||
public class PageFormDTO { |
|||
public interface AddUserInternalGroup { |
|||
} |
|||
|
|||
public interface AddUserShowGroup extends CustomerClientShowGroup { |
|||
} |
|||
|
|||
@NotNull(message = "页码不能为空", groups = AddUserInternalGroup.class) |
|||
private Integer pageNo; |
|||
|
|||
@NotNull(message = "每页数量不能为空", groups = AddUserInternalGroup.class) |
|||
private Integer pageSize; |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 用户发起的议题列表-审核中列表 入参 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/11/23 9:05 |
|||
*/ |
|||
@Data |
|||
public class UserPubAuditingIssueFormDTO extends PageFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 6520349189385929988L; |
|||
@NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class) |
|||
private String userId; |
|||
} |
|||
@ -0,0 +1,62 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 用户发起的议题列表-审核中列表 返参 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/11/20 16:23 |
|||
*/ |
|||
@Data |
|||
public class UserPubAuditingIssueResDTO implements Serializable { |
|||
private static final long serialVersionUID = -6452959808958252729L; |
|||
|
|||
/** |
|||
* 申请id |
|||
*/ |
|||
private String issueApplicationId; |
|||
|
|||
/** |
|||
* under_auditing:待审核; rejected:驳回 |
|||
*/ |
|||
private String applyStatus; |
|||
|
|||
/** |
|||
* 议题标题 |
|||
*/ |
|||
private String issueTitle; |
|||
|
|||
/** |
|||
* 转议题时输入的建议 |
|||
*/ |
|||
private String issueSuggestion; |
|||
|
|||
/** |
|||
* 网格名称： 组织-网格 |
|||
*/ |
|||
private String gridName; |
|||
|
|||
/** |
|||
* 小组名称 |
|||
*/ |
|||
private String groupName; |
|||
|
|||
/** |
|||
* 发起时间戳 |
|||
*/ |
|||
private Long publishTime; |
|||
|
|||
|
|||
/** |
|||
* 网格id |
|||
*/ |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 小组id |
|||
*/ |
|||
private String groupId; |
|||
} |
|||
@ -0,0 +1,2 @@ |
|||
ALTER TABLE issue_application MODIFY APPLY_STATUS VARCHAR(32) NOT NULL comment '审核状态：under_auditing:待审核；approved:通过；rejected:驳回;自动通过：auto_passed'; |
|||
alter table issue_application_history modify ACTION_TYPE varchar(32) not null comment 'under_auditing:提交审核；approved:审核通过，rejected:驳回;auto_passed:自动通过'; |
|||
@ -0,0 +1,51 @@ |
|||
package com.epmet.resi.mine.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 个人中心-我发起的议题列表-审核中列表 返给前端DTO |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/11/23 10:36 |
|||
*/ |
|||
@Data |
|||
public class UserPubAuditingIssueResultDTO implements Serializable { |
|||
private static final long serialVersionUID = -7083622810147837717L; |
|||
/** |
|||
* 申请id |
|||
*/ |
|||
private String issueApplicationId; |
|||
|
|||
/** |
|||
* under_auditing:待审核; rejected:驳回 |
|||
*/ |
|||
private String applyStatus; |
|||
|
|||
/** |
|||
* 议题标题 |
|||
*/ |
|||
private String issueTitle; |
|||
|
|||
/** |
|||
* 转议题时输入的建议 |
|||
*/ |
|||
private String issueSuggestion; |
|||
|
|||
/** |
|||
* 网格名称： 组织-网格 |
|||
*/ |
|||
private String gridName; |
|||
|
|||
/** |
|||
* 小组名称 |
|||
*/ |
|||
private String groupName; |
|||
|
|||
/** |
|||
* 发起时间戳 |
|||
*/ |
|||
private Long publishTime; |
|||
|
|||
} |
|||
Loading…
Reference in new issue