feat: 企业承接-完成积分值添加企业任务分值统计

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

@@ -21,7 +21,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.DesensitizedUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.csp.sentinel.util.StringUtil;
@@ -1963,7 +1962,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		List<Map<String, Object>> m = new ArrayList<>(stepB_1.size() + stepB_2.size());
 		m.addAll(stepB_1);
 		m.addAll(stepB_2);
-		Map<String, Integer> result = step3(m);
+		Map<String, Integer> result = step3(m, wmScorePackage);
 		WmScorePackage p = step4(result, wmScorePackage);
 
 		return new AsyncResult<>(p);
@@ -2537,7 +2536,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 	}
 
 
-	public Map<String, Integer> step3(List<Map<String, Object>> m) {
+	public Map<String, Integer> step3(List<Map<String, Object>> m, WmScorePackage wmScorePackage) {
 		int payScore = 0;
 		int ysh = 0;
 
@@ -2572,6 +2571,17 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 		}
 
+		// ysh新增企业任务完成积分值的统计
+		// 查询积分包的任务
+		List<WmTask> tasks = wmTaskMapper.selectList(Wrappers.<WmTask>lambdaQuery()
+				.eq(WmTask::getScorePackageId, wmScorePackage.getId())
+				.eq(WmTask::getDelFlag, DelEnum.NOT_DEL.val())
+				.eq(WmTask::getEnableFlag, EnableEnum.ENABLE.val())
+				.eq(WmTask::getTaskStatus, TaskStatusEnum.APPROVED.val()));
+		if (CollUtil.isNotEmpty(tasks)) {
+			ysh += tasks.stream().mapToInt(WmTask::getScore).sum();
+		}
+
 		return ImmutableMap.of("payScore", payScore, "ysh", ysh);
 
 	}