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
2bfbc465
Commit
2bfbc465
authored
Oct 21, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
78dd39a9
7201f309
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
94 additions
and
82 deletions
+94
-82
TEmployeeContractPreExportVo.java
...lus/v1/yifu/archives/vo/TEmployeeContractPreExportVo.java
+5
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+2
-1
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+87
-81
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPreExportVo.java
View file @
2bfbc465
...
@@ -99,4 +99,9 @@ public class TEmployeeContractPreExportVo implements Serializable {
...
@@ -99,4 +99,9 @@ public class TEmployeeContractPreExportVo implements Serializable {
@Schema
(
description
=
"状态"
)
@Schema
(
description
=
"状态"
)
@ExcelProperty
(
"状态"
)
@ExcelProperty
(
"状态"
)
private
String
processStatus
;
private
String
processStatus
;
@ExcelAttribute
(
name
=
"是否已建档"
)
@Schema
(
description
=
"是否已建档"
)
@ExcelProperty
(
"是否已建档"
)
private
String
archivesIsCreate
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
2bfbc465
...
@@ -545,7 +545,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -545,7 +545,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
socialInfoStatus
)
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
socialInfoStatus
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractPre
))
{
if
(
Common
.
isNotNull
(
contractPre
))
{
contractPre
.
setProcessStatus
(
CommonConstants
.
TWO_STRING
);
contractPre
.
setProcessStatus
(
"1"
.
equals
(
contractPre
.
getSignType
())
?
CommonConstants
.
TWO_STRING
:
CommonConstants
.
SIX_STRING
);
contractPre
.
setContractId
(
tEmployeeContractInfo
.
getId
());
contractPre
.
setContractId
(
tEmployeeContractInfo
.
getId
());
contractPre
.
setErrorInfo
(
""
);
contractPre
.
setErrorInfo
(
""
);
contractPre
.
setErrorTime
(
null
);
contractPre
.
setErrorTime
(
null
);
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
2bfbc465
...
@@ -95,87 +95,87 @@
...
@@ -95,87 +95,87 @@
<result
property=
"archivesIsCreate"
column=
"archives_is_create"
/>
<result
property=
"archivesIsCreate"
column=
"archives_is_create"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
id
a.
id
,dept_name
,
a.
dept_name
,dept_no
,
a.
dept_no
,dept_id
,
a.
dept_id
,employee_name
,
a.
employee_name
,emp_idcard
,
a.
emp_idcard
,emp_phone
,
a.
emp_phone
,position
,
a.
position
,join_leave_date
,
a.
join_leave_date
,contract_type
,
a.
contract_type
,process_status
,
a.
process_status
,signatory
,
a.
signatory
,customer_username
,
a.
customer_username
,customer_user_loginname
,
a.
customer_user_loginname
,sign_type
,
a.
sign_type
,fadada_template
,
a.
fadada_template
,fadada_template_id
,
a.
fadada_template_id
,data_source
,
a.
data_source
,expected_confirm_time
,
a.
expected_confirm_time
,expected_collection_time
,
a.
expected_collection_time
,contract_start
,
a.
contract_start
,contract_end
,
a.
contract_end
,situation
,
a.
situation
,try_period_start
,
a.
try_period_start
,try_period_end
,
a.
try_period_end
,config_name
,
a.
config_name
,update_flag
,
a.
update_flag
,try_period_type
,
a.
try_period_type
,try_period
,
a.
try_period
,salary_type
,
a.
salary_type
,salary_standard_per_hour
,
a.
salary_standard_per_hour
,salary_standard_per_piece
,
a.
salary_standard_per_piece
,config_id
,
a.
config_id
,working_dept
,
a.
working_dept
,working_company
,
a.
working_company
,risk_buy_desc
,
a.
risk_buy_desc
,other_wage
,
a.
other_wage
,labor_cost
,
a.
labor_cost
,default_amount
,
a.
default_amount
,settlement_cycle
,
a.
settlement_cycle
,payment_time
,
a.
payment_time
,payment_type
,
a.
payment_type
,dispatch_period_start
,
a.
dispatch_period_start
,dispatch_period_end
,
a.
dispatch_period_end
,work_type
,
a.
work_type
,work_day_count
,
a.
work_day_count
,work_day
,
a.
work_day
,work_hours
,
a.
work_hours
,other_work_day
,
a.
other_work_day
,internship_period
,
a.
internship_period
,internship_period_start
,
a.
internship_period_start
,internship_period_end
,
a.
internship_period_end
,post_type
,
a.
post_type
,post
,
a.
post
,work_address
,
a.
work_address
,contract_term
,
a.
contract_term
,contract_duration_year
,
a.
contract_duration_year
,contract_duration_month
,
a.
contract_duration_month
,register_id
,
a.
register_id
,sign_flag
,
a.
sign_flag
,error_info
,
a.
error_info
,contract_id
,
a.
contract_id
,revoke_reason
,
a.
revoke_reason
,working_reward
,
a.
working_reward
,working_hours
,
a.
working_hours
,dispatch_period_year
,
a.
dispatch_period_year
,dispatch_period_month
,
a.
dispatch_period_month
,error_time
,
a.
error_time
,contract_end_type
,
a.
contract_end_type
,confirm_emp_select
,
a.
confirm_emp_select
,timeout_elec_sign
,
a.
timeout_elec_sign
,update_time
,
a.
update_time
,create_by
,
a.
create_by
,create_name
,
a.
create_name
,create_time
,
a.
create_time
,update_by
,
a.
update_by
,TASK
,
a.
TASK
,TASK_TYPE
,
a.
TASK_TYPE
,
TASK_END_STANDARD,
contract_flag,a.CONTRACT_SUB_NAME
,
a.TASK_END_STANDARD,a.
contract_flag,a.CONTRACT_SUB_NAME
,a.request_id
,a.request_id
,a.request_msg,a.over_flag,a.change_type_reason,a.change_type_user,a.change_type_time
,a.archives_is_create
,a.request_msg,a.over_flag,a.change_type_reason,a.change_type_user,a.change_type_time
</sql>
</sql>
<sql
id=
"tEmployeeContractPre_where"
>
<sql
id=
"tEmployeeContractPre_where"
>
<if
test=
"tEmployeeContractPre != null"
>
<if
test=
"tEmployeeContractPre != null"
>
...
@@ -276,7 +276,10 @@
...
@@ -276,7 +276,10 @@
<select
id=
"getTEmployeeContractPrePage"
resultMap=
"tEmployeeContractPreMap"
>
<select
id=
"getTEmployeeContractPrePage"
resultMap=
"tEmployeeContractPreMap"
>
SELECT
SELECT
<include
refid=
"Base_Column_List"
/>
<include
refid=
"Base_Column_List"
/>
,if(b.id is null,'1','0') archives_is_create
FROM t_employee_contract_pre a
FROM t_employee_contract_pre a
left join t_employee_project b on a.emp_idcard = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
and b.PROJECT_STATUS = 0 and b.DELETE_FLAG = '0'
<where>
<where>
1=1
1=1
<include
refid=
"tEmployeeContractPre_where"
/>
<include
refid=
"tEmployeeContractPre_where"
/>
...
@@ -334,8 +337,11 @@
...
@@ -334,8 +337,11 @@
WHEN a.process_status =6 THEN "签署中"
WHEN a.process_status =6 THEN "签署中"
WHEN a.process_status =7 THEN "签署失败"
WHEN a.process_status =7 THEN "签署失败"
WHEN a.process_status =8 THEN "电子待归档"
WHEN a.process_status =8 THEN "电子待归档"
ELSE a.process_status END as process_status
ELSE a.process_status END as process_status,
if(b.id is null,'否','是') archives_is_create
FROM t_employee_contract_pre a
FROM t_employee_contract_pre a
left join t_employee_project b on a.emp_idcard = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
and b.PROJECT_STATUS = 0 and b.DELETE_FLAG = '0'
<where>
<where>
1=1
1=1
<include
refid=
"tEmployeeContractPre_where"
/>
<include
refid=
"tEmployeeContractPre_where"
/>
...
...
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