Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -5004,13 +5004,16 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             item.add(map.get("productOrderNum")==null?"":String.valueOf(map.get("productOrderNum")));
             item.add(String.valueOf(map.get("procedureName")));
             item.add(map.get("steelNumArray")==null?"":String.valueOf(map.get("steelNumArray")));
-            item.add("");
+            item.add(String.valueOf(map.get("productName")));
             item.add("");
 //            item.add(String.valueOf(map.get("progress"))+"%");
             item.add(String.valueOf(map.get("finishNum")));
             item.add(String.valueOf(map.get("workingTime")));
             item.add(String.valueOf(map.get("unitPrice")));
             String cost = String.valueOf(map.get("cost"));
+            BigDecimal finishNum = new BigDecimal(map.get("finishNum")==null?String.valueOf(0):String.valueOf(map.get("finishNum")));
+            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()));
 //            item.add(cost);
             item.add(String.valueOf(map.get("userName")));
             item.add(String.valueOf(map.get("createDate")));
@@ -5018,20 +5021,20 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 //            item.add(String.valueOf(map.get("checkType")));
 //            item.add(map.get("checkerName")==null?"":String.valueOf(map.get("checkerName")));
             dataList.add(item);
-            if (lastJobNum == null || !lastJobNum.equals(curJobBNum)) {
-                //换新的人了
-                sumLine = item;
-                sumLine.add(sumCostIndex, cost);
-                lastJobNum = curJobBNum;
-            } else {
-                //当前这行的该列设置为空
-                item.add(sumCostIndex, "");
-                //更新第一行的数据
-                BigDecimal sumCost = new BigDecimal(sumLine.get(sumCostIndex));
-                sumCost = sumCost.add(new BigDecimal(cost));
-                sumLine.remove(sumCostIndex);
-                sumLine.add(sumCostIndex, sumCost.toString());
-            }
+//            if (lastJobNum == null || !lastJobNum.equals(curJobBNum)) {
+//                //换新的人了
+//                sumLine = item;
+//                sumLine.add(sumCostIndex, cost);
+//                lastJobNum = curJobBNum;
+//            } else {
+//                //当前这行的该列设置为空
+//                item.add(sumCostIndex, "");
+//                //更新第一行的数据
+//                BigDecimal sumCost = new BigDecimal(sumLine.get(sumCostIndex));
+//                sumCost = sumCost.add(new BigDecimal(cost));
+//                sumLine.remove(sumCostIndex);
+//                sumLine.add(sumCostIndex, sumCost.toString());
+//            }
         }
         Company company = companyMapper.selectById(companyId);
         String fileName=("日报统计导出_")+company.getCompanyName()+System.currentTimeMillis();