整体BUG修改

zm

2025-03-17 2b8e522ec7c38570463a08e04bc1cc264a038e5b

 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);