feat: 1.医院信息收集、医院信息修改两类任务的限制60%；2.会议举办次数限制

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

@@ -1378,7 +1378,10 @@ public class ApiController {
 					wmTask.setTaskUserId(userVO.getUserId() + "");
 					wmTask.setRealFlag("0");
 					List<WmTask> wmTaskList = wmTaskService.list(Wrappers.query(wmTask)
-							.lambda().ne(WmTask::getTaskStatus, "4"));
+							.lambda()
+							.eq(WmTask::getRealFlag, "0")
+							.eq(WmTask::getDelFlag, DelEnum.NOT_DEL.val())
+							.ne(WmTask::getTaskStatus, "4"));
 //							.ne(WmTask::getRealFlag, "1").ne(WmTask::getTaskStatus, "4"));
 
 //					map.put("taskFinishNum", wmTaskList.size());

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

@@ -250,6 +250,12 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 			}
 		}
 
+		// 获取任务类型对应积分
+		WmTaskType wmTaskType = new WmTaskType();
+		wmTaskType.setRuleId(tWmScorePackage.getRuleId());
+		WmTaskType wmTaskType1 = wmTaskTypeService.getById(wmTaskContent.getTemp30());
+		wmTaskType.setTaskTypeName(wmTaskType1.getTaskTypeName());
+		int score = wmTaskTypeService.getWmTaskTypeByEnt(wmTaskType);
 		// 医院信息收集、医院信息修改两类任务做的任务总积分不得大于积分包值的60%（积分包值小于5000不做限制）
 		if ("15".equals(wmTaskContent.getTemp30()) || "30".equals(wmTaskContent.getTemp30())) {
 			if (tWmScorePackage.getScore() > 5000) {
@@ -261,7 +267,7 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 						.ne(WmTask::getTaskStatus, "4"));
 				if (CollectionUtil.isNotEmpty(wmTaskList)) {
 					int totalScore = tWmScorePackage.getScore();
-					int partScore = wmTaskList.stream().mapToInt(WmTask::getScore).sum();
+					int partScore = wmTaskList.stream().mapToInt(WmTask::getScore).sum() + score;
 					if (partScore * 1.0 / totalScore > 0.6) {
 						return R.failed("医院信息收集、医院信息修改两类任务总积分不得大于积分包值的60%");
 					}
@@ -336,7 +342,6 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 
 		Map<String, String> resultMap = new HashMap<>();
 
-		int score = 0;
 		boolean saveContent = super.save(wmTaskContent);
 		if (saveContent) {
 			if (null != sysU) {
@@ -350,12 +355,6 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 
 				wmTask.setTaskTypeId(wmTaskContent.getTemp30());
 
-				WmTaskType wmTaskType = new WmTaskType();
-				wmTaskType.setRuleId(tWmScorePackage.getRuleId());
-				WmTaskType wmTaskType1 = wmTaskTypeService.getById(wmTaskContent.getTemp30());
-				wmTaskType.setTaskTypeName(wmTaskType1.getTaskTypeName());
-				score = wmTaskTypeService.getWmTaskTypeByEnt(wmTaskType);
-
 				/**
 				 *
 				 * 2020-12-13 医院区分新增和修改 start