From 185712d82c7fa38824bbd8735b68361c7ecb00b4 Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期三, 09 十月 2024 14:58:34 +0800
Subject: [PATCH] 项目立项计算整体项目进度

---
 src/main/java/com/product/contract/service/ProjectBusinessService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/product/contract/service/ProjectBusinessService.java b/src/main/java/com/product/contract/service/ProjectBusinessService.java
index ec2b31b..5c23db1 100644
--- a/src/main/java/com/product/contract/service/ProjectBusinessService.java
+++ b/src/main/java/com/product/contract/service/ProjectBusinessService.java
@@ -23,7 +23,10 @@
 	public JSONObject findProject(FieldSetEntity fse) {
 		FieldSetEntity fsData = baseDao.getFieldSet(CmnConst.PRODUCT_PROJECT_BUSINESS, fse.getUUID(), false);
 		//璁$畻鏁翠綋椤圭洰杩涘害
-		FieldSetEntity task_rate_fs = baseDao.getFieldSetEntityBySQL("SELECT CONCAT(sum(REPLACE(task_rate, '%', ''))/COUNT(*),'%') task_rate FROM `product_project_schedule_weekly_sub` where project_uuid=? GROUP BY project_uuid", new String[]{fse.getUUID()}, false);
+		String sql ="SELECT CONCAT(sum(REPLACE(a.task_rate, '%', ''))/COUNT(*),'%') task_rate FROM `product_project_schedule_weekly_sub` a\n" +
+				"LEFT JOIN  product_project_schedule_weekly b on a.main_uuid=b.uuid\n" +
+				"where a.project_uuid=? and b.flow_flag =2 GROUP BY project_uuid";
+		FieldSetEntity task_rate_fs = baseDao.getFieldSetEntityBySQL(sql, new String[]{fse.getUUID()}, false);
 		fsData.setValue("schedule",task_rate_fs.getString("task_rate"));
 		//灏佽椤圭洰璁″垝鏁版嵁鎺ュ彛
 		JSONObject json = new JSONObject();

--
Gitblit v1.9.2