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
05a2988b
Commit
05a2988b
authored
May 09, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.22' into MVP1.7.22
parents
921d1ba4
3ac376eb
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
172 deletions
+13
-172
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+8
-1
TEmpContractAlertMapper.xml
...biz/src/main/resources/mapper/TEmpContractAlertMapper.xml
+3
-89
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+2
-82
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
05a2988b
...
...
@@ -149,6 +149,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
private
final
TEmployeeContractPreNewMapper
contractPreNewMapper
;
private
final
TEmpContractAlertMapper
contractAlertMapper
;
@Autowired
private
OSSUtil
ossUtil
;
...
...
@@ -4775,6 +4777,11 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
contractPreNewUpdateWrapper
.
eq
(
TEmployeeContractPreNew:
:
getEmpIdcard
,
emp
.
getEmpIdcard
())
.
set
(
TEmployeeContractPreNew:
:
getEmpPhone
,
empPhoneNew
);
contractPreNewMapper
.
update
(
null
,
contractPreNewUpdateWrapper
);
// 同步更新合同提醒对象(t_emp_contract_alert)
LambdaUpdateWrapper
<
TEmpContractAlert
>
contractAlertUpdateWrapper
=
new
LambdaUpdateWrapper
<>();
contractAlertUpdateWrapper
.
eq
(
TEmpContractAlert:
:
getEmpIdcard
,
emp
.
getEmpIdcard
())
.
set
(
TEmpContractAlert:
:
getEmpPhone
,
empPhoneNew
);
contractAlertMapper
.
update
(
null
,
contractAlertUpdateWrapper
);
return
R
.
ok
(
"更新成功!"
);
}
else
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpContractAlertMapper.xml
View file @
05a2988b
...
...
@@ -367,56 +367,13 @@
<!--tEmpContractAlert简单分页查询-->
<select
id=
"getTEmpContractAlertAutoPage"
resultMap=
"tEmpContractAlertAutoMap"
>
SELECT
a.ID,
a.EMP_NAME,
a.EMP_ID,
a.DEPT_ID,
a.PROJECT,
a.PROJECT_NO,
a.EMP_IDCARD,
a.EMP_CODE,
a.CONTRACT_START,
a.CONTRACT_END,
a.FILE_PROVINCE,
a.FILE_CITY,
a.FILE_TOWN,
a.EMP_TYPE,
a.CONTRACT_TYPE,
a.CONTRACT_TERM,
a.DAYS_DUE,
a.DUE_FLAG,
a.DAYS_OVER,
a.FIRST_ALERT_TIME,
a.ALERT_PERSON,
a.CREATE_BY,
a.UPDATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_TIME,
a.HANDLE_STATUS,
a.CONTRACT_ID,
a.AUDIT_TIME,
a.UNIT_ID,
a.UNIT_NAME,
a.UNIT_NO,
a.IS_FEEDBACK,
a.FEEDBACK_PERSON,
a.FEEDBACK_TIME,
a.FEEDBACK_REASON,
a.FEEDBACK_DETAIL,
a.APPLY_NO,
a.POST,
a.WORKING_HOURS,
a.CS_NAME,
a.CS_LOGIN_NAME,
a.AUTO_FLAG,
<include
refid=
"Base_Column_List"
/>
,
b.EXPECTED_COLLECTION_TIME,
b.SIGN_TYPE,
IFNULL(b.PROCESS_STATUS,'0') PROCESS_STATUS,
b.ERROR_INFO,
b.ERROR_TIME,
IFNULL(b.id,null) as 'preId',
IFNULL((SELECT c.EMP_PHONE FROM t_employee_info c WHERE c.EMP_IDCARD = a.EMP_IDCARD and c.DELETE_FLAG='0' LIMIT 1), a.EMP_PHONE) as EMP_PHONE
IFNULL(b.id,null) as 'preId'
FROM t_emp_contract_alert a
LEFT JOIN t_employee_contract_pre_new b on a.CONTRACT_ID = b.contract_id
<where>
...
...
@@ -439,50 +396,7 @@
<!--tEmpContractAlert简单分页查询-->
<select
id=
"listExport"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.vo.TEmpContractAlertExportVo"
>
SELECT
a.ID,
a.EMP_NAME,
a.EMP_ID,
a.DEPT_ID,
a.PROJECT,
a.PROJECT_NO,
a.EMP_IDCARD,
a.EMP_CODE,
a.CONTRACT_START,
a.CONTRACT_END,
a.FILE_PROVINCE,
a.FILE_CITY,
a.FILE_TOWN,
a.EMP_TYPE,
a.CONTRACT_TYPE,
a.CONTRACT_TERM,
a.DAYS_DUE,
a.DUE_FLAG,
a.DAYS_OVER,
a.FIRST_ALERT_TIME,
a.ALERT_PERSON,
a.CREATE_BY,
a.UPDATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_TIME,
a.HANDLE_STATUS,
a.CONTRACT_ID,
a.AUDIT_TIME,
a.UNIT_ID,
a.UNIT_NAME,
a.UNIT_NO,
IFNULL((SELECT c.EMP_PHONE FROM t_employee_info c WHERE c.EMP_IDCARD = a.EMP_IDCARD and c.DELETE_FLAG='0' LIMIT 1), a.EMP_PHONE) as EMP_PHONE,
a.IS_FEEDBACK,
a.FEEDBACK_PERSON,
a.FEEDBACK_TIME,
a.FEEDBACK_REASON,
a.FEEDBACK_DETAIL,
a.APPLY_NO,
a.POST,
a.WORKING_HOURS,
a.CS_NAME,
a.CS_LOGIN_NAME,
a.AUTO_FLAG,
<include
refid=
"Base_Column_List"
/>
,
b.EXPECTED_COLLECTION_TIME,
b.SIGN_TYPE,
IFNULL(b.PROCESS_STATUS,'0') PROCESS_STATUS,
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
05a2988b
...
...
@@ -285,88 +285,8 @@
<!--tEmployeeContractPre简单分页查询-->
<select
id=
"getTEmployeeContractPrePage"
resultMap=
"tEmployeeContractPreMap"
>
SELECT
a.id
,a.dept_name
,a.dept_no
,a.dept_id
,a.employee_name
,a.emp_idcard
,a.position
,a.join_leave_date
,a.contract_type
,a.process_status
,a.signatory
,a.customer_username
,a.customer_user_loginname
,a.sign_type
,a.fadada_template
,a.fadada_template_id
,a.data_source
,a.expected_confirm_time
,a.expected_collection_time
,a.contract_start
,a.contract_end
,a.situation
,a.try_period_start
,a.try_period_end
,a.config_name
,a.update_flag
,a.try_period_type
,a.try_period
,a.salary_type
,a.salary_standard_per_hour
,a.salary_standard_per_piece
,a.config_id
,a.working_dept
,a.working_company
,a.risk_buy_desc
,a.other_wage
,a.labor_cost
,a.default_amount
,a.settlement_cycle
,a.payment_time
,a.payment_type
,a.dispatch_period_start
,a.dispatch_period_end
,a.work_type
,a.work_day_count
,a.work_day
,a.work_hours
,a.other_work_day
,a.internship_period
,a.internship_period_start
,a.internship_period_end
,a.post_type
,a.post
,a.work_address
,a.contract_term
,a.contract_duration_year
,a.contract_duration_month
,a.register_id
,a.sign_flag
,a.error_info
,a.contract_id
,a.revoke_reason
,a.working_reward
,a.working_hours
,a.dispatch_period_year
,a.dispatch_period_month
,a.error_time
,a.contract_end_type
,a.confirm_emp_select
,a.timeout_elec_sign
,a.update_time
,a.create_by
,a.create_name
,a.create_time
,a.update_by
,a.TASK
,a.TASK_TYPE
,a.TASK_END_STANDARD,a.contract_flag,a.CONTRACT_SUB_NAME
,a.request_id
,a.request_msg,a.over_flag,a.change_type_reason,a.change_type_user,a.change_type_time,a.SALARY_DAY
<include
refid=
"Base_Column_List"
/>
,if(b.id is null,'1','0') archives_is_create
,IFNULL((SELECT c.EMP_PHONE FROM t_employee_info c WHERE c.EMP_IDCARD = a.emp_idcard and c.DELETE_FLAG='0' LIMIT 1), a.emp_phone) as emp_phone
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'
...
...
@@ -432,7 +352,7 @@
a.dept_no,
a.employee_name,
a.emp_idcard,
IFNULL((SELECT c.EMP_PHONE FROM t_employee_info c WHERE c.EMP_IDCARD = a.emp_idcard and c.DELETE_FLAG='0' LIMIT 1), a.emp_phone) as empP
hone,
a.emp_p
hone,
a.position,
DATE_FORMAT(a.join_leave_date,'%Y-%m-%d') join_leave_date,
a.contract_type,
...
...
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