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
968d1106
Commit
968d1106
authored
Apr 25, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.10' into MVP1.7.10
parents
3fb6e7f4
0ce216b7
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
3 deletions
+19
-3
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+5
-3
TSocialInfoController.java
...plus/v1/yifu/social/controller/TSocialInfoController.java
+12
-0
TAuditInfoService.java
.../cloud/plus/v1/yifu/social/service/TAuditInfoService.java
+1
-0
TAuditInfoServiceImpl.java
...us/v1/yifu/social/service/impl/TAuditInfoServiceImpl.java
+1
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
968d1106
...
@@ -2860,7 +2860,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -2860,7 +2860,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
TEmployeeInfo
tEmployeeInfo
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeInfo
>
query
().
lambda
()
TEmployeeInfo
tEmployeeInfo
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeInfo
>
query
().
lambda
()
.
eq
(
TEmployeeInfo:
:
getEmpIdcard
,
project
.
getEmpIdcard
())
.
eq
(
TEmployeeInfo:
:
getEmpIdcard
,
project
.
getEmpIdcard
())
.
eq
(
TEmployeeInfo:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TEmployeeInfo:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TEmployeeInfo:
:
getFileStatus
,
CommonConstants
.
ZERO_INT
));
.
eq
(
TEmployeeInfo:
:
getFileStatus
,
CommonConstants
.
ZERO_INT
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
)
);
if
(
Common
.
isNotNull
(
tEmployeeInfo
))
{
if
(
Common
.
isNotNull
(
tEmployeeInfo
))
{
TEmployeeInfo
tEmployeeInfoCompare
=
baseMapper
.
selectById
(
tEmployeeInfo
.
getId
());
TEmployeeInfo
tEmployeeInfoCompare
=
baseMapper
.
selectById
(
tEmployeeInfo
.
getId
());
if
(
Common
.
isNotNull
(
tEmployeeInfo
.
getProjectNum
()))
{
if
(
Common
.
isNotNull
(
tEmployeeInfo
.
getProjectNum
()))
{
...
@@ -4240,7 +4240,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -4240,7 +4240,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if
(!
emp
.
getEmpPhone
().
equals
(
empPhoneOld
))
{
if
(!
emp
.
getEmpPhone
().
equals
(
empPhoneOld
))
{
return
R
.
failed
(
"旧手机号发生变化,请重新获取档案信息!"
);
return
R
.
failed
(
"旧手机号发生变化,请重新获取档案信息!"
);
}
}
TEmployeeInfo
empExist
=
baseMapper
.
selectOne
(
new
LambdaQueryWrapper
<
TEmployeeInfo
>().
eq
(
TEmployeeInfo:
:
getEmpPhone
,
empPhoneNew
));
TEmployeeInfo
empExist
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeInfo
>
query
().
lambda
()
.
eq
(
TEmployeeInfo:
:
getEmpPhone
,
empPhoneNew
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
empExist
!=
null
)
{
if
(
empExist
!=
null
)
{
return
R
.
failed
(
"手机号已被使用"
);
return
R
.
failed
(
"手机号已被使用"
);
}
}
...
@@ -4272,7 +4273,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -4272,7 +4273,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
@Override
@Override
public
R
<
TEmployeeInfo
>
getByEmpNameAndCard
(
String
empName
,
String
empIdCard
)
{
public
R
<
TEmployeeInfo
>
getByEmpNameAndCard
(
String
empName
,
String
empIdCard
)
{
TEmployeeInfo
emp
=
baseMapper
.
selectOne
(
new
LambdaQueryWrapper
<
TEmployeeInfo
>().
eq
(
TEmployeeInfo:
:
getEmpIdcard
,
empIdCard
));
TEmployeeInfo
emp
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeInfo
>
query
().
lambda
()
.
eq
(
TEmployeeInfo:
:
getEmpIdcard
,
empIdCard
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
emp
!=
null
)
{
if
(
emp
!=
null
)
{
if
(
empName
.
equals
(
emp
.
getEmpName
()))
{
if
(
empName
.
equals
(
emp
.
getEmpName
()))
{
return
new
R
<>(
emp
);
return
new
R
<>(
emp
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialInfoController.java
View file @
968d1106
...
@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.controller;
...
@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.controller;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
...
@@ -27,7 +28,11 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
...
@@ -27,7 +28,11 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TDispatchInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TAuditInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialSoldierService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialSoldierService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialInfoSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialInfoSearchVo
;
...
@@ -59,6 +64,8 @@ public class TSocialInfoController {
...
@@ -59,6 +64,8 @@ public class TSocialInfoController {
private
final
TSocialSoldierService
tSocialSoldierService
;
private
final
TSocialSoldierService
tSocialSoldierService
;
private
final
TDispatchInfoMapper
tDispatchInfoMapper
;
/**
/**
* 简单分页查询
* 简单分页查询
...
@@ -233,6 +240,11 @@ public class TSocialInfoController {
...
@@ -233,6 +240,11 @@ public class TSocialInfoController {
tSocialInfoService
.
updateById
(
socialInfo
);
tSocialInfoService
.
updateById
(
socialInfo
);
handleRemark
+=
"医疗、生育、大病手动转人工"
;
handleRemark
+=
"医疗、生育、大病手动转人工"
;
}
}
TDispatchInfo
disExist
=
tDispatchInfoMapper
.
selectOne
(
Wrappers
.<
TDispatchInfo
>
query
().
lambda
()
.
eq
(
TDispatchInfo:
:
getSocialId
,
id
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
disExist
!=
null
)
{
socialInfo
.
setDispatchId
(
disExist
.
getId
());
}
// 加记录
// 加记录
tSocialSoldierService
.
doSocialTAuditInfo
(
socialInfo
,
handleRemark
,
handleRemark
,
handleRemark
,
user
);
tSocialSoldierService
.
doSocialTAuditInfo
(
socialInfo
,
handleRemark
,
handleRemark
,
handleRemark
,
user
);
return
R
.
ok
(
"成功!"
);
return
R
.
ok
(
"成功!"
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TAuditInfoService.java
View file @
968d1106
...
@@ -48,4 +48,5 @@ public interface TAuditInfoService extends IService<TAuditInfo> {
...
@@ -48,4 +48,5 @@ public interface TAuditInfoService extends IService<TAuditInfo> {
void
listExport
(
HttpServletResponse
response
,
TAuditInfoSearchVo
searchVo
);
void
listExport
(
HttpServletResponse
response
,
TAuditInfoSearchVo
searchVo
);
List
<
TAuditInfo
>
noPageDiy
(
TAuditInfoSearchVo
searchVo
);
List
<
TAuditInfo
>
noPageDiy
(
TAuditInfoSearchVo
searchVo
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TAuditInfoServiceImpl.java
View file @
968d1106
...
@@ -243,4 +243,5 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
...
@@ -243,4 +243,5 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
BeanUtil
.
copyProperties
(
excel
,
insert
);
BeanUtil
.
copyProperties
(
excel
,
insert
);
this
.
save
(
insert
);
this
.
save
(
insert
);
}
}
}
}
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