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
415c5c9c
Commit
415c5c9c
authored
Apr 14, 2023
by
daijunxiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增员工信息字段---同时修改同步任务员工信息存储
parent
5f575e90
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
287 additions
and
50 deletions
+287
-50
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
...in/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
+4
-2
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffEntity.java
.../java/com/mortals/xhx/module/staff/model/StaffEntity.java
+44
-2
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffQuery.java
...n/java/com/mortals/xhx/module/staff/model/StaffQuery.java
+113
-1
attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffMapper.xml
...er/src/main/resources/sqlmap/module/staff/StaffMapper.xml
+124
-45
db/module.sql
db/module.sql
+2
-0
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
View file @
415c5c9c
...
...
@@ -104,7 +104,8 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
}
staffEntity1
.
setName
(
list
.
getPersonName
());
staffEntity1
.
setRemarkId
(
list
.
getPersonId
());
staffEntity1
.
setPhotoPath
(
list
.
getPersonPhoto
().
getPicUri
());
staffEntity1
.
setPicUri
(
list
.
getPersonPhoto
().
getPicUri
());
staffEntity1
.
setServerIndexCode
(
list
.
getPersonPhoto
().
getServerIndexCode
());
staffEntity1
.
setDeptName
(
list
.
getOrgName
());
staffEntity1
.
setSource
(
1
);
staffEntity1
.
setStatus
(
1
);
...
...
@@ -145,7 +146,8 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
}
staffEntity1
.
setName
(
list
.
getPersonName
());
staffEntity1
.
setRemarkId
(
list
.
getPersonId
());
staffEntity1
.
setPhotoPath
(
list
.
getPersonPhoto
().
getPicUri
());
staffEntity1
.
setPicUri
(
list
.
getPersonPhoto
().
getPicUri
());
staffEntity1
.
setServerIndexCode
(
list
.
getPersonPhoto
().
getServerIndexCode
());
staffEntity1
.
setDeptName
(
list
.
getOrgName
());
staffEntity1
.
setGender
(
list
.
getGender
());
staffEntity1
.
setWorkNum
(
list
.
getJobNo
());
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffEntity.java
View file @
415c5c9c
...
...
@@ -7,7 +7,7 @@ import java.util.Date;
* 员工基本信息实体对象
*
* @author zxfei
* @date 2023-04-
08
* @date 2023-04-
14
*/
public
class
StaffEntity
extends
StaffVo
{
...
...
@@ -97,6 +97,14 @@ public class StaffEntity extends StaffVo {
* 员工来源(1.外部,2.内部)
*/
private
Integer
source
;
/**
* 相对图片pic
*/
private
String
picUri
;
/**
* 图片资源唯一标识
*/
private
String
serverIndexCode
;
...
...
@@ -395,6 +403,34 @@ public class StaffEntity extends StaffVo {
public
void
setSource
(
Integer
source
){
this
.
source
=
source
;
}
/**
* 获取 相对图片pic
* @return String
*/
public
String
getPicUri
(){
return
picUri
;
}
/**
* 设置 相对图片pic
* @param picUri
*/
public
void
setPicUri
(
String
picUri
){
this
.
picUri
=
picUri
;
}
/**
* 获取 图片资源唯一标识
* @return String
*/
public
String
getServerIndexCode
(){
return
serverIndexCode
;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCode
*/
public
void
setServerIndexCode
(
String
serverIndexCode
){
this
.
serverIndexCode
=
serverIndexCode
;
}
...
...
@@ -438,6 +474,8 @@ public class StaffEntity extends StaffVo {
sb
.
append
(
",remark:"
).
append
(
getRemark
());
sb
.
append
(
",remarkId:"
).
append
(
getRemarkId
());
sb
.
append
(
",source:"
).
append
(
getSource
());
sb
.
append
(
",picUri:"
).
append
(
getPicUri
());
sb
.
append
(
",serverIndexCode:"
).
append
(
getServerIndexCode
());
return
sb
.
toString
();
}
...
...
@@ -483,6 +521,10 @@ public class StaffEntity extends StaffVo {
this
.
remarkId
=
""
;
this
.
source
=
2
;
this
.
source
=
1
;
this
.
picUri
=
""
;
this
.
serverIndexCode
=
""
;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffQuery.java
View file @
415c5c9c
...
...
@@ -5,7 +5,7 @@ import java.util.List;
* 员工基本信息查询对象
*
* @author zxfei
* @date 2023-04-1
0
* @date 2023-04-1
4
*/
public
class
StaffQuery
extends
StaffEntity
{
/** 开始 序号,主键,自增长 */
...
...
@@ -244,6 +244,16 @@ public class StaffQuery extends StaffEntity {
/** 员工来源(1.外部,2.内部)排除列表 */
private
List
<
Integer
>
sourceNotList
;
/** 相对图片pic */
private
List
<
String
>
picUriList
;
/** 相对图片pic排除列表 */
private
List
<
String
>
picUriNotList
;
/** 图片资源唯一标识 */
private
List
<
String
>
serverIndexCodeList
;
/** 图片资源唯一标识排除列表 */
private
List
<
String
>
serverIndexCodeNotList
;
/** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private
List
<
StaffQuery
>
orConditionList
;
...
...
@@ -1574,6 +1584,70 @@ public class StaffQuery extends StaffEntity {
}
/**
* 获取 相对图片pic
* @return picUriList
*/
public
List
<
String
>
getPicUriList
(){
return
this
.
picUriList
;
}
/**
* 设置 相对图片pic
* @param picUriList
*/
public
void
setPicUriList
(
List
<
String
>
picUriList
){
this
.
picUriList
=
picUriList
;
}
/**
* 获取 相对图片pic
* @return picUriNotList
*/
public
List
<
String
>
getPicUriNotList
(){
return
this
.
picUriNotList
;
}
/**
* 设置 相对图片pic
* @param picUriNotList
*/
public
void
setPicUriNotList
(
List
<
String
>
picUriNotList
){
this
.
picUriNotList
=
picUriNotList
;
}
/**
* 获取 图片资源唯一标识
* @return serverIndexCodeList
*/
public
List
<
String
>
getServerIndexCodeList
(){
return
this
.
serverIndexCodeList
;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCodeList
*/
public
void
setServerIndexCodeList
(
List
<
String
>
serverIndexCodeList
){
this
.
serverIndexCodeList
=
serverIndexCodeList
;
}
/**
* 获取 图片资源唯一标识
* @return serverIndexCodeNotList
*/
public
List
<
String
>
getServerIndexCodeNotList
(){
return
this
.
serverIndexCodeNotList
;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCodeNotList
*/
public
void
setServerIndexCodeNotList
(
List
<
String
>
serverIndexCodeNotList
){
this
.
serverIndexCodeNotList
=
serverIndexCodeNotList
;
}
/**
* 设置 序号,主键,自增长
* @param id
...
...
@@ -2310,6 +2384,44 @@ public class StaffQuery extends StaffEntity {
return
this
;
}
/**
* 设置 相对图片pic
* @param picUri
*/
public
StaffQuery
picUri
(
String
picUri
){
setPicUri
(
picUri
);
return
this
;
}
/**
* 设置 相对图片pic
* @param picUriList
*/
public
StaffQuery
picUriList
(
List
<
String
>
picUriList
){
this
.
picUriList
=
picUriList
;
return
this
;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCode
*/
public
StaffQuery
serverIndexCode
(
String
serverIndexCode
){
setServerIndexCode
(
serverIndexCode
);
return
this
;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCodeList
*/
public
StaffQuery
serverIndexCodeList
(
List
<
String
>
serverIndexCodeList
){
this
.
serverIndexCodeList
=
serverIndexCodeList
;
return
this
;
}
/**
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
...
...
attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffMapper.xml
View file @
415c5c9c
This diff is collapsed.
Click to expand it.
db/module.sql
View file @
415c5c9c
...
...
@@ -54,6 +54,8 @@ CREATE TABLE mortals_xhx_staff(
`updateTime`
datetime
COMMENT
'更新时间'
,
`remarkId`
varchar
(
255
)
COMMENT
'备注id'
,
`source`
tinyint
(
2
)
DEFAULT
'1'
COMMENT
'员工来源(1.外部,2.内部)'
,
`picUri`
varchar
(
255
)
COMMENT
'相对图片pic'
,
`serverIndexCode`
varchar
(
255
)
COMMENT
'图片资源唯一标识'
,
PRIMARY
KEY
(
`id`
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COMMENT
=
'员工基本信息'
;
...
...
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