From f23de33f7fadd304d9f6d74d9e2f44f559f537d9 Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期三, 09 十月 2024 15:17:22 +0800
Subject: [PATCH] 项目立项计算整体项目进度
---
src/main/java/com/product/contract/service/ProjectBusinessService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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..2f3ab7d 100644
--- a/src/main/java/com/product/contract/service/ProjectBusinessService.java
+++ b/src/main/java/com/product/contract/service/ProjectBusinessService.java
@@ -23,8 +23,13 @@
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);
- fsData.setValue("schedule",task_rate_fs.getString("task_rate"));
+ 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);
+ if (!FieldSetEntity.isEmpty(task_rate_fs)){
+ fsData.setValue("schedule",task_rate_fs.getString("task_rate"));
+ }
//灏佽椤圭洰璁″垝鏁版嵁鎺ュ彛
JSONObject json = new JSONObject();
DataTableEntity planData=baseDao.listTable(CmnConst.PRODUCT_PROJECT_BUSINESS_PLAN,"project_uuid=?",new String[]{fse.getUUID()});
--
Gitblit v1.9.2