Ver Fonte

导出工时成本统计带比例时,增加合计工时比例列

seyason há 1 ano atrás
pai
commit
bb9e626898

+ 6 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -1635,6 +1635,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         headListTwo.add(MessageUtils.message("entry.total")+"/"+MessageUtils.message("entry.cost"));
                     }
                 }
+                if (withPercent == 1) {
+                    headListTwo.add("合计/工时比例");
+                }
 
                 allList=new ArrayList<>();
                 allList.add(headListOne);
@@ -1720,6 +1723,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             membRowData.add(moneyCost.toString());
                         }
                     }
+                    if (withPercent == 1) {
+                        membRowData.add("100%");
+                    }
                     if(mapList.size()>0){
                         allList.add(membRowData);
                     }