修复工时成本统计的子项目数据不正确的问题

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

@@ -44,7 +44,7 @@ public class SubProjectServiceImpl extends ServiceImpl<SubProjectMapper, SubProj
                 if (!map.containsKey("costMoney")) {
                     map.put("costMoney", 0);
                 } else {
-                    totalMoneyCost = totalMoneyCost.add(BigDecimal.valueOf((Double) map.get("costMoney")));
+                    totalMoneyCost = totalMoneyCost.add((BigDecimal)map.get("costMoney"));
                 }
             }
             resultMap.put("costList", list);

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

@@ -17,16 +17,15 @@
     </sql>
     <!--获取某个项目内子项目的工时成本统计-->
     <select id="getTimeCost" resultType="java.util.Map">
-        SELECT a.id, a.name AS name, SUM(b.working_time) AS cost, SUM(b.working_time * c.cost) AS costMoney
-        FROM sub_project AS a
-        LEFT JOIN report AS b ON b.sub_project_id = a.id
-        JOIN user AS c ON b.creator_id = c.id
-        WHERE a.project_id = #{projectId}
+        SELECT a.id, IFNULL(a.name,'未分配') AS name, SUM(b.working_time) AS cost, SUM(b.cost) AS costMoney
+        FROM report AS b
+        LEFT JOIN sub_project AS a ON b.sub_project_id = a.id
+        WHERE b.project_id = #{projectId}
         <if test="startDate != null and endDate != null">
             AND b.create_date between #{startDate} and #{endDate}
         </if>
         AND b.state = 1
-        GROUP BY a.id
-        ORDER BY a.id ASC
+        GROUP BY b.sub_project_id
+        ORDER BY b.sub_project_id ASC
     </select>
 </mapper>