提交

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

@@ -5065,7 +5065,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             }else {
                 //第二种的报工工序类型
                 if (map.get("planExtraInfoId")!=null){
-                    item.add(String.valueOf(map.get("workingTime"))+" 件");
+                    item.add(String.valueOf(map.get("num"))+" 件");
                     item.add((map.get("unitPrice")==null?0:String.valueOf(map.get("unitPrice")))+" 件/元");
                 }else {
                     //第一种报工工序类型
@@ -5079,9 +5079,18 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 finishNum=finishNum.multiply(new BigDecimal(map.get("unitPrice")==null?String.valueOf(0):String.valueOf(map.get("unitPrice")))).setScale(2,RoundingMode.HALF_UP);
                 item.add(String.valueOf(finishNum.doubleValue()));
             }else {
-                BigDecimal workingTime = new BigDecimal(map.get("workingTime")==null?String.valueOf(0):String.valueOf(map.get("workingTime")));
-                workingTime=workingTime.multiply(new BigDecimal(map.get("unitPrice")==null?String.valueOf(0):String.valueOf(map.get("unitPrice")))).setScale(2,RoundingMode.HALF_UP);
-                item.add(String.valueOf(workingTime.doubleValue()));
+                //第二种的报工工序类型
+                if (map.get("planExtraInfoId")!=null){
+                    BigDecimal num = new BigDecimal(map.get("num") == null ? String.valueOf(0) : String.valueOf(map.get("num")));
+                    BigDecimal unitPrice = new BigDecimal(map.get("unitPrice")==null?String.valueOf(0):String.valueOf(map.get("unitPrice")));
+                    BigDecimal total=num.multiply(unitPrice).setScale(2,RoundingMode.HALF_UP);
+                    item.add(total.toString());
+                }else {
+                    //第一种报工工序类型
+                    BigDecimal workingTime = new BigDecimal(map.get("workingTime")==null?String.valueOf(0):String.valueOf(map.get("workingTime")));
+                    workingTime=workingTime.multiply(new BigDecimal(map.get("unitPrice")==null?String.valueOf(0):String.valueOf(map.get("unitPrice")))).setScale(2,RoundingMode.HALF_UP);
+                    item.add(String.valueOf(workingTime.doubleValue()));
+                }
             }
 //            item.add(cost);
             item.add(String.valueOf(map.get("userName")));

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

@@ -573,7 +573,7 @@
     </select>
     <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,
+        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,p.num as num,
         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