fix: mapToInt null

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -1703,7 +1703,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 			List<WmScorePackageStatus> staList = scorePackageStatusList.stream()
 					.filter(record -> StrUtil.equals(record.getStatus(), "2"))
-					.collect(Collectors.toList());;
+					.collect(Collectors.toList());
+			;
 
 			if (CollUtil.isNotEmpty(staList)) {
 				List<String> userIdList = staList.stream()
@@ -1754,7 +1755,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 			scorePackage.setYjddsh((int) yjddsh);
 			scorePackage.setDsh(dsh);
 			scorePackage.setYtj(ytj);
-			if (!StrUtil.equals(scorePackage.getScorePackageStatus(),"1") && !StrUtil.equals(scorePackage.getScorePackageStatus(),"6")){
+			if (!StrUtil.equals(scorePackage.getScorePackageStatus(), "1") && !StrUtil.equals(scorePackage.getScorePackageStatus(), "6")) {
 				scorePackage.setYsh(ysh);
 				scorePackage.setShtg(shtg);
 				scorePackage.setShbtg(shbtg);
@@ -1767,7 +1768,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 			scorePackage.setIsTask(scorePackage.getId());
 			scorePackage.setPackageType1(type1Lable);
 			scorePackage.setPackageType2(type2Lable);
-			scorePackage.setRelationScoreId(relationScorePackage != null ? relationScorePackage.getScorePackageName(): null);
+			scorePackage.setRelationScoreId(relationScorePackage != null ? relationScorePackage.getScorePackageName() : null);
 
 
 			// 结算记录
@@ -1778,7 +1779,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 				scorePackage.setNotifyDate(note.getNotifyTime());
 			}
 
-			if ("2".equals(scorePackage.getPackageType2())) {
+			if (packageType2 == 2) {
 
 				LambdaQueryWrapper<WmScorePackageSettleNote> wrapper = Wrappers.<WmScorePackageSettleNote>lambdaQuery()
 						.eq(WmScorePackageSettleNote::getPackageId, scorePackage.getId());
@@ -1879,17 +1880,17 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		// 平台未审核
 		int temp = taskList.parallelStream()
 				.filter(t -> StrUtil.equals(t.getTaskStatus(), "1"))
-				.mapToInt(WmTask::getScore)
+				.mapToInt(t -> t.getScore() == null ? 0 : t.getScore())
 				.sum();
 		// 待审核
 		int dsh = taskList.parallelStream()
 				.filter(t -> StrUtil.equals(t.getTaskStatus(), "2"))
-				.mapToInt(WmTask::getScore)
+				.mapToInt(t -> t.getScore() == null ? 0 : t.getScore())
 				.sum();
 		// 已审核
 		int ysh = taskList.parallelStream()
 				.filter(t -> StrUtil.equals(t.getTaskStatus(), "3"))
-				.mapToInt(WmTask::getScore)
+				.mapToInt(t -> t.getScore() == null ? 0 : t.getScore())
 				.sum();
 		// 已审核数
 		long yshnum = taskList.parallelStream().filter(t -> StrUtil.equals(t.getTaskStatus(), "3")).count();
@@ -1904,7 +1905,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		long shbtgtt = 0;
 		if (StrUtil.equals(scorePackage.getPackageType1(), "1")) {
 			int score = scorePackage.getScore();
-			if (score != 0){
+			if (score != 0) {
 				yshtt = ysh * 100L / score;
 				yshtt = yshtt > 100 ? 100 : yshtt;
 
@@ -1934,7 +1935,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 		List<WmScorePackageStatus> staList = scorePackageStatusList.stream()
 				.filter(record -> StrUtil.equals(record.getStatus(), "2"))
-				.collect(Collectors.toList());;
+				.collect(Collectors.toList());
+		;
 
 		if (CollUtil.isNotEmpty(staList)) {
 			List<String> userIdList = staList.stream()
@@ -1984,7 +1986,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		scorePackage.setYjd((int) yjd);
 		scorePackage.setYjddsh((int) yjddsh);
 		scorePackage.setDsh(dsh);
-		if (!StrUtil.equalsAny(scorePackage.getScorePackageStatus(),"1","6")){
+		if (!StrUtil.equalsAny(scorePackage.getScorePackageStatus(), "1", "6")) {
 			scorePackage.setYsh(ysh);
 			scorePackage.setShtg(shtg);
 			scorePackage.setShbtg(shbtg);
@@ -1998,7 +2000,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		scorePackage.setYtj(ytj);
 		scorePackage.setPackageType1(type1Lable);
 		scorePackage.setPackageType2(type2Lable);
-		scorePackage.setRelationScoreId(relationScorePackage != null ? relationScorePackage.getScorePackageName(): null);
+		scorePackage.setRelationScoreId(relationScorePackage != null ? relationScorePackage.getScorePackageName() : null);
 
 
 		// 结算记录
@@ -2009,13 +2011,15 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 			scorePackage.setNotifyDate(note.getNotifyTime());
 		}
 
-		if ("2".equals(scorePackage.getPackageType2())) {
+		if (packageType2 == 2) {
 
-			LambdaQueryWrapper<WmScorePackageSettleNote> wrapper = Wrappers.<WmScorePackageSettleNote>lambdaQuery()
-					.eq(WmScorePackageSettleNote::getPackageId, scorePackage.getId());
 
-			int wsNum = settleNoteMapper.selectCount(wrapper.in(WmScorePackageSettleNote::getSettleNoteStatus, 2, 9));
-			int asNum = settleNoteMapper.selectCount(wrapper.eq(WmScorePackageSettleNote::getSettleNoteStatus, 1));
+			int wsNum = settleNoteMapper.selectCount(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
+					.eq(WmScorePackageSettleNote::getPackageId, scorePackage.getId())
+					.in(WmScorePackageSettleNote::getSettleNoteStatus, 2, 9));
+			int asNum = settleNoteMapper.selectCount(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
+					.eq(WmScorePackageSettleNote::getPackageId, scorePackage.getId())
+					.eq(WmScorePackageSettleNote::getSettleNoteStatus, 1));
 			scorePackage.setWsTaskNum(wsNum);
 			scorePackage.setAsTaskNum(asNum);