Ver Fonte

feat: 积分包过截止日期后不能选到和提交任务

lixuesong há 1 ano atrás
pai
commit
bf6352a3ef

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

@@ -464,6 +464,10 @@ public class ApiController {
 									if (PackageTypeEnum.TYPE2_SETTLE_PACKAGE.val().equals(wmScorePackage.getPackageType2()) && !PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val().equals(wmScorePackage.getPackageType1())) {
 										continue;
 									}
+									if (LocalDate.now().isAfter(wmScorePackage.getEndTime())) {
+										// 过截止日期的过滤掉
+										continue;
+									}
 
 									if ("28".equals(taskTypeId)) {
 										if ("3".equals(wmScorePackage.getPackageType1())) {

+ 6 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskContentServiceImpl.java

@@ -113,6 +113,9 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 			log.warn("获取不到积分包:{}", pkgId);
 			throw new RuntimeException("获取不到积分包");
 		}
+		if (LocalDate.now().isAfter(tWmScorePackage.getEndTime())) {
+			throw new BizException("当前积分包已过截止日期");
+		}
 
 		return tWmScorePackage;
 	}
@@ -927,6 +930,9 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 			log.error("当前企业不存在,ID为[{}]的积分包", pkgId);
 			throw new BizException("积分包不存在");
 		}
+		if (LocalDate.now().isAfter(tWmScorePackage.getEndTime())) {
+			throw new BizException("当前积分包已过截止日期");
+		}
 
 		Integer deptId = Integer.parseInt(tWmScorePackage.getDeptId());
 		log.info("获取企业ID: [{}]", deptId);