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
c0c54e02
Commit
c0c54e02
authored
Jul 01, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
档案导入空指针优化
parent
ee32321a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
21 deletions
+11
-21
TEmployeeContractInfo.java
...d/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
+8
-8
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+1
-1
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+2
-12
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @
c0c54e02
...
...
@@ -112,18 +112,18 @@ public class TEmployeeContractInfo extends BaseEntity {
@Schema
(
description
=
"合同到期时间"
,
name
=
"contractEnd"
)
private
LocalDate
contractEnd
;
/**
*
合同主体部门
*
项目名称
*/
@Length
(
max
=
128
,
message
=
"
合同主体部门
不能超过128个字符"
)
@ExcelAttribute
(
name
=
"
合同主体部门
"
,
maxLength
=
128
)
@Schema
(
description
=
"
合同主体部门deptName
"
,
name
=
"subjectDepart"
)
@Length
(
max
=
128
,
message
=
"
项目名称
不能超过128个字符"
)
@ExcelAttribute
(
name
=
"
项目名称
"
,
maxLength
=
128
)
@Schema
(
description
=
"
项目名称
"
,
name
=
"subjectDepart"
)
private
String
subjectDepart
;
/**
*
合同主体单位
*
客户名称
*/
@Length
(
max
=
128
,
message
=
"
合同主体单位
不能超过128个字符"
)
@ExcelAttribute
(
name
=
"
合同主体单位
"
,
maxLength
=
128
)
@Schema
(
description
=
"
合同主体单位unitName
"
,
name
=
"subjectUnit"
)
@Length
(
max
=
128
,
message
=
"
客户名称
不能超过128个字符"
)
@ExcelAttribute
(
name
=
"
客户名称
"
,
maxLength
=
128
)
@Schema
(
description
=
"
客户名称
"
,
name
=
"subjectUnit"
)
private
String
subjectUnit
;
/**
* 签订情况
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
c0c54e02
...
...
@@ -562,7 +562,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
// 性别
if
(
idCard
.
length
()
>
17
)
{
if
(
Integer
.
parseInt
(
idCard
.
substring
(
16
,
1
))
%
2
==
1
)
{
if
(
Integer
.
parseInt
(
idCard
.
substring
(
16
,
1
7
))
%
2
==
1
)
{
employeeInfo
.
setEmpSex
(
CommonConstants
.
SEX_MAN
);
}
else
{
employeeInfo
.
setEmpSex
(
CommonConstants
.
SEX_WONMAN
);
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
c0c54e02
...
...
@@ -123,10 +123,7 @@
a.CREATE_TIME,
a.UPDATE_BY,
a.UPDATE_TIME,
a.UNIT_ID,
a.UNIT_NAME,
a.UNIT_NO,
a.DEPT_NAME,
a.DEPT_NO,
a.AUDIT_STATUS,
a.APPLY_NO,
...
...
@@ -273,18 +270,11 @@
AND a.UPDATE_TIME = #{tEmployeeContractInfo.updateTime}
</if>
<if
test=
"tEmployeeContractInfo.unitId != null and tEmployeeContractInfo.unitId.trim() != ''"
>
AND a.UNIT_ID = #{tEmployeeContractInfo.unitId}
</if>
<if
test=
"tEmployeeContractInfo.unitName != null and tEmployeeContractInfo.unitName.trim() != ''"
>
AND a.UNIT_NAME like concat('%',#{tEmployeeContractInfo.unitName},'%')
</if>
<if
test=
"tEmployeeContractInfo.unitNo != null and tEmployeeContractInfo.unitNo.trim() != ''"
>
AND a.UNIT_NO = #{tEmployeeContractInfo.unitNo}
</if>
<if
test=
"tEmployeeContractInfo.deptName != null and tEmployeeContractInfo.deptName.trim() != ''"
>
AND a.DEPT_NAME like concat('%',#{tEmployeeContractInfo.deptName},'%')
</if>
<if
test=
"tEmployeeContractInfo.deptNo != null and tEmployeeContractInfo.deptNo.trim() != ''"
>
AND a.DEPT_NO = #{tEmployeeContractInfo.deptNo}
</if>
...
...
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