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
a860d87d
Commit
a860d87d
authored
Jul 16, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop'
parents
21a27a10
a7730078
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
11 deletions
+36
-11
TSocialFriendReduceSet.java
...ud/plus/v1/yifu/social/entity/TSocialFriendReduceSet.java
+17
-0
TSocialFriendReduceSetMapper.java
...s/v1/yifu/social/mapper/TSocialFriendReduceSetMapper.java
+2
-1
TSocialFriendReduceSetService.java
...v1/yifu/social/service/TSocialFriendReduceSetService.java
+1
-1
TSocialFriendPushServiceImpl.java
...ifu/social/service/impl/TSocialFriendPushServiceImpl.java
+7
-5
TSocialFriendReduceSetServiceImpl.java
...ocial/service/impl/TSocialFriendReduceSetServiceImpl.java
+3
-3
TSocialFriendReduceSetMapper.xml
...rc/main/resources/mapper/TSocialFriendReduceSetMapper.xml
+6
-1
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFriendReduceSet.java
View file @
a860d87d
...
...
@@ -77,4 +77,21 @@ public class TSocialFriendReduceSet {
@Schema
(
description
=
"备案解除二级原因"
)
private
String
bajcejyy
;
/**
* 离职原因,存的value:1,2,3之类的
*/
@ExcelAttribute
(
name
=
"离职原因"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"离职原因"
)
@ExcelProperty
(
"离职原因"
)
@Schema
(
description
=
"离职原因"
)
private
String
mvpKey
;
/**
* 类型1:社保;2:医保
*/
@ExcelAttribute
(
name
=
"类型"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"类型"
)
@ExcelProperty
(
"类型"
)
@Schema
(
description
=
"类型1:社保;2:医保"
)
private
String
mvpType
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialFriendReduceSetMapper.java
View file @
a860d87d
...
...
@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.mapper;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFriendReduceSet
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
...
...
@@ -37,5 +38,5 @@ public interface TSocialFriendReduceSetMapper extends BaseMapper<TSocialFriendRe
* @Date: 2025/4/14 15:24
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFriendReduceSet>
**/
List
<
TSocialFriendReduceSet
>
getTSocialFriendReduceSetList
();
List
<
TSocialFriendReduceSet
>
getTSocialFriendReduceSetList
(
@Param
(
"mvpType"
)
String
mvpType
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialFriendReduceSetService.java
View file @
a860d87d
...
...
@@ -36,5 +36,5 @@ public interface TSocialFriendReduceSetService extends IService<TSocialFriendRed
* @Date: 2025/4/14 15:23
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFriendReduceSet>
**/
Map
<
String
,
TSocialFriendReduceSet
>
getFriendReduceMap
();
Map
<
String
,
TSocialFriendReduceSet
>
getFriendReduceMap
(
String
mvpType
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendPushServiceImpl.java
View file @
a860d87d
...
...
@@ -110,7 +110,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
if
(
set
!=
null
&&
Common
.
isNotNull
(
set
.
getType
())
&&
1
==
set
.
getType
())
{
// 离职原因Map,将离职原因翻译为税友的字典
Map
<
String
,
TSocialFriendReduceSet
>
reduceMap
=
tSocialFriendReduceSetService
.
getFriendReduceMap
();
Map
<
String
,
TSocialFriendReduceSet
>
reduceYgsMap
=
tSocialFriendReduceSetService
.
getFriendReduceMap
(
CommonConstants
.
ONE_STRING
);
Map
<
String
,
TSocialFriendReduceSet
>
reduceYsdMap
=
tSocialFriendReduceSetService
.
getFriendReduceMap
(
CommonConstants
.
TWO_STRING
);
// 获取时间限制配置(获取 当月启用 的配置)
Map
<
String
,
TSocialDeadlineInfo
>
socialSetMap
=
tSocialDeadlineInfoService
.
getSocialSetByAreaId
();
...
...
@@ -133,23 +134,23 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
// 养工失新增列表
List
<
SociaFriendYgsAddVo
>
ygsAddlist
=
baseMapper
.
getSocialSoldierYgsAddVoList
(
dispatchIdList
);
if
(
ygsAddlist
!=
null
&&
!
ygsAddlist
.
isEmpty
())
{
this
.
doPushSocialAndLogYgs
(
socialSetMap
,
ygsAddlist
,
1
,
reduceMap
,
zhangMap
,
templateUrl
);
this
.
doPushSocialAndLogYgs
(
socialSetMap
,
ygsAddlist
,
1
,
reduce
Ygs
Map
,
zhangMap
,
templateUrl
);
}
// 养工失减少列表
List
<
SociaFriendYgsAddVo
>
ygsReducelist
=
baseMapper
.
getSocialSoldierYgsReduceVoList
(
dispatchIdList
);
if
(
ygsReducelist
!=
null
&&
!
ygsReducelist
.
isEmpty
())
{
this
.
doPushSocialAndLogYgs
(
socialSetMap
,
ygsReducelist
,
2
,
reduceMap
,
zhangMap
,
templateUrl
);
this
.
doPushSocialAndLogYgs
(
socialSetMap
,
ygsReducelist
,
2
,
reduce
Ygs
Map
,
zhangMap
,
templateUrl
);
}
// 医生大新增列表
List
<
SociaFriendYgsAddVo
>
ysdAddlist
=
baseMapper
.
getSocialSoldierYsdAddVoList
(
dispatchIdList
);
if
(
ysdAddlist
!=
null
&&
!
ysdAddlist
.
isEmpty
())
{
this
.
doPushSocialAndLogYsd
(
socialSetMap
,
ysdAddlist
,
3
,
reduceMap
,
zhangMap
,
templateUrl
);
this
.
doPushSocialAndLogYsd
(
socialSetMap
,
ysdAddlist
,
3
,
reduce
Ysd
Map
,
zhangMap
,
templateUrl
);
}
// 医生大减少列表
List
<
SociaFriendYgsAddVo
>
ysdReducelist
=
baseMapper
.
getSocialSoldierYsdReduceVoList
(
dispatchIdList
);
if
(
ysdReducelist
!=
null
&&
!
ysdReducelist
.
isEmpty
())
{
this
.
doPushSocialAndLogYsd
(
socialSetMap
,
ysdReducelist
,
4
,
reduceMap
,
zhangMap
,
templateUrl
);
this
.
doPushSocialAndLogYsd
(
socialSetMap
,
ysdReducelist
,
4
,
reduce
Ysd
Map
,
zhangMap
,
templateUrl
);
}
if
((
ygsAddlist
==
null
||
ygsAddlist
.
isEmpty
())
&&
(
ygsReducelist
==
null
||
ygsReducelist
.
isEmpty
())
...
...
@@ -515,6 +516,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
this
.
doSetAutoDoc
(
zhangMap
,
templateUrl
,
vo
,
CommonConstants
.
NINE_INTEGER
);
}
i
=
0
;
nextFlag
=
false
;
requestId
=
socialFriendConfig
.
pushFriendByInfo
(
restTemplate
,
vo
,
listVo
,
type
,
thisTime
,
backLogList
);
ysdHandleStatus
=
CommonConstants
.
TWO_STRING
;
remark
=
"已推送提交任务!"
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendReduceSetServiceImpl.java
View file @
a860d87d
...
...
@@ -38,13 +38,13 @@ import java.util.Map;
public
class
TSocialFriendReduceSetServiceImpl
extends
ServiceImpl
<
TSocialFriendReduceSetMapper
,
TSocialFriendReduceSet
>
implements
TSocialFriendReduceSetService
{
@Override
public
Map
<
String
,
TSocialFriendReduceSet
>
getFriendReduceMap
()
{
List
<
TSocialFriendReduceSet
>
list
=
baseMapper
.
getTSocialFriendReduceSetList
();
public
Map
<
String
,
TSocialFriendReduceSet
>
getFriendReduceMap
(
String
mvpType
)
{
List
<
TSocialFriendReduceSet
>
list
=
baseMapper
.
getTSocialFriendReduceSetList
(
mvpType
);
// 将list转化为map
if
(
list
!=
null
&&
!
list
.
isEmpty
())
{
Map
<
String
,
TSocialFriendReduceSet
>
map
=
Maps
.
newHashMap
();
for
(
TSocialFriendReduceSet
reduceSet
:
list
)
{
map
.
put
(
reduceSet
.
get
Id
(),
reduceSet
);
map
.
put
(
reduceSet
.
get
MvpKey
(),
reduceSet
);
}
return
map
;
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFriendReduceSetMapper.xml
View file @
a860d87d
...
...
@@ -29,17 +29,22 @@
<result
property=
"tbyy"
column=
"TBYY"
/>
<result
property=
"zzyy"
column=
"ZZYY"
/>
<result
property=
"bajcejyy"
column=
"BAJCEJYY"
/>
<result
property=
"mvpKey"
column=
"MVP_KEY"
/>
<result
property=
"mvpType"
column=
"MVP_TYPE"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
a.TBYY,
a.ZZYY,
a.BAJCEJYY
a.BAJCEJYY,
a.MVP_KEY,
a.MVP_TYPE
</sql>
<!--tSocialFriendReduceSet简单分页查询-->
<select
id=
"getTSocialFriendReduceSetList"
resultMap=
"tSocialFriendReduceSetMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_social_friend_reduce_set a
where a.MVP_TYPE = #{mvpType}
</select>
</mapper>
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