修改2

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

@@ -5036,14 +5036,14 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 item.add(map.get("taskChangeNoticeNum")==null?"":String.valueOf(map.get("taskChangeNoticeNum")));
             }
             if(planType==0){
-                if (map.get("operationName")!=null){
+                if (map.get("planExtraInfoId")!=null){
                     item.add(String.valueOf(map.get("operationName")));
                 }else {
                     item.add(map.get("procedureName") == null ? "" : String.valueOf(map.get("procedureName")));
                 }
             }else {
                 //第二种的报工工序类型
-                if (map.get("operationName")!=null){
+                if (map.get("planExtraInfoId")!=null){
                     item.add("企微计件报工");
                 }else {
                     //第一种报工工序类型
@@ -5051,7 +5051,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 }
             }
             item.add(map.get("steelNumArray")==null?"":String.valueOf(map.get("steelNumArray")));
-            if (map.get("partName")!=null){
+            if (map.get("planExtraInfoId")!=null){
                 item.add(String.valueOf(map.get("partName")));
             }else {
                 item.add(map.get("productName")==null?"":String.valueOf(map.get("productName")));
@@ -5063,8 +5063,15 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 item.add(String.valueOf(map.get("workingTime")));
                 item.add(String.valueOf(map.get("unitPrice")));
             }else {
-                item.add(String.valueOf(map.get("workingTime"))+" h");
-                item.add((map.get("unitPrice")==null?0:String.valueOf(map.get("unitPrice")))+" 元/h");
+                //第二种的报工工序类型
+                if (map.get("planExtraInfoId")!=null){
+                    item.add(String.valueOf(map.get("workingTime"))+" 件");
+                    item.add((map.get("unitPrice")==null?0:String.valueOf(map.get("unitPrice")))+" 件/元");
+                }else {
+                    //第一种报工工序类型
+                    item.add(String.valueOf(map.get("workingTime"))+" h");
+                    item.add((map.get("unitPrice")==null?0:String.valueOf(map.get("unitPrice")))+" 元/h");
+                }
             }
             String cost = String.valueOf(map.get("cost"));
             if(planType==0){

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

@@ -574,7 +574,7 @@
     <select id="getReportList" resultType="java.util.Map">
         select p.project_name as projectName,p.product_order_num as productOrderNum, p.plan_type as planType,u.name as userName,u.job_number as jobNumber,d.department_id as departmentId,p.product_scheduling_num as productSchedulingNum,
         p.task_change_notice_num as taskChangeNoticeNum,r.steel_num_array as steelNumArray,r.working_time as workingTime,p.product_name as productName,r.finish_num as finishNum,
-        pp.name as procedureName,r.progress as progress,(CASE r.check_type WHEN 0 THEN '自检' WHEN 1 THEN '互检' ELSE '专检' END ) as checkType ,uu.name as checkerName,pei.part_name partName,pei.operation_name operationName,
+        pp.name as procedureName,r.progress as progress,(CASE r.check_type WHEN 0 THEN '自检' WHEN 1 THEN '互检' ELSE '专检' END ) as checkType ,uu.name as checkerName,pei.id planExtraInfoId,pei.part_name partName,pei.operation_name operationName,
         date_format(r.create_date,'%Y-%m-%d') as createDate,date_format(r.create_time,'%Y-%m-%d %T') as reportTime,(CASE WHEN p.plan_type=0 THEN pp.unit_price ELSE p.money_of_job END) as unitPrice,r.cost  from report r
         left join plan p on p.id=r.plan_id
         left join plan_extra_info pei on r.id=pei.report_id