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
7d4f87dd
Commit
7d4f87dd
authored
Oct 29, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
014f21fb
67df314a
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
49 additions
and
12 deletions
+49
-12
TEmployeeContractPreSearchVo.java
...lus/v1/yifu/archives/vo/TEmployeeContractPreSearchVo.java
+3
-0
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+13
-1
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+5
-0
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+3
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+2
-2
pom.xml
yifu-ekp/yifu-ekp-api/pom.xml
+7
-0
TDispatchInfoPreSearchVo.java
...loud/plus/v1/yifu/social/vo/TDispatchInfoPreSearchVo.java
+3
-0
UnSocialFundInfoVo.java
...yifu/cloud/plus/v1/yifu/social/vo/UnSocialFundInfoVo.java
+2
-2
TDispatchInfoPreMapper.xml
...-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
+5
-1
TSocialAlertInfoMapper.xml
...-biz/src/main/resources/mapper/TSocialAlertInfoMapper.xml
+2
-2
TSocialFundInfoMapper.xml
...l-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
+4
-4
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPreSearchVo.java
View file @
7d4f87dd
...
@@ -56,4 +56,7 @@ public class TEmployeeContractPreSearchVo extends TEmployeeContractPre {
...
@@ -56,4 +56,7 @@ public class TEmployeeContractPreSearchVo extends TEmployeeContractPre {
@Schema
(
description
=
"列表类型 1 待办 2监控"
)
@Schema
(
description
=
"列表类型 1 待办 2监控"
)
private
String
type
;
private
String
type
;
@Schema
(
description
=
"自动标识 1不查询确认时间为空的数据"
)
private
String
autoSendFlag
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
7d4f87dd
...
@@ -841,6 +841,7 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
...
@@ -841,6 +841,7 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
//保存社保规则明细
//保存社保规则明细
if
(
Common
.
isNotNull
(
socialRuleRels
)){
if
(
Common
.
isNotNull
(
socialRuleRels
)){
TAutoSocialRuleRel
temp
=
null
;
for
(
TAutoSocialRuleRel
rel:
socialRuleRels
){
for
(
TAutoSocialRuleRel
rel:
socialRuleRels
){
//存在新增的直接socialFlag =true 后面不在判断此种场景
//存在新增的直接socialFlag =true 后面不在判断此种场景
if
(!
Common
.
isNotNull
(
rel
.
getId
())){
if
(!
Common
.
isNotNull
(
rel
.
getId
())){
...
@@ -852,8 +853,19 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
...
@@ -852,8 +853,19 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
rel
.
setCreateBy
(
user
.
getId
());
rel
.
setCreateBy
(
user
.
getId
());
rel
.
setCreateTime
(
LocalDateTime
.
now
());
rel
.
setCreateTime
(
LocalDateTime
.
now
());
rel
.
setCreateName
(
user
.
getNickname
());
rel
.
setCreateName
(
user
.
getNickname
());
if
(
Common
.
isNotNull
(
rel
.
getId
())){
temp
=
autoSocialRuleRelMapper
.
selectById
(
rel
.
getId
());
if
(
null
!=
temp
){
autoSocialRuleRelMapper
.
updateById
(
rel
);
}
else
{
autoSocialRuleRelMapper
.
insert
(
rel
);
autoSocialRuleRelMapper
.
insert
(
rel
);
}
}
}
else
{
autoSocialRuleRelMapper
.
insert
(
rel
);
}
}
}
}
// 判断数据对象是否都在页面传的对象里,有不在的数据,则返回true 目的是判断是否更新了
// 判断数据对象是否都在页面传的对象里,有不在的数据,则返回true 目的是判断是否更新了
socialFlag
=
checkSocialRuleRelForNotIn
(
socialRuleRelsOld
,
socialRuleRels
);
socialFlag
=
checkSocialRuleRelForNotIn
(
socialRuleRelsOld
,
socialRuleRels
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
7d4f87dd
...
@@ -2596,9 +2596,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -2596,9 +2596,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
}
}
if
(
Common
.
isNotNull
(
vo
.
getContractId
()))
{
if
(
Common
.
isNotNull
(
vo
.
getContractId
()))
{
//2025.10.28同倩倩确认:电子签合同社保审核不同步变更状态
TEmployeeContractInfo
c
=
contractServicer
.
getOne
(
Wrappers
.<
TEmployeeContractInfo
>
query
().
lambda
()
TEmployeeContractInfo
c
=
contractServicer
.
getOne
(
Wrappers
.<
TEmployeeContractInfo
>
query
().
lambda
()
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeContractInfo:
:
getId
,
vo
.
getContractId
())
.
eq
(
TEmployeeContractInfo:
:
getId
,
vo
.
getContractId
())
.
and
(
wrapper
->
wrapper
.
eq
(
TEmployeeContractInfo:
:
getSignType
,
CommonConstants
.
ONE_STRING
)
.
or
().
isNull
(
TEmployeeContractInfo:
:
getSignType
)
)
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ONE_INT
)
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ONE_INT
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
c
))
{
if
(
Common
.
isNotNull
(
c
))
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
7d4f87dd
...
@@ -225,6 +225,9 @@
...
@@ -225,6 +225,9 @@
<if
test=
"tEmployeeContractPre.processStatus != null and tEmployeeContractPre.processStatus.trim() != ''"
>
<if
test=
"tEmployeeContractPre.processStatus != null and tEmployeeContractPre.processStatus.trim() != ''"
>
AND a.process_status = #{tEmployeeContractPre.processStatus}
AND a.process_status = #{tEmployeeContractPre.processStatus}
</if>
</if>
<if
test=
"tEmployeeContractPre.autoSendFlag != null and tEmployeeContractPre.autoSendFlag.trim() != ''"
>
AND a.expected_confirm_time is not null and DATE_FORMAT(a.expected_confirm_time,'%Y-%m-%d')
<![CDATA[ <= ]]>
CURDATE()
</if>
<if
test=
"tEmployeeContractPre.statusList != null and tEmployeeContractPre.statusList.size() > 0"
>
<if
test=
"tEmployeeContractPre.statusList != null and tEmployeeContractPre.statusList.size() > 0"
>
AND a.process_status in
AND a.process_status in
<foreach
item=
"item"
index=
"index"
collection=
"tEmployeeContractPre.statusList"
open=
"("
separator=
","
<foreach
item=
"item"
index=
"index"
collection=
"tEmployeeContractPre.statusList"
open=
"("
separator=
","
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
7d4f87dd
...
@@ -874,9 +874,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -874,9 +874,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getExpectedCollectionTime
())
&&
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getExpectedCollectionTime
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getExpectedConfirmTime
()))
{
Common
.
isNotNull
(
employeeContractPreVo
.
getExpectedConfirmTime
()))
{
employeeContractPreVo
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
employeeContractPreVo
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
employeeContractPreVo
.
getExpectedCollectionTime
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
"
9:0
0"
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
employeeContractPreVo
.
getExpectedCollectionTime
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
"
15:2
0"
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
employeeContractPreVo
.
setExpectedConfirmTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
employeeContractPreVo
.
setExpectedConfirmTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
employeeContractPreVo
.
getExpectedConfirmTime
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
"
8:3
0"
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
employeeContractPreVo
.
getExpectedConfirmTime
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
"
9:0
0"
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
}
}
archivesDaprUtil
.
saveContractPreInfo
(
employeeContractPreVo
);
archivesDaprUtil
.
saveContractPreInfo
(
employeeContractPreVo
);
}
}
...
...
yifu-ekp/yifu-ekp-api/pom.xml
View file @
7d4f87dd
...
@@ -89,5 +89,12 @@
...
@@ -89,5 +89,12 @@
<artifactId>
commons-logging-icbc
</artifactId>
<artifactId>
commons-logging-icbc
</artifactId>
<version>
1.2.0
</version>
<version>
1.2.0
</version>
</dependency>
</dependency>
<!-- 交行jar引入 -->
<dependency>
<groupId>
com.ipct.safety
</groupId>
<artifactId>
ipct_safety
</artifactId>
<version>
2.1.0
</version>
</dependency>
</dependencies>
</dependencies>
</project>
</project>
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoPreSearchVo.java
View file @
7d4f87dd
...
@@ -57,4 +57,7 @@ public class TDispatchInfoPreSearchVo extends TDispatchInfoPre {
...
@@ -57,4 +57,7 @@ public class TDispatchInfoPreSearchVo extends TDispatchInfoPre {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
failType
;
private
String
failType
;
@Schema
(
description
=
"自动标识 1不查询确认时间为空的数据"
)
private
String
autoSendFlag
;
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/UnSocialFundInfoVo.java
View file @
7d4f87dd
...
@@ -58,11 +58,11 @@ public class UnSocialFundInfoVo implements Serializable {
...
@@ -58,11 +58,11 @@ public class UnSocialFundInfoVo implements Serializable {
/**
/**
* 派单人姓名
* 派单人姓名
*/
*/
private
String
create
Name
;
private
String
dispatch
Name
;
/**
/**
* 创建时间
* 创建时间
*/
*/
private
String
create
Time
;
private
String
dispatch
Time
;
}
}
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
View file @
7d4f87dd
...
@@ -213,6 +213,9 @@
...
@@ -213,6 +213,9 @@
<if
test=
"tDispatchInfoPre.failType != null and tDispatchInfoPre.failType.trim() != ''"
>
<if
test=
"tDispatchInfoPre.failType != null and tDispatchInfoPre.failType.trim() != ''"
>
AND a.error_info is not null
AND a.error_info is not null
</if>
</if>
<if
test=
"tDispatchInfoPre.autoSendFlag != null and tDispatchInfoPre.autoSendFlag.trim() != ''"
>
AND a.EXPECTED_CONFIRM_TIME is not null and DATE_FORMAT(a.EXPECTED_CONFIRM_TIME,'%Y-%m-%d')
<![CDATA[ <= ]]>
CURDATE()
</if>
<if
test=
"tDispatchInfoPre.authSql != null and tDispatchInfoPre.authSql.trim() != ''"
>
<if
test=
"tDispatchInfoPre.authSql != null and tDispatchInfoPre.authSql.trim() != ''"
>
${tDispatchInfoPre.authSql}
${tDispatchInfoPre.authSql}
</if>
</if>
...
@@ -330,9 +333,10 @@
...
@@ -330,9 +333,10 @@
SELECT
SELECT
count(1)
count(1)
FROM t_dispatch_info_pre a
FROM t_dispatch_info_pre a
left join view_contract b on a.EMP_IDCARD = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
<where>
<where>
1=1
1=1
<include
refid=
"tDispatchInfoPre_
other_
where"
/>
<include
refid=
"tDispatchInfoPre_where"
/>
</where>
</where>
</select>
</select>
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialAlertInfoMapper.xml
View file @
7d4f87dd
...
@@ -200,7 +200,7 @@
...
@@ -200,7 +200,7 @@
LEFT JOIN
LEFT JOIN
(SELECT
(SELECT
SOCIAL_ID,
SOCIAL_ID,
GROUP_CONCAT(DISTINCT AUDIT_REMARK) as 'reasons',
GROUP_CONCAT(DISTINCT AUDIT_REMARK
SEPARATOR '#'
) as 'reasons',
DISPATCH_INFO_ID
DISPATCH_INFO_ID
FROM
FROM
t_audit_info
t_audit_info
...
@@ -261,7 +261,7 @@
...
@@ -261,7 +261,7 @@
LEFT JOIN
LEFT JOIN
(SELECT
(SELECT
PROVIDENT_ID,
PROVIDENT_ID,
GROUP_CONCAT(DISTINCT AUDIT_REMARK) as 'reasons',
GROUP_CONCAT(DISTINCT AUDIT_REMARK
SEPARATOR '#'
) as 'reasons',
DISPATCH_INFO_ID
DISPATCH_INFO_ID
FROM
FROM
t_audit_info
t_audit_info
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @
7d4f87dd
...
@@ -277,8 +277,8 @@
...
@@ -277,8 +277,8 @@
<result
property=
"socialStatus"
column=
"SOCIAL_STATUS"
/>
<result
property=
"socialStatus"
column=
"SOCIAL_STATUS"
/>
<result
property=
"deptNo"
column=
"SETTLE_DOMAIN_CODE"
/>
<result
property=
"deptNo"
column=
"SETTLE_DOMAIN_CODE"
/>
<result
property=
"deptName"
column=
"SETTLE_DOMAIN_NAME"
/>
<result
property=
"deptName"
column=
"SETTLE_DOMAIN_NAME"
/>
<result
property=
"
createName"
column=
"CREATE_NAME
"
/>
<result
property=
"
dispatchName"
column=
"dispatchName
"
/>
<result
property=
"
createTime"
column=
"CREATE_TIME
"
/>
<result
property=
"
dispatchTime"
column=
"dispatchTime
"
/>
<result
property=
"socialProvince"
column=
"SOCIAL_PROVINCE"
/>
<result
property=
"socialProvince"
column=
"SOCIAL_PROVINCE"
/>
<result
property=
"socialCity"
column=
"SOCIAL_CITY"
/>
<result
property=
"socialCity"
column=
"SOCIAL_CITY"
/>
<result
property=
"socialTown"
column=
"SOCIAL_TOWN"
/>
<result
property=
"socialTown"
column=
"SOCIAL_TOWN"
/>
...
@@ -1227,8 +1227,8 @@
...
@@ -1227,8 +1227,8 @@
a.SOCIAL_PROVINCE,
a.SOCIAL_PROVINCE,
a.SOCIAL_CITY,
a.SOCIAL_CITY,
a.SOCIAL_TOWN,
a.SOCIAL_TOWN,
d.CREATE_NAME,
d.CREATE_NAME
as dispatchName
,
DATE_FORMAT(d.CREATE_TIME, '%Y-%m-%d %H:%i:%s') as
CREATE_TIME
DATE_FORMAT(d.CREATE_TIME, '%Y-%m-%d %H:%i:%s') as
dispatchTime
FROM t_social_fund_info a
FROM t_social_fund_info a
inner join t_dispatch_info d on a.DISPATCH_ID = d.ID
inner join t_dispatch_info d on a.DISPATCH_ID = d.ID
where a.EMP_IDCARD = #{empIdcard}
where a.EMP_IDCARD = #{empIdcard}
...
...
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