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

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

@@ -1640,6 +1640,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);
@@ -1725,6 +1728,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);
                     }