1

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

@@ -1059,21 +1059,22 @@
 
     <select id="getProjectTimeCost" resultType="java.util.Map">
         select p.project_code as projectCode,p.id as projectId,pm.id as pmId,p.project_name as projectName,DATE_FORMAT(p.plan_start_date,'%Y-%m-%d') as planStartDate,DATE_FORMAT(p.plan_end_date,'%Y-%m-%d') as planEndDate,u.job_number as inchargerId,
-               pm.name as projectMainName,p.status,p.category_name as categoryName,pl.project_level_name as levelString,p.contract_amount as contractAmount,
-               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) &gt;= 0 then '否' else '是' end as isOver ,case when p.man_day*8-SUM(r.working_time) &gt; 0 then (p.man_day*8-SUM(r.working_time)) else '0' end as remaining,
-               (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
+        pm.name as projectMainName,p.status,p.category_name as categoryName,pl.project_level_name as levelString,p.contract_amount as contractAmount,
+        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) &gt;= 0 then '否' else '是' end as isOver ,case when p.man_day*8-SUM(r.working_time) &gt; 0 then (p.man_day*8-SUM(r.working_time)) else '0' end as remaining,
+        (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
         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
-                 left join project_separate ps on p.id=ps.id
-                 left join user u on u.id=p.incharger_id
-                 left join report r on r.project_id=p.id
+        left join project_main pm on p.project_main_id=pm.id
+        left join project_level pl on p.level=pl.id
+        left join project_separate ps on p.id=ps.id
+        left join user u on u.id=p.incharger_id
+        left join report r on r.project_id=p.id
         where p.company_id=#{companyId}
-          and p.id=#{projectId}
+        and p.id=#{projectId}
+        AND (r.state=1 or r.state=0)
         group by p.id
     </select>