人员花名册

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPersonnelRoster.java

@@ -163,13 +163,11 @@ public class TPersonnelRoster extends BaseEntity {
 	/**
 	 * 出生日期
 	 */
-	@DateTimeFormat("yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd")
 	@ExcelAttribute(name = "出生日期", isDate = true)
 	@ExcelProperty("出生日期")
 	@Schema(description = "出生日期")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	private Date empBirthDate;
+	private String empBirthDate;
 	/**
 	 * 年龄
 	 */

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

@@ -164,7 +164,7 @@ public class TPersonnelRosterServiceImpl extends ServiceImpl<TPersonnelRosterMap
 			TSalaryEmpRosterVo rosterVo;
 			for (int i = 0; i <= count; ) {
 				searchVo.setLimitStart(i);
-				searchVo.setLimitEnd(CommonConstants.BATCH_COUNT);
+				searchVo.setLimitEnd(CommonConstants.ONE_THOUSAND_INT);
 				list = baseMapper.getTPersonnelRoster(searchVo);
 				if (Common.isNotNull(list)){
 					// 处理薪资信息
@@ -193,7 +193,7 @@ public class TPersonnelRosterServiceImpl extends ServiceImpl<TPersonnelRosterMap
 					}
 				}
 
-				i = i + CommonConstants.BATCH_COUNT;
+				i = i + CommonConstants.ONE_THOUSAND_INT;
 				if (Common.isNotNull(list)){
 					list.clear();
 				}

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

@@ -328,7 +328,7 @@
 		select p.UNIT_NAME as 'CUSTOMER_NAME',p.DEPT_NAME as 'DEPART_NAME',p.DEPT_NO as 'DEPART_NO',
 				d.BUSINESS_PRIMARY_TYPE as 'BUSINESS_PRIMARY',d.BUSINESS_SECOND_TYPE as 'BUSINESS_SECOND',d.BUSINESS_THIRD_TYPE as 'BUSINESS_THIRD',
 				p.EMP_LABEL as 'LABEL',d.LINE_TYPE as 'BUSINESS_TYPE',d.BU_BELONG as 'BU_BELONG',c1.EMP_NATRUE as 'EMP_TYPE',
-				e.EMP_NAME as 'EMP_NAME',e.EMP_SEX as 'EMP_SEX',e.EMP_BIRTHDAY as 'EMP_BIRTH_DATE',e.EMP_AGE as 'EMP_AGE',e.EMP_IDCARD as 'EMP_IDCARD',
+				e.EMP_NAME as 'EMP_NAME',e.EMP_SEX as 'EMP_SEX',DATE_FORMAT(e.EMP_BIRTHDAY ,"%Y-%m-%d")  as 'EMP_BIRTH_DATE',e.EMP_AGE as 'EMP_AGE',e.EMP_IDCARD as 'EMP_IDCARD',
 				e.EMP_PHONE as 'EMP_PHONE',c1.FILE_PROVINCE as 'EMP_PROVINCE',c1.FILE_CITY as 'EMP_CITY',c1.FILE_TOWN as 'EMP_TOWN',
 				p.SOCIAL_PROVINCE as 'SOCIAL_PROVINCE',p.SOCIAL_CITY as 'SOCIAL_CITY',p.SOCIAL_TOWN as 'SOCIAL_TOWN',c1.APPLY_NO as 'CONTRACT_APPLY_NO',
 				c1.CONTRACT_START as 'CONTRACT_START',c1.CONTRACT_END as 'CONTRACT_END',c1.CONTRACT_NAME as 'CONTRACT_TYPE',c1.CONTRACT_SUB_NAME as 'BUSINESS_DETAIL',
@@ -352,7 +352,7 @@
 	<select id="getTPersonnelRosterCount" resultType="java.lang.Integer">
 		select count(1)
 		from
-			(select  MAX(c.CREATE_TIME),c.id,c.EMP_IDCARD,c.DEPT_NO from t_employee_contract_info c WHERE c.IN_USE = 0 and c.DELETE_FLAG='0' and c.IS_OBSOLETE='0'
+			(select  MAX(c.CREATE_TIME),c.id,c.EMP_IDCARD,c.DEPT_NO from t_employee_contract_info c WHERE c.IN_USE = 0 and c.DELETE_FLAG='0'
 			 GROUP BY c.DEPT_NO,c.EMP_IDCARD) t
 				INNER JOIN t_employee_info e on e.EMP_IDCARD=t.EMP_IDCARD
 				INNER JOIN t_employee_project p on p.EMP_IDCARD=t.EMP_IDCARD and p.DEPT_NO=t.DEPT_NO