From 36da3b80c111078a653c4c62052c5fce0757618d Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期一, 17 二月 2025 16:51:54 +0800
Subject: [PATCH] 项目管理功能优化
---
src/main/java/com/product/contract/service/ProjectBusinessService.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/product/contract/service/ProjectBusinessService.java b/src/main/java/com/product/contract/service/ProjectBusinessService.java
index d18dd2e..2f3ab7d 100644
--- a/src/main/java/com/product/contract/service/ProjectBusinessService.java
+++ b/src/main/java/com/product/contract/service/ProjectBusinessService.java
@@ -22,6 +22,14 @@
@Override
public JSONObject findProject(FieldSetEntity fse) {
FieldSetEntity fsData = baseDao.getFieldSet(CmnConst.PRODUCT_PROJECT_BUSINESS, 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);
+ 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()});
@@ -43,7 +51,7 @@
DataTableEntity scheduleDt =baseDao.listTable("select project_task_sub,a.* from product_project_schedule a\n" +
"LEFT JOIN product_project_business_plan b on a.business_sub_uuid =b.uuid\n" +
"where b.project_uuid=? order by a.business_sub_uuid,a.reporting_time",new String[]{fse.getUUID()});
-
+ baseDao.loadPromptData(scheduleDt);
rejson.put(CmnConst.PRODUCT_PROJECT_SCHEDULE,BaseUtil.dataTableEntityToJson(scheduleDt));
//灏佽璧勬枡鏁版嵁缁撴瀯
DataTableEntity dataList = baseDao.listTable(CmnConst.PRODUCT_PROJECT_MANAGER_DATA_LIST, "project_type=?", new String[]{fsData.getString("project_type")});
@@ -55,11 +63,6 @@
@Transactional
@Override
public boolean saveProject(FieldSetEntity fse) {
- boolean b = baseDao.saveFieldSetEntity(fse);
-// if (b){
-// DataTableEntity dt = fse.getSubDataTable(CmnConst.PRODUCT_PROJECT_MANAGER_DATA_LIST);
-// return baseDao.update(dt);
-// }
- return b;
+ return baseDao.saveFieldSetEntity(BaseUtil.createCreatorAndCreationTime(fse));
}
}
--
Gitblit v1.9.2