Commit a5dfe9b6 authored by hongguangwu's avatar hongguangwu

MVP1.6.4-优化社保士兵, 列信息

parent 1b5a65b5
...@@ -1230,7 +1230,7 @@ ...@@ -1230,7 +1230,7 @@
case s.ygs_Handle_Status when '0' then '无' when '1' then '待办理' when '2' then '自动办理中' when '3' then '继续办理' when '4' then '中止办理' when '5' then '人工处理' when '6' then '成功' else '-' end ygsHandleStatus, case s.ygs_Handle_Status when '0' then '无' when '1' then '待办理' when '2' then '自动办理中' when '3' then '继续办理' when '4' then '中止办理' when '5' then '人工处理' when '6' then '成功' else '-' end ygsHandleStatus,
case s.ysd_Handle_Status when '0' then '无' when '1' then '待办理' when '2' then '自动办理中' when '3' then '继续办理' when '4' then '中止办理' when '5' then '人工处理' when '6' then '成功' else '-' end ysdHandleStatus, case s.ysd_Handle_Status when '0' then '无' when '1' then '待办理' when '2' then '自动办理中' when '3' then '继续办理' when '4' then '中止办理' when '5' then '人工处理' when '6' then '成功' else '-' end ysdHandleStatus,
s.YGS_REMARK ygsRemark,s.YSD_REMARK ysdRemark, s.YGS_REMARK ygsRemark,s.YSD_REMARK ysdRemark,
a.DISPATCH_CODE dispatchCode, a.APPLY_NO dispatchCode,
a.EMP_NAME empName, a.EMP_NAME empName,
a.EMP_IDCARD empIdcard, a.EMP_IDCARD empIdcard,
emp_natrue.label empType, emp_natrue.label empType,
...@@ -1241,7 +1241,7 @@ ...@@ -1241,7 +1241,7 @@
concat(if(ifnull(h.id,0) != '0',sp1.AREA_NAME,sp2.AREA_NAME), concat(if(ifnull(h.id,0) != '0',sp1.AREA_NAME,sp2.AREA_NAME),
ifnull(if(ifnull(h.id,0) != '0',sc1.AREA_NAME,sc2.AREA_NAME),''), ifnull(if(ifnull(h.id,0) != '0',sc1.AREA_NAME,sc2.AREA_NAME),''),
ifnull(if(ifnull(h.id,0) != '0',st1.AREA_NAME,st2.AREA_NAME),'')) socialProvince, ifnull(if(ifnull(h.id,0) != '0',st1.AREA_NAME,st2.AREA_NAME),'')) socialProvince,
a.LEAVE_DATE leaveDate, DATE_FORMAT(a.LEAVE_DATE,'%Y-%m-%d') leaveDate,
a.DISPATCH_ITEM dispatchItem, a.DISPATCH_ITEM dispatchItem,
a.CREATE_NAME createUserName, a.CREATE_NAME createUserName,
a.ORGAN_NAME organName, a.ORGAN_NAME organName,
......
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