Commit 7c42f7f8 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.8' into MVP1.7.8

parents 663f5d52 838411b1
......@@ -213,8 +213,8 @@
a.DEPT_NAME as dept_name,
a.DEPT_NO as dept_no,
a.CONTRACT_TYPE as contract_type,
if(ifnull(CONTRACT_TYPE,-1) != -1 and ifnull(WORKING_HOURS,-1) != -1
and ifnull(POST,-1) != -1 and ifnull(ENJOIN_DATE,-1) != -1 and ifnull(TRY_PERIOD,-1) != -1,'基本信息','合同信息') as type,
if(ifnull(CONTRACT_TYPE,-1) != -1 and CONTRACT_TYPE !='' and ifnull(WORKING_HOURS,-1) != -1 and WORKING_HOURS !=''
and ifnull(POST,-1) != -1 and POST !='' and ifnull(ENJOIN_DATE,-1) != -1 and ifnull(TRY_PERIOD,-1) != -1 and TRY_PERIOD !='' ,'基本信息','合同信息') as type,
'待完善' as process_status,
DATE_FORMAT(a.ENJOIN_DATE, '%Y-%m-%d') as join_leave_date,
CASE WHEN a.PROJECT_SOURCE='1' THEN "社保/公积金"
......
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