fix: 1.转发选择积分包列表缺少多人包；2.taskNum null个问题

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -2381,7 +2381,6 @@ public class ApiController {
 			map.put("score", wms.getScore() + "分");
 		}
 		map.put("userNum", wms.getUserNum());
-		map.put("taskNum", wms.getTaskNum() + "个");
 		map.put("createTime", wms.getCreateTime());
 		map.put("packageType1", wms.getPackageType1());
 		map.put("id", wms.getId());
@@ -2398,8 +2397,14 @@ public class ApiController {
 
 		if (CollectionUtils.isNotEmpty(statusList)) {
 			map.put("receiveFlag", 0);
+			if (wms.getTaskNum() == null) {
+				map.put("taskNum", statusList.size() + "个");
+			}
 		} else {
 			map.put("receiveFlag", 1);
+			if (wms.getTaskNum() == null) {
+				map.put("taskNum", "0个");
+			}
 		}
 
 		/**
@@ -3446,7 +3451,8 @@ public class ApiController {
 				if ("1".equals(wmScorePackage.getEnableFlag())) {
 					continue;
 				}
-				if ("2".equals(wmScorePackage.getPackageType2())) {
+				if (PackageTypeEnum.TYPE2_SETTLE_PACKAGE.val().equals(wmScorePackage.getPackageType2())
+						&& !PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val().equals(wmScorePackage.getPackageType1())) {
 					continue;
 				}
 				if ("3".equals(wmScorePackage.getPackageType1())) {
@@ -3532,7 +3538,8 @@ public class ApiController {
 				if ("1".equals(wmScorePackage.getEnableFlag())) {
 					continue;
 				}
-				if ("2".equals(wmScorePackage.getPackageType2())) {
+				if (PackageTypeEnum.TYPE2_SETTLE_PACKAGE.val().equals(wmScorePackage.getPackageType2())
+						&& !PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val().equals(wmScorePackage.getPackageType1())) {
 					continue;
 				}
 				if ("3".equals(wmScorePackage.getPackageType1())) {