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