Commit 89ce1bd8 authored by hongguangwu's avatar hongguangwu

MVP1.6.6-预入职相关_导出优化

parent f1751fde
......@@ -1305,10 +1305,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
if (Common.isNotNull(preInfo.getOldId())) {
info.setId(preInfo.getOldId());
tEmpWorkRecordingService.updateById(info);
} else {
tEmpWorkRecordingService.save(info);
}
tEmpWorkRecordingService.save(info);
}
}
// 预入职-附件
......
......@@ -308,7 +308,7 @@
<!--导出统计list-->
<select id="getTEmpMainAllList" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TMainExportAllVO">
SELECT
if(a.IS_COMPLETE=0,'是','否') field1
if(p.IS_COMPLETE=0,'是','否') field1
,DATE_FORMAT(p.create_time,'%Y-%m-%d') field2,e.EMP_CODE field3,emp_natrue.label field4,e.emp_name field5,e.emp_idcard field6
,if(e.EMP_SEX='2','女',if(e.EMP_SEX='1','男','-')) field7
,if(e.VALIDITY_END is null,'-',if(e.VALIDITY_END > '2999-12-30','长期','固定')) field8 ,e.VALIDITY_START field9
......
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