MVP1.6.9-审核时间

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TPreMainExportAllVO.java

@@ -34,10 +34,16 @@ public class TPreMainExportAllVO {
 	private static final long serialVersionUID = 1L;
 
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty(value = "状态")
-	private String field1;
+
 	@ExcelProperty(value = "提交时间")
 	private String field2;
+	@ExcelProperty(value = "状态")
+	private String field1;
+	@ExcelProperty(value = "审核人")
+	private String field64;
+	@ExcelProperty(value = "审核通过时间")
+	private String field65;
+
 	@ExcelProperty(value = "员工主码")
 	private String field3;
 	@ExcelProperty(value = "员工类型")

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java

@@ -2222,8 +2222,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 			} else {
 				// 这里 需要指定写用哪个class去写，然后写到第一个sheet，然后文件流会自动关闭
 				List<List<String>> headList = Lists.newArrayList();
-				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 = "员工基本信息";
 				headList.add(this.getNewArrayList(new String[]{oneTitle, "员工主码"}));
 				headList.add(this.getNewArrayList(new String[]{oneTitle, "员工类型"}));

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmpMainMapper.xml

@@ -292,7 +292,8 @@
 	<select id="getTPreEmpMainAllList" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TPreMainExportAllVO">
 		SELECT
 			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') field2,e.EMP_CODE field3,emp_natrue.label field4,a.emp_name field5,a.emp_idcard field6
+			,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
+		     ,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.VALIDITY_END is null,'-',if(e.VALIDITY_END > '2999-12-30','长期','固定')) field8	,e.VALIDITY_START field9
 			,if(e.VALIDITY_END > '2999-12-30','长期',e.VALIDITY_END) field10,e.EMP_BIRTHDAY field11,e.EMP_AGE field12	,emp_married.label field13,nation.label field14