Commit f31a038b authored by fangxinjiang's avatar fangxinjiang

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

parents 1eba6568 9a2245a2
......@@ -235,6 +235,7 @@ public class EmployeeProjectExportVO {
/**
* 人员档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬)
* 人员档案来源(字典:1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入、6电子签,7:预入职)
*/
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "人员档案来源")
......
......@@ -238,6 +238,15 @@
b.ADMISSION_DATE,
b.GRADUTION_DATE,
b.REMARK,
case b.FILE_SOURCE
when 1 then '派单'
when 2 then '薪酬'
when 3 then '商险'
when 4 then '档案新建'
when 5 then '批量导入'
when 6 then '电子签'
when 7 then '预入职'
else '-' end FILE_SOURCE,
if(a.STATUS='0','草稿',IF(a.PROJECT_STATUS=1,'已减项','已审核')) PROJECT_STATUS,
a.CREATE_NAME,
a.CREATE_TIME,
......
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