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
1d20db5e
Commit
1d20db5e
authored
Jul 11, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化人员档案
parent
7955b944
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
20 deletions
+16
-20
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+2
-0
TEmployeeInfoController.java
.../v1/yifu/archives/controller/TEmployeeInfoController.java
+0
-5
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+5
-3
ChecksUtil.java
...n/java/com/yifu/cloud/plus/v1/check/utils/ChecksUtil.java
+5
-5
TCheckIdCardServiceImpl.java
...d/plus/v1/check/service/impl/TCheckIdCardServiceImpl.java
+4
-7
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
1d20db5e
...
...
@@ -30,6 +30,8 @@ public class EmployeeConstants {
public
static
final
String
FILE_CITY_MUST
=
"更新档案县,档案市必填"
;
public
static
final
String
DEPT_NO_ERROR
=
"项目编码错误"
;
public
static
final
String
DEPT_NO_EXIST
=
"根据项目编码未找到项目"
;
public
static
final
String
CHECK_ERROR
=
"校验服务错误,请联系管理员!"
;
public
static
final
String
CHECK_NO_RESPONSE
=
"校验服务器未返回,请联系管理员!"
;
/**
* 无数据可更新
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java
View file @
1d20db5e
...
...
@@ -19,13 +19,10 @@ package com.yifu.cloud.plus.v1.yifu.archives.controller;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.pig4cloud.plugin.excel.annotation.RequestExcel
;
import
com.pig4cloud.plugin.excel.vo.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDataAuth
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeInfoService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeLeaveVO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeVO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.ErrorMessageVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
...
...
@@ -46,13 +43,11 @@ import org.springframework.cache.Cache;
import
org.springframework.cache.CacheManager
;
import
org.springframework.cache.support.SimpleValueWrapper
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.validation.BindingResult
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.validation.Valid
;
import
java.io.InputStream
;
import
java.util.List
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
1d20db5e
...
...
@@ -122,12 +122,12 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if
(
checkListR
!=
null
&&
checkListR
.
getData
()
!=
null
)
{
TCheckIdCard
check
=
checkListR
.
getData
();
if
(
check
==
null
||
Common
.
isEmpty
(
check
.
getIsTrue
()))
{
return
R
.
failed
(
"校验服务器未返回,请联系管理员!!"
);
return
R
.
failed
(
EmployeeConstants
.
CHECK_NO_RESPONSE
);
}
else
if
(
check
.
getIsTrue
()
==
CommonConstants
.
ZERO_INT
)
{
return
R
.
failed
(
check
.
getReason
());
}
}
else
{
return
R
.
failed
(
"校验服务器未返回,请联系管理员!"
);
return
R
.
failed
(
EmployeeConstants
.
CHECK_NO_RESPONSE
);
}
return
R
.
ok
();
}
...
...
@@ -1598,8 +1598,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg
.
add
(
checkMobile
.
getMessage
());
}
}
else
{
errorMsg
.
add
(
"校验服务错误,请联系管理员!"
);
errorMsg
.
add
(
EmployeeConstants
.
CHECK_ERROR
);
}
}
else
{
errorMsg
.
add
(
EmployeeConstants
.
CHECK_ERROR
);
}
}
}
...
...
yifu-check/yifu-check-api/src/main/java/com/yifu/cloud/plus/v1/check/utils/ChecksUtil.java
View file @
1d20db5e
...
...
@@ -38,7 +38,7 @@ public class ChecksUtil {
// 1.调用身份信息校验api
checkIdCardMethod
(
checkIdCard
);
}
else
{
checkIdCard
.
setIsTrue
(
0
);
checkIdCard
.
setIsTrue
(
CommonConstants
.
ZERO_INT
);
checkIdCard
.
setReason
(
ChecksConstants
.
NACOS_CHECK_CONFIG_ERROR
);
}
}
...
...
@@ -173,20 +173,20 @@ public class ChecksUtil {
JsonObject
resultJson
=
jsonObject
.
get
(
ChecksConstants
.
DATA
).
getAsJsonObject
();
String
resultStr
=
getJsonElementValue
(
resultJson
.
getAsJsonObject
().
get
(
ChecksConstants
.
RESULT
));
if
(
"01"
.
equals
(
resultStr
))
{
checkIdCard
.
setIsTrue
(
1
);
checkIdCard
.
setIsTrue
(
CommonConstants
.
ONE_INT
);
checkIdCard
.
setReason
(
"正确"
);
}
else
{
checkIdCard
.
setIsTrue
(
0
);
checkIdCard
.
setIsTrue
(
CommonConstants
.
ZERO_INT
);
String
remark
=
getJsonElementValue
(
resultJson
.
get
(
ChecksConstants
.
REMARK
));
checkIdCard
.
setReason
(
"调用身份信息校验失败,resultStr:"
+
resultStr
+
",msg:"
+
remark
);
}
}
else
{
// 记录错误日志,正式项目中请换成log打印
checkIdCard
.
setIsTrue
(
0
);
checkIdCard
.
setIsTrue
(
CommonConstants
.
ZERO_INT
);
checkIdCard
.
setReason
(
"调用身份信息校验失败,code:"
+
code
+
",msg:"
+
jsonObject
.
get
(
ChecksConstants
.
MESSAGE
).
getAsString
());
}
}
else
{
checkIdCard
.
setIsTrue
(
0
);
checkIdCard
.
setIsTrue
(
CommonConstants
.
ZERO_INT
);
checkIdCard
.
setReason
(
ChecksConstants
.
NO_DATA_RESULT
);
}
}
...
...
yifu-check/yifu-check-biz/src/main/java/com/yifu/cloud/plus/v1/check/service/impl/TCheckIdCardServiceImpl.java
View file @
1d20db5e
...
...
@@ -233,25 +233,22 @@ public class TCheckIdCardServiceImpl extends ServiceImpl<TCheckIdCardMapper, TCh
if
(
Common
.
isEmpty
(
idCard
)
||
Common
.
isEmpty
(
name
)){
tCheckIdCard
.
setIsTrue
(
CommonConstants
.
ZERO_INT
);
tCheckIdCard
.
setReason
(
CommonConstants
.
PARAM_IS_NOT_EMPTY
);
tCheckIdCard
.
setIsTrue
(
CommonConstants
.
ONE_INT
);
return
tCheckIdCard
;
}
// 校验姓名身份证规则
if
(!
regIdCard
(
idCard
))
{
tCheckIdCard
.
setIsTrue
(
0
);
tCheckIdCard
.
setIsTrue
(
CommonConstants
.
ZERO_INT
);
tCheckIdCard
.
setReason
(
"身份证格式有误"
);
tCheckIdCard
.
setIsTrue
(
CommonConstants
.
ONE_INT
);
return
tCheckIdCard
;
}
else
if
(
regEmpName
(
name
))
{
tCheckIdCard
.
setIsTrue
(
0
);
tCheckIdCard
.
setIsTrue
(
CommonConstants
.
ZERO_INT
);
tCheckIdCard
.
setReason
(
"姓名含数字或空格,无法校验"
);
tCheckIdCard
.
setIsTrue
(
CommonConstants
.
ONE_INT
);
return
tCheckIdCard
;
}
synchronized
(
this
){
TCheckIdCard
checkIdCard
=
baseMapper
.
selectOne
(
Wrappers
.<
TCheckIdCard
>
query
().
lambda
()
.
eq
(
TCheckIdCard:
:
getIdCard
,
idCard
)
.
eq
(
TCheckIdCard:
:
getIsTrue
,
CommonConstants
.
ONE_
STRING
)
.
eq
(
TCheckIdCard:
:
getIsTrue
,
CommonConstants
.
ONE_
INT
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
checkIdCard
)){
if
(
name
.
equals
(
checkIdCard
.
getName
()))
{
...
...
@@ -268,7 +265,7 @@ public class TCheckIdCardServiceImpl extends ServiceImpl<TCheckIdCardMapper, TCh
if
(
checkList
!=
null
&&
!
checkList
.
isEmpty
())
{
for
(
TCheckIdCard
c
:
checkList
)
{
if
(
idCard
.
equals
(
c
.
getIdCard
())
&&
name
.
equals
(
c
.
getName
()))
{
tCheckIdCard
.
setIsTrue
(
0
);
tCheckIdCard
.
setIsTrue
(
CommonConstants
.
ZERO_INT
);
tCheckIdCard
.
setReason
(
c
.
getReason
());
return
tCheckIdCard
;
}
...
...
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