소스 검색

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

lixuesong 1 년 전
부모
커밋
7d6a95b8d8
1개의 변경된 파일12개의 추가작업 그리고 4개의 파일을 삭제
  1. 12 4
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

+ 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);