Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
902b13f3
Commit
902b13f3
authored
Feb 20, 2025
by
chenyuxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 出差缩小对比范围
parent
3f3caa4b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
5 deletions
+17
-5
EkpQiweiChuchaiMapper.java
...loud/plus/v1/permission/mapper/EkpQiweiChuchaiMapper.java
+4
-1
QiWeiServiceImpl.java
...oud/plus/v1/permission/service/impl/QiWeiServiceImpl.java
+12
-4
EkpQiweiChuchaiMapper.xml
...n-biz/src/main/resources/mapper/EkpQiweiChuchaiMapper.xml
+1
-0
No files found.
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/mapper/EkpQiweiChuchaiMapper.java
View file @
902b13f3
...
...
@@ -19,11 +19,14 @@ public interface EkpQiweiChuchaiMapper extends BaseMapper<EkpQiwiChuchai> {
/**
* @param status 状态
* @Description: 获取全部的列表,用来: 拉取企业微信时,不覆盖数据
* 1.9.6版本优化:只查找:已被拉取的90天内的数据Map(定时任务最多拉取30天内的,手动执行是当天的。所以比对90天内的查重足够了。查全部数据对IO是浪费的)
* 用来: 拉取企E人事出差数据时,不覆盖数据
* @Author: hgw
* @Date: 2021/7/28 18:05
* @return: java.util.List<com.yifu.cloud.v1.hrms.api.entity.salary.TStatisticsProjectReimburse>
**/
List
<
EkpQiwiChuchai
>
getAllInfo
(
@Param
(
"status"
)
String
status
);
List
<
EkpQiwiChuchai
>
getAllInfo
(
@Param
(
"status"
)
String
status
,
@Param
(
"queryStartTime"
)
String
queryStartTime
,
@Param
(
"queryEndTime"
)
String
queryEndTime
);
List
<
QiWeiUserVo
>
getQiYeWeiXinUserList
();
}
...
...
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/QiWeiServiceImpl.java
View file @
902b13f3
...
...
@@ -172,10 +172,15 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
List
<
EkpQiwiChuchai
>
cpAllList
=
new
ArrayList
<>();
List
<
EkpQiwiChuchai
>
returnCpList
=
new
ArrayList
<>();
// todo 1.9.6计划改造:只查找:已被拉取的90天内的数据Map
String
queryStartDay
=
DateUtil
.
addDay
(-
90
);
String
queryStartTimes
=
queryStartDay
+
" 00:00:00"
;
// type 1:企业微信;2:HCM的E人事
if
(
type
==
1
)
{
// 已被拉取的Map
cpMap
=
this
.
getAllMap
();
// todo 1.9.6计划改造:只查找:已被拉取的90天内的数据Map(定时任务最多拉取30天内的,手动执行是当天的。所以比对90天内的查重足够了。查全部数据对IO是浪费的)
cpMap
=
this
.
getAllMap
(
queryStartTimes
,
endTimes
);
// 企微姓名Map
userMap
=
this
.
getUserMap
();
String
qwType
=
"chuChai"
;
...
...
@@ -198,7 +203,8 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
}
else
{
// type 2:HCM的E人事
// 已被拉取的Map
cpMap
=
this
.
getAllMap
();
// todo 1.9.6计划改造:只查找:已被拉取的90天内的数据Map(定时任务最多拉取30天内的,手动执行是当天的。所以比对90天内的查重足够了。查全部数据对IO是浪费的)
cpMap
=
this
.
getAllMap
(
queryStartTimes
,
endTimes
);
this
.
getChuChaiListByHcm
(
startTimes
,
endTimes
,
cpAllList
);
log
.
debug
(
"2拉取HCM的E人事出差数据cpAllList.size()="
+
cpAllList
.
size
());
if
(!
cpAllList
.
isEmpty
())
{
...
...
@@ -587,12 +593,14 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
/**
* @Description: 获取全部的列表,用来: 拉取企业微信时,不覆盖数据
* 1.9.6版本优化:只查找:已被拉取的90天内的数据Map(定时任务最多拉取30天内的,手动执行是当天的。所以比对90天内的查重足够了。查全部数据对IO是浪费的)
* 用来: 拉取企E人事出差数据时,不覆盖数据
* @Author: hgw
* @Date: 2021-7-28 18:14:59
* @return: java.util.Map<java.lang.String, java.lang.String>
**/
private
Map
<
String
,
String
>
getAllMap
()
{
List
<
EkpQiwiChuchai
>
cpHistoryList
=
baseMapper
.
getAllInfo
(
null
);
private
Map
<
String
,
String
>
getAllMap
(
String
queryStartTime
,
String
queryEndTime
)
{
List
<
EkpQiwiChuchai
>
cpHistoryList
=
baseMapper
.
getAllInfo
(
null
,
queryStartTime
,
queryEndTime
);
Map
<
String
,
String
>
cpMap
=
new
HashMap
<>();
for
(
EkpQiwiChuchai
cpHis
:
cpHistoryList
)
{
cpMap
.
put
(
cpHis
.
getFdSpNo
(),
"0"
);
...
...
yifu-permission/yifu-permission-biz/src/main/resources/mapper/EkpQiweiChuchaiMapper.xml
View file @
902b13f3
...
...
@@ -59,6 +59,7 @@
<if
test=
"status != null and status.trim() != ''"
>
AND a.FD_STATUS = #{status}
</if>
and a.FD_APPLY_DATE >= #{queryStartTime} and a.FD_APPLY_DATE
<![CDATA[<=]]>
#{queryEndTime}
</where>
</select>
...
...
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