导出优化

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java

@@ -162,18 +162,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			int index = 0;
 			if (count > CommonConstants.ZERO_INT) {
 				WriteSheet writeSheet;
-				ExcelUtil<TPaymentInfoBatchVo> util;
 				for (int i = 0; i <= count; i += CommonConstants.EXCEL_EXPORT_LIMIT) {
 					// 获取实际记录
 					searchVo.setLimitStart(i);
 					searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
 					list = baseMapper.getTPaymentInfoNoPage(searchVo);
-					if (Common.isNotNull(list)) {
-						util = new ExcelUtil<>(TPaymentInfoBatchVo.class);
-						for (TPaymentInfoBatchVo vo : list) {
-							util.convertEntity(vo, null, null, null);
-						}
-					}
 					if (Common.isNotNull(list)) {
 						writeSheet = EasyExcel.writerSheet("缴费库" + index).build();
 						excelWriter.write(list, writeSheet);
@@ -190,6 +183,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			if (Common.isNotNull(list)) {
 				list.clear();
 			}
+			out.flush();
 			excelWriter.finish();
 		} catch (Exception e) {
 			log.error("执行异常", e);
@@ -217,18 +211,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			int index = 0;
 			if (count > CommonConstants.ZERO_INT) {
 				WriteSheet writeSheet;
-				ExcelUtil<TPaymentInfoExportVo> util;
 				for (int i = 0; i <= count; i += CommonConstants.EXCEL_EXPORT_LIMIT) {
 					// 获取实际记录
 					searchVo.setLimitStart(i);
 					searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
 					list = baseMapper.getTPaymentInfoSumNoPage(searchVo);
-					if (Common.isNotNull(list)) {
-						util = new ExcelUtil<>(TPaymentInfoExportVo.class);
-						for (TPaymentInfoExportVo vo : list) {
-							util.convertEntity(vo, null, null, null);
-						}
-					}
 					if (Common.isNotNull(list)) {
 						writeSheet = EasyExcel.writerSheet(PaymentConstants.EXPORT + index).build();
 						excelWriter.write(list, writeSheet);
@@ -245,6 +232,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			if (Common.isNotNull(list)) {
 				list.clear();
 			}
+			out.flush();
 			excelWriter.finish();
 		} catch (Exception e) {
 			log.error("执行异常", e);

yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml

@@ -773,8 +773,12 @@
 		a.UNIT_PROVIDENT_SUM,
 		a.PERSONAL_PROIDENT_SET,
 		a.PERSONAL_PROVIDENT_SUM,
-		a.PUSH_STATUS,
-		a.LOCK_STATUS,
+		CASE WHEN a.PUSH_STATUS=0 THEN "未打标"
+		WHEN a.PUSH_STATUS =1 THEN "已打标"
+		ELSE a.PUSH_STATUS END as "PUSH_STATUS",
+		CASE WHEN a.LOCK_STATUS=0 THEN "已推送"
+		WHEN a.LOCK_STATUS =1 THEN "未推送"
+		ELSE a.LOCK_STATUS END as "LOCK_STATUS",
 		a.CREATE_NAME,
 		a.CREATE_TIME
 		FROM t_payment_info a