merge origin main conflicts resolved

ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml

@@ -310,9 +310,15 @@
             TIMESTAMPDIFF(DAY, NOW(), p.postpone_time) AS remainTime,
             p.customer_id AS customerId,
             c.name AS customerName,
-            p.is_top AS isTop
+            p.is_top AS isTop,
+            COUNT(sot.task_id) AS taskTotalCount  ,
+            SUM(CASE WHEN sot.status = 1 THEN 1 ELSE 0 END) AS taskFinishCount,
+            COUNT(ops.schedule_id) AS scheduleTotalCount,
+            SUM(CASE WHEN ops.status = 2 THEN 1 ELSE 0 END) AS scheduleFinishCount
         FROM sys_oa_project p
             LEFT JOIN oa_customer c ON p.customer_id = c.customer_id
+            left join sys_oa_task sot on sot.project_id = p.project_id and sot.del_flag = 0
+            left join oa_project_schedule ops on ops.project_id = p.project_id and ops.del_flag = 0
             ${ew.getCustomSqlSegment}
     </select>