Commit afb1b170 authored by fangxinjiang's avatar fangxinjiang

发大大手机号码取值回退-fxj

parent 851370fb
......@@ -373,11 +373,9 @@
IFNULL(b.PROCESS_STATUS,'0') PROCESS_STATUS,
b.ERROR_INFO,
b.ERROR_TIME,
IFNULL(b.id,null) as 'preId',
IFNULL(c.EMP_PHONE, 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
LEFT JOIN t_employee_info c on a.EMP_ID = c.id
<where>
1=1
<include refid="tEmpContractAlert_where"/>
......@@ -398,57 +396,13 @@
<!--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(c.EMP_PHONE, 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,
case when PROCESS_STATUS='5' then b.error_info else '' end as error_info
FROM t_emp_contract_alert a
LEFT JOIN t_employee_contract_pre_new b on a.CONTRACT_ID = b.contract_id
LEFT JOIN t_employee_info c on a.EMP_ID = c.id
<where>
1=1
<include refid="tEmpContractAlert_where"/>
......
......@@ -287,11 +287,9 @@
SELECT
<include refid="Base_Column_List"/>
,if(b.id is null,'1','0') archives_is_create
,c.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'
left join t_employee_info c on b.EMP_ID = c.id
<where>
1=1
<include refid="tEmployeeContractPre_where"/>
......@@ -354,7 +352,7 @@
a.dept_no,
a.employee_name,
a.emp_idcard,
c.EMP_PHONE as empPhone,
a.emp_phone,
a.position,
DATE_FORMAT(a.join_leave_date,'%Y-%m-%d') join_leave_date,
a.contract_type,
......@@ -382,7 +380,6 @@
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'
left join t_employee_info c on b.EMP_ID = c.id
<where>
1=1
<include refid="tEmployeeContractPre_where"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment