Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
be7f8631
Commit
be7f8631
authored
Jul 15, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加窗口负责人管理窗口数量
parent
601edae4
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
258 additions
and
179 deletions
+258
-179
attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java
...va/com/mortals/xhx/base/system/user/model/UserEntity.java
+11
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserQuery.java
...ava/com/mortals/xhx/base/system/user/model/UserQuery.java
+27
-0
attendance-performance-manager/src/main/resources/sqlmap/base/system/user.xml
...ce-manager/src/main/resources/sqlmap/base/system/user.xml
+218
-178
db/add.sql
db/add.sql
+2
-1
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java
View file @
be7f8631
...
...
@@ -91,7 +91,18 @@ public class UserEntity extends UserVo implements IUser {
*/
private
Long
customerId
;
/**
* 钉钉userId
*/
private
String
dingUserId
;
public
String
getDingUserId
()
{
return
dingUserId
;
}
public
void
setDingUserId
(
String
dingUserId
)
{
this
.
dingUserId
=
dingUserId
;
}
public
UserEntity
(){}
/**
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserQuery.java
View file @
be7f8631
...
...
@@ -162,6 +162,14 @@ public class UserQuery extends UserEntity {
/** 最后一次登录地址排除列表 */
private
List
<
String
>
lastLoginAddressNotList
;
/** 钉钉userId */
private
List
<
String
>
dingUserIdList
;
/** 钉钉userId排除列表 */
private
List
<
String
>
dingUserIdNotList
;
/** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private
List
<
UserQuery
>
orConditionList
;
...
...
@@ -1606,4 +1614,23 @@ public class UserQuery extends UserEntity {
this
.
andConditionList
=
andConditionList
;
}
/**
* 设置 钉钉userId
* @param dingUserId
*/
public
UserQuery
dingUserId
(
String
dingUserId
){
setDingUserId
(
dingUserId
);
return
this
;
}
/**
* 设置 钉钉userId
* @param dingUserIdList
*/
public
UserQuery
dingUserIdList
(
List
<
String
>
dingUserIdList
){
this
.
dingUserIdList
=
dingUserIdList
;
return
this
;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/resources/sqlmap/base/system/user.xml
View file @
be7f8631
This diff is collapsed.
Click to expand it.
db/add.sql
View file @
be7f8631
...
...
@@ -647,6 +647,7 @@ PRIMARY KEY (`id`)
-- ----------------------------
ALTER
TABLE
mortals_xhx_perform_attend_appeal
ADD
COLUMN
`deductPerson`
varchar
(
128
)
COMMENT
'扣分人员'
AFTER
subMethod
;
ALTER
TABLE
mortals_xhx_perform_attend_appeal
ADD
COLUMN
`deductPerson`
varchar
(
128
)
DEFAULT
''
COMMENT
'扣分人员'
AFTER
subMethod
;
ALTER
TABLE
mortals_xhx_perform_attend_appeal
ADD
COLUMN
`deductTime`
datetime
COMMENT
'扣分时间'
AFTER
deductPerson
;
ALTER
TABLE
mortals_xhx_user
ADD
COLUMN
`dingUserId`
varchar
(
64
)
DEFAULT
''
COMMENT
'钉钉userId'
AFTER
customerId
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment