forked from luyan/epmet-cloud-lingshan
				
			
			
			
				Browse Source
			
			
			
			
				
		Conflicts: epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.javamaster
				 28 changed files with 391 additions and 168 deletions
			
			
		| @ -0,0 +1,32 @@ | |||
| package com.epmet.dto.result; | |||
| 
 | |||
| import lombok.Data; | |||
| 
 | |||
| import java.io.Serializable; | |||
| 
 | |||
| /** | |||
|  * desc:客户下网格工作人员结果 | |||
|  * @Author zxc | |||
|  * @DateTime 2021/6/8 3:23 下午 | |||
|  * @DESC | |||
|  */ | |||
| @Data | |||
| public class CustomerGridStaffResultDTO implements Serializable { | |||
| 
 | |||
|     private static final long serialVersionUID = -5910427385795368242L; | |||
| 
 | |||
|     private String userId; | |||
| 
 | |||
|     private String userName; | |||
| 
 | |||
|     private String mobile; | |||
| 
 | |||
|     private Integer gender; | |||
| 
 | |||
|     private String gridId; | |||
| 
 | |||
|     private String gridName; | |||
| 
 | |||
|     private String agencyId; | |||
| 
 | |||
| } | |||
| @ -0,0 +1,32 @@ | |||
| package com.epmet.dto.result; | |||
| 
 | |||
| import lombok.Data; | |||
| 
 | |||
| import java.io.Serializable; | |||
| 
 | |||
| /** | |||
|  * @author 在网格中的工作人员 | |||
|  * @dscription | |||
|  * @date 2020/4/23 16:08 | |||
|  */ | |||
| @Data | |||
| public class CustomerStaffGridResultDTO implements Serializable { | |||
| 	private static final long serialVersionUID = 1301415104939403933L; | |||
| 	/** | |||
| 	 * 用户ID | |||
| 	 */ | |||
| 	private String userId; | |||
| 	/** | |||
| 	 * 网格Id | |||
| 	 */ | |||
| 	private String gridId; | |||
| 	/** | |||
| 	 * 网格名称 | |||
| 	 */ | |||
| 	private String gridName; | |||
| 	/** | |||
| 	 * 组织Id | |||
| 	 */ | |||
| 	private String agencyId; | |||
| 
 | |||
| } | |||
| @ -0,0 +1,13 @@ | |||
| package com.epmet.dto.result; | |||
| 
 | |||
| import lombok.Data; | |||
| 
 | |||
| import java.io.Serializable; | |||
| 
 | |||
| 
 | |||
| @Data | |||
| public class SubTableJoinDTO implements Serializable { | |||
|     private static final long serialVersionUID = 8243764437194993736L; | |||
|     private String tableName; | |||
|     private String joinTableSql; | |||
| } | |||
| @ -0,0 +1,56 @@ | |||
| package com.epmet.dto.form; | |||
| 
 | |||
| import com.epmet.commons.tools.dto.form.PageFormDTO; | |||
| import com.epmet.commons.tools.validator.group.DefaultGroup; | |||
| import lombok.Data; | |||
| 
 | |||
| import javax.validation.constraints.NotBlank; | |||
| import javax.validation.constraints.NotEmpty; | |||
| import java.util.List; | |||
| 
 | |||
| /** | |||
|  * DESC:网格下的工作人员 查询 | |||
|  * @author liujianjun | |||
|  */ | |||
| @Data | |||
| public class GridStaffFormDTO extends PageFormDTO { | |||
| 
 | |||
|     /** | |||
|      * 客户Id | |||
|      */ | |||
|     @NotBlank(message = "客户Id不能为空", groups = {DefaultGroup.class}) | |||
|     private String customerId; | |||
| 
 | |||
|     /** | |||
|      * 工作人员Id | |||
|      */ | |||
|     private String userId; | |||
| 
 | |||
|     /** | |||
|      * 工作人员姓名 | |||
|      */ | |||
|     private String userName; | |||
| 
 | |||
|     /** | |||
|      * 手机号 | |||
|      */ | |||
|     private String mobile; | |||
| 
 | |||
|     /** | |||
|      * 角色key | |||
|      */ | |||
|     @NotEmpty(message = "角色Key不能为空", groups = {DefaultGroup.class}) | |||
|     private List<String> roleKeyList; | |||
| 
 | |||
|     /** | |||
|      * 组织ID | |||
|      */ | |||
|     @NotBlank(message = "组织ID不能为空", groups = {DefaultGroup.class}) | |||
|     private String orgId; | |||
| 
 | |||
|     /** | |||
|      * 组织类型 agency or grid | |||
|      */ | |||
|     @NotBlank(message = "组织类型不能为空", groups = {DefaultGroup.class}) | |||
|     private String orgType; | |||
| } | |||
					Loading…
					
					
				
		Reference in new issue