feat: 积分包值校验

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

@@ -2768,7 +2768,7 @@ public class WmScorePackageController {
 
 		for (BatchPackageExcelModel model : batchPackageExcelModels) {
 
-			scorePackage.setScore(model.getScore());
+			scorePackage.setScore(Integer.parseInt(model.getScore()));
 			scorePackage.setScorePackageName(model.getScorePackageName());
 			scorePackage.setDescription(model.getDescription());
 			scorePackage.setUserList(StrUtil.isEmpty(model.getTargetId()) ? new ArrayList<>(1) :
@@ -2818,9 +2818,15 @@ public class WmScorePackageController {
 
 		// 校验积分制是否为空
 		log.info("[{}]", model.getScore());
-		if (model.getScore() == null) {
+		if (StrUtil.isEmpty(model.getScore())) {
 			errorMap.put("积分值未填", row);
-			model.setScore(0);
+		} else {
+			// 校验是否是数字
+			if (!Validator.isNumber(model.getScore())){
+				errorMap.put("积分值不是数字", row);
+			} else if (model.getScore().contains(StrUtil.DOT) || Integer.parseInt(model.getScore()) <= 0){
+				errorMap.put("积分值必须是正整数", row);
+			}
 		}
 
 		// 全职校验
@@ -2868,7 +2874,7 @@ public class WmScorePackageController {
 
 
 		log.warn("==========================================校验批量下发积分包model：开始=====================================================");
-		return model.getScore();
+		return Integer.parseInt(model.getScore());
 	}
 
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/model/excel/BatchPackageExcelModel.java

@@ -37,7 +37,7 @@ public class BatchPackageExcelModel implements Serializable {
 	 * 积分包值，单位：元
 	 */
 	@ExcelProperty(index = 2, value = "积分包值")
-	private Integer score;
+	private String score;
 
 	/**
 	 * 描述
@@ -64,5 +64,4 @@ public class BatchPackageExcelModel implements Serializable {
 	 */
 	private String targetId;
 
-
 }