1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -7688,6 +7688,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             map.put("realityTime",workingTime.doubleValue());
             map.put("isOver",bigDecimal.doubleValue()<0?"是":"否");
             map.put("remaining",bigDecimal.doubleValue()>0?bigDecimal.doubleValue():0);
+            String participations = String.valueOf(map.get("participations"));
+            String[] split = participations.split(",");
+            map.put("participations",split);
         }
         projectTimeCostList.forEach(pt->{
             List<Map<String, Object>> mapList = taskGroupPlanTimeList.stream().filter(t -> t.get("projectId").equals(pt.get("projectId"))).collect(Collectors.toList());
@@ -7702,6 +7705,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     break;
             }
             pt.put("projectGroupData",mapList);
+            String participations = String.valueOf(pt.get("participations"));
+            String[] split = participations.split(",");
+            pt.put("participations",split);
         });
         responseData.put("projectArrays",projectTimeCostList);
         msg.setData(responseData);

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -1037,9 +1037,9 @@
         ps.contract_code as contractCode,ps.project_category_sub as projectCategorySub,ps.region,DATE_FORMAT(p.create_date,'%Y-%m-%d') as createDate,DATE_FORMAT(ps.warranty_start_date,'%Y-%m-%d') as warrantyStartDate,
         DATE_FORMAT(ps.warranty_end_date,'%Y-%m-%d') as warrantyEndDate,DATE_FORMAT(p.finish_date,'%Y-%m-%d') as finishDate,ps.bu,IFNULL(p.man_day*8,0) as planTime,IFNULL(SUM(r.working_time),0) as realityTime,
         case  when p.man_day*8-SUM(r.working_time) >= 0 then '否' else '是' end as isOver ,case when p.man_day*8-SUM(r.working_time) > 0 then (p.man_day*8-SUM(r.working_time)) else '0' end as remaining,
-        CONCAT('[',(select GROUP_CONCAT(CONCAT(u.job_number,'/',u.name)) from participation pa
+        (select GROUP_CONCAT(CONCAT(u.job_number,'/',u.name)) from participation pa
         left join user u on pa.user_id=u.id
-        where pa.project_id=p.id ),']') as participations
+        where pa.project_id=p.id ) as participations
         from project p
         left join project_main pm on p.project_main_id=pm.id
         left join project_level pl on p.level=pl.id
@@ -1070,9 +1070,9 @@
     <select id="getTaskGroupPlanTime" resultType="java.util.Map">
         select tg.project_id as projectId,tg.task_group_code as taskGroupCode,tg.name,tg.wbs_code as wbsCode,IFNULL(tg.man_day*8,0) as planTime,tg.id as groupId,
         CONCAT(uu.job_number,'/',uu.name) as incahrgerName,
-        CONCAT('[',(select GROUP_CONCAT(CONCAT(u.job_number,'/',u.name)) from group_participator gp
+        (select GROUP_CONCAT(CONCAT(u.job_number,'/',u.name)) from group_participator gp
         left join user u on gp.user_id=u.id
-        where gp.group_id=tg.id ),']') as participations
+        where gp.group_id=tg.id ) as participations
         from task_group tg
         left join user uu on uu.id=tg.incharger_id
         <where>