统计人员工时展示修改

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

@@ -4363,6 +4363,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         List<Map<String,Object>> mapListTempReport=reportMapper.getPersonWorkHoursWagesDetailForTemp(date,userId,user.getCompanyId(),startDate,endDate);
         mapListTempReport.forEach(m->{
             m.put("colorType","green");
+            if (m.get("planExtraInfoId")!=null && m.get("operationName")!=null){
+                m.put("procedureName",m.get("operationName"));
+            }
+            if (m.get("planExtraInfoId")!=null && m.get("partName")!=null){
+                m.put("productName",m.get("partName"));
+            }
         });
         mapListHasReport.addAll(mapListTempReport);
         mapListHasReport.addAll(mapListNoReport);

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

@@ -194,10 +194,12 @@
     <select id="getPersonWorkHoursWagesDetailForTemp" resultType="java.util.Map">
         select r.cost,(r.working_time*60) as working_time,r.finish_num, r.creator_id,DATE_FORMAT(r.create_date,'%Y%m%d') as createDate,
         p.name as productName,DATE_FORMAT(plan.start_date,'%Y%m%d') as planStartDate,DATE_FORMAT(plan.end_date,'%Y%m%d') as planEndDate ,
-        plan.task_change_notice_num as taskChangeNoticeNum,plan.plan_type as planType,u.name as checkerName,u2.name as creatorName,plan.task_name as taskName,plan.task_type_name
+        plan.task_change_notice_num as taskChangeNoticeNum,plan.plan_type as planType,u.name as checkerName,u2.name as creatorName,plan.task_name as taskName,plan.task_type_name,
+        pei.id planExtraInfoId,pei.operation_name operationName,pei.part_name partName,plan.product_scheduling_num,plan.num finishNum
         from report r
         left join product p on p.id=r.product_id
         left join plan on plan.id=r.plan_id
+        left join plan_extra_info pei on pei.report_id=r.id
         left join user u on r.checker_id=u.id
         left join user u2 on r.creator_id=u2.id
         where r.company_id=#{companyId}  and r.user_procedure_team_id is null