Commit 558ea0b9 authored by fangxinjiang's avatar fangxinjiang

数据库调整

parent a2eab649
...@@ -939,9 +939,10 @@ ...@@ -939,9 +939,10 @@
a.ID, a.ID,
a.EMP_NAME, a.EMP_NAME,
a.EMP_IDCARD, a.EMP_IDCARD,
case when a.EMP_TYPE = 1 then "标准工时" case when a.EMP_TYPE = 0 then "外包"
when a.EMP_TYPE = 2 then "综合工时" when a.EMP_TYPE = 1 then "派遣"
when a.EMP_TYPE = 3 then "不定时工时制" when a.EMP_TYPE = 2 then "代理"
when a.EMP_TYPE = 3 then "内部员工"
else null end as "EMP_TYPE" , else null end as "EMP_TYPE" ,
d.EMP_MOBILE, d.EMP_MOBILE,
if(a.SETTLE_DOMAIN_CODE = a.SETTLE_DOMAIN_CODE_FUND,a.SETTLE_DOMAIN_CODE,concat(ifnull(a.SETTLE_DOMAIN_CODE,""),if(a.SETTLE_DOMAIN_CODE is null or a.SETTLE_DOMAIN_CODE_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_CODE_FUND,""))) SETTLE_DOMAIN_CODE, if(a.SETTLE_DOMAIN_CODE = a.SETTLE_DOMAIN_CODE_FUND,a.SETTLE_DOMAIN_CODE,concat(ifnull(a.SETTLE_DOMAIN_CODE,""),if(a.SETTLE_DOMAIN_CODE is null or a.SETTLE_DOMAIN_CODE_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_CODE_FUND,""))) SETTLE_DOMAIN_CODE,
...@@ -956,7 +957,10 @@ ...@@ -956,7 +957,10 @@
d3.AREA_NAME as "FILE_TOWN", d3.AREA_NAME as "FILE_TOWN",
d.POST, d.POST,
d.TRY_PERIOD, d.TRY_PERIOD,
d.WORKING_HOURS, case when d.WORKING_HOURS = 1 then "标准工时"
when d.WORKING_HOURS = 2 then "综合工时"
when d.WORKING_HOURS = 3 then "不定时工时制"
else null end as "WORKING_HOURS" ,
d.CONTRACT_NAME, d.CONTRACT_NAME,
d.CONTRACT_SUB_NAME, d.CONTRACT_SUB_NAME,
a.SOCIAL_HOUSEHOLD_NAME CONTRACT_PARTY, a.SOCIAL_HOUSEHOLD_NAME CONTRACT_PARTY,
......
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