Commit ad4f670f authored by hongguangwu's avatar hongguangwu

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

parents ca61f129 cf2a3aca
......@@ -168,9 +168,9 @@
if(sum(if(a.IS_COMPLETE = '0',0,1)) > 0,1,0) as IS_COMPLETE,
sum(if(a.IS_COMPLETE = '0',0,1)) as INCOMPLETE_NUM,
concat(ROUND((count(a.EMP_IDCARD) - sum(if(a.IS_COMPLETE = '0',0,1)))*100/count(a.EMP_IDCARD),2),'%') as COMPLETE_PER,
sum(if(DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-06-01',1,0)) as AFTER_EMPLOYMENT,
if(sum(if(DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-06-01' and a.IS_COMPLETE = '0',1,0)) = 0,1,0) AFTER_IS_COMPLETE,
sum(if(DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-06-01' and a.IS_COMPLETE = '1',1,0)) as AFTER_INCOMPLETE_NUM,
sum(if(DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-05-01',1,0)) as AFTER_EMPLOYMENT,
if(sum(if((DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-05-01' and a.IS_COMPLETE = '0') or '2024-05-01' > DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d'),0,1)) > 0,1,0) AFTER_IS_COMPLETE,
sum(if(DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-05-01' and a.IS_COMPLETE = '1',1,0)) as AFTER_INCOMPLETE_NUM,
b.CREATE_NAME as ALERT_USER
from
t_employee_project a
......@@ -262,7 +262,7 @@
) e on a.EMP_ID = e.ID
left join t_emp_bad_record b on a.EMP_IDCARD = b.EMP_IDCARD
left join (select EMP_ID,sum(if(ifnull(HIGH_IDENTIFICATION,-1) != -1 and ifnull(SCHOOL,-1) != -1 and ifnull(MAJOR,-1) != -1 and ifnull(TYPE,-1) != -1 and ifnull(ENTRY_DATE,-1) != -1 and ifnull(GRADUTION_DATE,-1) != -1,1,0)) as count from t_emp_education a left join t_atta_info b on a.id = b.domain_id where a.DELETE_FLAG = '0' and b.RELATION_TYPE = '0' group by a.EMP_ID) c on a.EMP_ID = c.EMP_ID
left join (select EMP_ID,sum(if(ifnull(HIGH_IDENTIFICATION,-1) != -1 and ifnull(SCHOOL,-1) != -1 and ifnull(MAJOR,-1) != -1 and ifnull(ENTRY_DATE,-1) != -1 and ifnull(GRADUTION_DATE,-1) != -1,1,0)) as count from t_emp_education a left join t_atta_info b on a.id = b.domain_id where a.DELETE_FLAG = '0' and b.RELATION_TYPE = '0' group by a.EMP_ID) c on a.EMP_ID = c.EMP_ID
left join t_emp_contact_info d on a.EMP_IDCARD = d.EMP_IDCARD
left join t_emp_disability_info f on a.EMP_ID = f.EMP_ID and f.DELETE_FLAG = '1'
left join (select EMP_ID,sum(if(ifnull(RELATIONSHIP_SELF,-1) != -1 and ifnull(FAMILY_NAME,-1) != -1 and ifnull(CONTRACT_TEL,-1) != -1,1,0)) as count from t_emp_family where DELETE_FLAG = '1' group by EMP_ID) g on a.EMP_ID = g.EMP_ID
......
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