BJ_FS / urbanops

Commit 22e886cbf23ffa110a20eefcb42c2ac6f66c8d05

Authored by 戈灵虎
2 parents bd5bfe97 863b7623

Merge remote-tracking branch 'origin/dev' into dev

Inline Side-by-side
Showing 5 changed files with 43 additions and 0 deletions
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserPageReqVO.java
  View file @22e886c
... ... @@ -41,4 +41,10 @@ public class UserPageReqVO extends PageParam {
41 41 @Schema(description = "业务线：yl-园林；wy-物业；sz-市政", example = "yl")
42 42 private String busiLine;
43 43  
  44 + /**
  45 + * 是否是内部员工 是否内部员工 1:是；2否
  46 + */
  47 + @Schema(description = "是否是内部员工 1:是；2否", example = "1")
  48 + private Integer isInner;
  49 +
44 50 }
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserRespVO.java
  View file @22e886c
... ... @@ -74,4 +74,16 @@ public class UserRespVO{
74 74 private LocalDateTime createTime;
75 75 @Schema(description = "业务线：yl-园林；wy-物业；sz-市政", example = "yl")
76 76 private String busiLine;
  77 +
  78 + /**
  79 + * 是否是内部员工 是否内部员工 1:是；2否
  80 + */
  81 + @Schema(description = "是否是内部员工 是否内部员工 1:是；2否", example = "时间戳格式")
  82 + private Integer isInner;
  83 +
  84 + /**
  85 + * 供应商编码
  86 + */
  87 + @Schema(description = "供应商编码", example = "供应商编码")
  88 + private String supplierCode;
77 89 }
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
  View file @22e886c
... ... @@ -80,4 +80,16 @@ public class UserSaveReqVO {
80 80 @DiffLogField(name = "业务线")
81 81 @NotNull(message = "业务线不能为空")
82 82 private String busiLine;
  83 +
  84 + /**
  85 + * 是否是内部员工 是否内部员工 1:是；2否
  86 + */
  87 + @Schema(description = "是否是内部员工 1:是；2否", example = "1")
  88 + private Integer isInner;
  89 +
  90 + /**
  91 + * 供应商编码
  92 + */
  93 + @Schema(description = "供应商编码", example = "1")
  94 + private String supplierCode;
83 95 }
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/dal/dataobject/user/AdminUserDO.java
  View file @22e886c
... ... @@ -105,4 +105,16 @@ public class AdminUserDO extends TenantBaseDO {
105 105 */
106 106 private LocalDateTime loginDate;
107 107  
  108 + /**
  109 + * 是否是内部员工 是否内部员工 1:是；2否
  110 + */
  111 + private Integer isInner;
  112 +
  113 + /**
  114 + * 供应商编码
  115 + */
  116 + private String supplierCode;
  117 +
  118 +
  119 +
108 120 }
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/dal/mysql/user/AdminUserMapper.java
  View file @22e886c
... ... @@ -33,6 +33,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
33 33 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
34 34 .inIfPresent(AdminUserDO::getDeptId, deptIds)
35 35 .inIfPresent(AdminUserDO::getId, userIds)
  36 + .eqIfPresent(AdminUserDO::getIsInner, reqVO.getIsInner())
36 37 .orderByDesc(AdminUserDO::getId));
37 38 }
38 39  
... ...