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
d7027e17
Commit
d7027e17
authored
Dec 21, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.2' into MVP1.2
parents
c1837f1c
f2f3c5f0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
5 deletions
+15
-5
EmployeeProjectExportParamVO.java
...lus/v1/yifu/archives/vo/EmployeeProjectExportParamVO.java
+8
-0
EmployeeProjectExportVO.java
...oud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
+3
-3
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+1
-1
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+3
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportParamVO.java
View file @
d7027e17
...
@@ -450,6 +450,14 @@ public class EmployeeProjectExportParamVO extends BaseEntity {
...
@@ -450,6 +450,14 @@ public class EmployeeProjectExportParamVO extends BaseEntity {
@ExcelProperty
(
value
=
"项目档案状态"
)
@ExcelProperty
(
value
=
"项目档案状态"
)
private
String
status
;
private
String
status
;
/**
* 项目档案状态
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"项目档案状态"
)
@ExcelAttribute
(
name
=
"项目档案状态"
)
private
String
projectStatusReplace
;
/**
/**
* 社保-省
* 社保-省
*/
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
View file @
d7027e17
...
@@ -442,12 +442,12 @@ public class EmployeeProjectExportVO {
...
@@ -442,12 +442,12 @@ public class EmployeeProjectExportVO {
private
String
projectSource
;
private
String
projectSource
;
/**
/**
* 项目档案状态(0
草稿、1已审核
)
* 项目档案状态(0
=正常,1=已减项
)
*/
*/
@ExcelAttribute
(
name
=
"项目档案状态"
,
readConverterExp
=
"0=草稿,1=已审核"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"项目档案状态"
)
@ExcelProperty
(
value
=
"项目档案状态"
)
private
String
status
;
@ExcelAttribute
(
name
=
"项目档案状态"
,
isDataId
=
true
,
readConverterExp
=
"0=正常,1=已减项"
)
private
Integer
projectStatus
;
/**
/**
* 项目档案创建人
* 项目档案创建人
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
d7027e17
...
@@ -407,7 +407,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -407,7 +407,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(
contractCount
>
CommonConstants
.
ZERO_INT
){
if
(
contractCount
>
CommonConstants
.
ZERO_INT
){
errorTemp
.
append
(
"合同可用或在途、"
);
errorTemp
.
append
(
"合同可用或在途、"
);
}
}
if
(
Common
.
isNotNull
(
errorTemp
)){
if
(
Common
.
isNotNull
(
errorTemp
.
toString
()
)){
return
R
.
failed
(
errorTemp
.
substring
(
0
,
errorTemp
.
length
()-
1
)
+
",禁止减项"
);
return
R
.
failed
(
errorTemp
.
substring
(
0
,
errorTemp
.
length
()-
1
)
+
",禁止减项"
);
}
}
tEmployeeProject
.
setProjectStatus
(
CommonConstants
.
dingleDigitIntArray
[
1
]);
tEmployeeProject
.
setProjectStatus
(
CommonConstants
.
dingleDigitIntArray
[
1
]);
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
d7027e17
...
@@ -103,7 +103,6 @@
...
@@ -103,7 +103,6 @@
<result
property=
"empNatrue"
column=
"EMP_NATRUE"
/>
<result
property=
"empNatrue"
column=
"EMP_NATRUE"
/>
<result
property=
"proCreateName"
column=
"PROCREATE_NAME"
/>
<result
property=
"proCreateName"
column=
"PROCREATE_NAME"
/>
<result
property=
"proCreateTime"
column=
"PROCREATE_TIME"
/>
<result
property=
"proCreateTime"
column=
"PROCREATE_TIME"
/>
<result
property=
"status"
column=
"STATUS"
/>
<result
property=
"fileProvince"
column=
"FILE_PROVINCE"
/>
<result
property=
"fileProvince"
column=
"FILE_PROVINCE"
/>
<result
property=
"fileCity"
column=
"FILE_CITY"
/>
<result
property=
"fileCity"
column=
"FILE_CITY"
/>
<result
property=
"fileTown"
column=
"FILE_TOWN"
/>
<result
property=
"fileTown"
column=
"FILE_TOWN"
/>
...
@@ -435,6 +434,9 @@
...
@@ -435,6 +434,9 @@
<if
test=
"tEmployeeProject.empIdcard != null and tEmployeeProject.empIdcard.trim() != ''"
>
<if
test=
"tEmployeeProject.empIdcard != null and tEmployeeProject.empIdcard.trim() != ''"
>
AND a.EMP_IDCARD like concat('%',#{tEmployeeProject.empIdcard},'%')
AND a.EMP_IDCARD like concat('%',#{tEmployeeProject.empIdcard},'%')
</if>
</if>
<if
test=
"tEmployeeProject.projectStatusReplace != null and tEmployeeProject.projectStatusReplace.trim() != ''"
>
AND a.PROJECT_STATUS = #{tEmployeeProject.projectStatusReplace}
</if>
<if
test=
"tEmployeeProject.bankName != null and tEmployeeProject.bankName.trim() != ''"
>
<if
test=
"tEmployeeProject.bankName != null and tEmployeeProject.bankName.trim() != ''"
>
AND a.BANK_NAME = #{tEmployeeProject.bankName}
AND a.BANK_NAME = #{tEmployeeProject.bankName}
</if>
</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