From bc4f6588b92d207bef56edf3b5b38d8e4e2b8236 Mon Sep 17 00:00:00 2001
From: 6c <420680616@qq.com>
Date: 星期四, 12 六月 2025 16:34:11 +0800
Subject: [PATCH] 合同管理
---
src/main/java/com/product/contract/service/ProjectScheduleService.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/product/contract/service/ProjectScheduleService.java b/src/main/java/com/product/contract/service/ProjectScheduleService.java
index 9a0f662..0767da0 100644
--- a/src/main/java/com/product/contract/service/ProjectScheduleService.java
+++ b/src/main/java/com/product/contract/service/ProjectScheduleService.java
@@ -37,7 +37,7 @@
sql.append("LEFT JOIN product_project_schedule c on b.uuid=c.business_sub_uuid\n");
sql.append("WHERE a.project_name is not null \n");
sql.append("AND (CONCAT(',',a.team_members,',') LIKE ? OR a.group_leader = ?) \n");
- sql.append("ORDER BY a.project_name,b.start_date");
+ sql.append("ORDER BY a.project_name,b.start_date,c.reporting_time");
DataTableEntity dt = baseDao.listTable(sql.toString(), new String[]{"%," + curUserId + ",%", curUserId});
baseDao.loadPromptData(dt);
JSONObject projectJsob = new JSONObject(new LinkedHashMap<>());
@@ -93,20 +93,25 @@
json.put("reporting_time", timeString);
json.put("number1", 1);
-
}else {
- jsonArray.getJSONObject(0).put("number1",jsonArray.size()+1);
- num=num+jsonArray.size()+1;
+ String progressRate = jsonArray.getJSONObject(jsonArray.size() - 1).getString("progress_rate");
+ if (!progressRate.equals("100%")){
+ jsonArray.getJSONObject(0).put("number1",jsonArray.size()+1);
+ num=num+jsonArray.size()+1;
- //鏂板棰楀～鍐欐暟鎹�
- JSONObject j = new JSONObject();
- j.put("business_uuid",jsonArray.getJSONObject(0).getString("business_uuid"));
- j.put("business_sub_uuid",jsonArray.getJSONObject(0).getString("business_sub_uuid"));
- j.put("project_name",jsonArray.getJSONObject(0).getString("project_name"));
- j.put("project_task_sub",jsonArray.getJSONObject(0).getString("project_task_sub"));
- j.put("reporter", SpringMVCContextHolder.getCurrentUser().getUser_name());
- j.put("reporting_time", timeString);
- jsonArray.add(j);
+ //鏂板棰楀～鍐欐暟鎹�
+ JSONObject j = new JSONObject();
+ j.put("business_uuid",jsonArray.getJSONObject(0).getString("business_uuid"));
+ j.put("business_sub_uuid",jsonArray.getJSONObject(0).getString("business_sub_uuid"));
+ j.put("project_name",jsonArray.getJSONObject(0).getString("project_name"));
+ j.put("project_task_sub",jsonArray.getJSONObject(0).getString("project_task_sub"));
+ j.put("reporter", SpringMVCContextHolder.getCurrentUser().getUser_name());
+ j.put("reporting_time", timeString);
+ jsonArray.add(j);
+ }else {
+ jsonArray.getJSONObject(0).put("number1",jsonArray.size());
+ num=num+jsonArray.size();
+ }
}
for (int i = 0; i <jsonArray.size() ; i++) {
JSONObject a = jsonArray.getJSONObject(i);
--
Gitblit v1.9.2