浏览代码

fix: 个人积分包导出excel null字段

lixuesong 1 年之前
父节点
当前提交
7d6a95b8d8

+ 12 - 4
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -2878,9 +2878,13 @@ public class WmScorePackageController {
 			}
 
 			excelModel.setNumber(String.valueOf(i+1));
-			excelModel.setFinishRate(String.valueOf(wmScorePackage.getYshtt()));
+			if (wmScorePackage.getYshtt() != null) {
+				excelModel.setFinishRate(String.valueOf(wmScorePackage.getYshtt()));
+			}
 			excelModel.setPayScore(wmScorePackage.getShtg());
-			excelModel.setPayRate(String.valueOf(wmScorePackage.getShtgtt()));
+			if (wmScorePackage.getShtgtt() != null) {
+				excelModel.setPayRate(String.valueOf(wmScorePackage.getShtgtt()));
+			}
 
 			excelModelList.add(excelModel);
 
@@ -3026,9 +3030,13 @@ public class WmScorePackageController {
 			}
 
 			excelModel.setNumber(String.valueOf(i+1));
-			excelModel.setFinishRate(String.valueOf(wmScorePackage.getYshtt()));
+			if (wmScorePackage.getYshtt() != null) {
+				excelModel.setFinishRate(String.valueOf(wmScorePackage.getYshtt()));
+			}
 			excelModel.setPayScore(wmScorePackage.getShtg());
-			excelModel.setPayRate(String.valueOf(wmScorePackage.getShtgtt()));
+			if (wmScorePackage.getShtgtt() != null) {
+				excelModel.setPayRate(String.valueOf(wmScorePackage.getShtgtt()));
+			}
 
 			excelModelList.add(excelModel);