Browse Source

feat: 企业承接包-任务统计2

lixuesong 1 year ago
parent
commit
ab34db3d29

+ 4 - 3
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDeptTaskController.java

@@ -541,10 +541,11 @@ public class WmDeptTaskController {
 				.multiply(scorePackage.getAuditManagementFeeRates())
 				.divide(new BigDecimal("100.00"), RoundingMode.HALF_EVEN);
 		result.put("audit_management_fee", auditManagementFee.toString());
-		// 审核任务数 TODO
+		// 审核任务数(所有审核通过的任务数)
 		result.put("audit_tasks_number", "0");
-		// 实际完成分值 TODO
-		result.put("actual_completion_score", "0");
+		// 实际完成分值(所有审核通过的任务分+审核管理费分值)
+		int totalTaskScore = taskList.stream().mapToInt(WmTask::getScore).sum();
+		result.put("actual_completion_score", auditManagementFee.add(BigDecimal.valueOf(totalTaskScore)).toString());
 
 		return R.ok(result);
 	}