Commit 1b588f6d authored by hongguangwu's avatar hongguangwu

MVP1.6.9-社保自动化日志

parent e7bccde8
...@@ -2225,7 +2225,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2225,7 +2225,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
headList.add(this.getNewArrayList(new String[]{"提交时间", "提交时间"})); headList.add(this.getNewArrayList(new String[]{"提交时间", "提交时间"}));
headList.add(this.getNewArrayList(new String[]{"状态", "状态"})); headList.add(this.getNewArrayList(new String[]{"状态", "状态"}));
headList.add(this.getNewArrayList(new String[]{"审核人", "审核人"})); headList.add(this.getNewArrayList(new String[]{"审核人", "审核人"}));
headList.add(this.getNewArrayList(new String[]{"审核通过时间", "审核通过时间"})); headList.add(this.getNewArrayList(new String[]{"审核时间", "审核时间"}));
String oneTitle = "员工基本信息"; String oneTitle = "员工基本信息";
headList.add(this.getNewArrayList(new String[]{oneTitle, "员工主码"})); headList.add(this.getNewArrayList(new String[]{oneTitle, "员工主码"}));
headList.add(this.getNewArrayList(new String[]{oneTitle, "员工类型"})); headList.add(this.getNewArrayList(new String[]{oneTitle, "员工类型"}));
......
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
<select id="getTPreEmpMainAllList" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TPreMainExportAllVO"> <select id="getTPreEmpMainAllList" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TPreMainExportAllVO">
SELECT SELECT
case a.STATUS when '0' then '草稿' when '1' then '待完善' when '2' then '待审核' when '3' then '审核不通过' when '4' then '审核通过' else '-' end field1 case a.STATUS when '0' then '草稿' when '1' then '待完善' when '2' then '待审核' when '3' then '审核不通过' when '4' then '审核通过' else '-' end field1
,DATE_FORMAT(a.create_time,'%Y-%m-%d %H:%i:%s') field2,a.AUDIT_NAME field64,DATE_FORMAT(a.AUDIT_TIME,'%Y-%m-%d %H:%i:%s') field65 ,DATE_FORMAT(a.create_time,'%Y-%m-%d %H:%i:%s') field2,if(a.STATUS in ('3','4'),a.AUDIT_NAME,'') field64,if(a.STATUS in ('3','4'),DATE_FORMAT(a.AUDIT_TIME,'%Y-%m-%d %H:%i:%s')) field65
,e.EMP_CODE field3,emp_natrue.label field4,a.emp_name field5,a.emp_idcard field6 ,e.EMP_CODE field3,emp_natrue.label field4,a.emp_name field5,a.emp_idcard field6
,if(e.EMP_SEX='2','女',if(e.EMP_SEX='1','男','-')) field7 ,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 ,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