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

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

@@ -1200,9 +1200,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     //headList.add("成本(元)");
                     headList.add(MessageUtils.message("entry.cost")+"(元)");
                 }else {
-                    if(functionTimeList.size()>0 && functionCostList.size()>0){
+                    if(functionTimeList.size()>0){
                         //headList.add("工时(h)");
                         headList.add(MessageUtils.message("entry.workHours")+"(h)");
+                    }
+                    if(functionCostList.size()>0){
                         //headList.add("成本(元)");
                         headList.add(MessageUtils.message("entry.cost")+"(元)");
                     }
@@ -1233,8 +1235,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }else if ("cost".equals(exportContent) && functionCostList.size()>0){
                         rowData.add(((BigDecimal)map.get("costMoney")).toString());
                     }else {
-                        if(functionTimeList.size()>0 && functionCostList.size()>0){
+                        if(functionTimeList.size()>0){
                             rowData.add(((Double)map.get("cost")).toString());
+                        }
+                        if (functionCostList.size()>0){
                             rowData.add(((BigDecimal)map.get("costMoney")).toString());
                         }
                     }
@@ -1282,8 +1286,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         }else if ("cost".equals(exportContent) && functionCostList.size()>0){
                             membRowData.add(((BigDecimal)membMap.get("costMoney")).toString());
                         }else {
-                            if(functionTimeList.size()>0 && functionCostList.size()>0){
+                            if(functionTimeList.size()>0){
                                 membRowData.add(((Double)membMap.get("cost")).toString());
+                            }
+                            if (functionCostList.size()>0){
                                 membRowData.add(((BigDecimal)membMap.get("costMoney")).toString());
                             }
                         }
@@ -1304,8 +1310,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }else if ("cost".equals(exportContent) && functionCostList.size()>0){
                     sumRow.add(totalMoneyCost.toString());
                 }else {
-                    if(functionTimeList.size()>0 && functionCostList.size()>0){
+                    if(functionTimeList.size()>0){
                         sumRow.add(""+new BigDecimal(totalCostTime).setScale(1, BigDecimal.ROUND_HALF_UP));
+                    }
+                    if (functionCostList.size()>0){
                         sumRow.add(totalMoneyCost.toString());
                     }
                 }
@@ -1326,9 +1334,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         //headList.add(String.valueOf(pn)+"/成本");
                         headList.add(String.valueOf(pn)+"/"+MessageUtils.message("entry.cost"));
                     }else {
-                        if(functionTimeList.size()>0 && functionCostList.size()>0){
+                        if(functionTimeList.size()>0){
                             //headList.add(String.valueOf(pn)+"/工时");
                             headList.add(String.valueOf(pn)+"/"+MessageUtils.message("entry.workHours"));
+                        }
+                        if (functionCostList.size()>0){
                             //headList.add(String.valueOf(pn)+"/成本");
                             headList.add(String.valueOf(pn)+"/"+MessageUtils.message("entry.cost"));
                         }
@@ -1341,9 +1351,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     //headList.add("合计/成本");
                     headList.add(MessageUtils.message("entry.total")+"/"+MessageUtils.message("entry.cost"));
                 }else {
-                    if(functionTimeList.size()>0 && functionCostList.size()>0){
+                    if(functionTimeList.size()>0){
                         //headList.add("合计/工时");
                         headList.add(MessageUtils.message("entry.total")+"/"+MessageUtils.message("entry.workHours"));
+                    }
+                    if(functionCostList.size()>0){
                         //headList.add("合计/成本");
                         headList.add(MessageUtils.message("entry.total")+"/"+MessageUtils.message("entry.cost"));
                     }
@@ -1367,8 +1379,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             }else if ("cost".equals(exportContent) && functionCostList.size()>0){
                                 membRowData.add(String.valueOf(resultList.get(0).get("costMoney")));
                             }else {
-                                if(functionTimeList.size()>0 && functionCostList.size()>0){
+                                if(functionTimeList.size()>0){
                                     membRowData.add(String.valueOf(resultList.get(0).get("cost")));
+                                }
+                                if (functionCostList.size()>0){
                                     membRowData.add(String.valueOf(resultList.get(0).get("costMoney")));
                                 }
                             }
@@ -1381,8 +1395,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             }else if ("cost".equals(exportContent) && functionCostList.size()>0){
                                 membRowData.add("");
                             }else {
-                                if(functionTimeList.size()>0 && functionCostList.size()>0){
+                                if(functionTimeList.size()>0){
                                     membRowData.add("");
+                                }
+                                if(functionCostList.size()>0){
                                     membRowData.add("");
                                 }
                             }
@@ -1394,8 +1410,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }else if ("cost".equals(exportContent) && functionCostList.size()>0){
                         membRowData.add(moneyCost.toString());
                     }else {
-                        if(functionTimeList.size()>0 && functionCostList.size()>0){
+                        if(functionTimeList.size()>0){
                             membRowData.add(""+new BigDecimal(costTime).setScale(1, BigDecimal.ROUND_HALF_UP));
+                        }
+                        if(functionCostList.size()>0){
                             membRowData.add(moneyCost.toString());
                         }
                     }
@@ -5529,9 +5547,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     //headList.add("成本(元)");
                     headList.add(MessageUtils.message("entry.cost")+"(元)");
                 }else {
-                    if(functionTimeList.size()>0 && functionCostList.size()>0){
+                    if(functionTimeList.size()>0){
                         //headList.add("工时(h)");
                         headList.add(MessageUtils.message("entry.workHours")+"(h)");
+                    }
+                    if (functionCostList.size()>0){
                         //headList.add("成本(元)");
                         headList.add(MessageUtils.message("entry.cost")+"(元)");
                     }
@@ -5557,8 +5577,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }else if ("cost".equals(exportContent) && functionCostList.size()>0){
                         rowData.add(((BigDecimal)map.get("costMoney")).toString());
                     }else {
-                        if(functionTimeList.size()>0 && functionCostList.size()>0){
+                        if(functionTimeList.size()>0){
                             rowData.add(((Double)map.get("cost")).toString());
+                        }
+                        if(functionCostList.size()>0){
                             rowData.add(((BigDecimal)map.get("costMoney")).toString());
                         }
                     }
@@ -5573,8 +5595,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }else if ("cost".equals(exportContent) && functionCostList.size()>0){
                     sumRow.add(totalMoneyCost.toString());
                 }else {
-                    if(functionTimeList.size()>0 && functionCostList.size()>0){
+                    if(functionTimeList.size()>0){
                         sumRow.add(""+new BigDecimal(totalCostTime).setScale(1, BigDecimal.ROUND_HALF_UP));
+                    }
+                    if(functionCostList.size()>0){
                         sumRow.add(totalMoneyCost.toString());
                     }
                 }
@@ -5595,9 +5619,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         //headList.add(String.valueOf(pc)+"/成本");
                         headList.add(String.valueOf(pc)+"/"+MessageUtils.message("entry.cost"));
                     }else {
-                        if(functionTimeList.size()>0 && functionCostList.size()>0){
+                        if(functionTimeList.size()>0){
                             //headList.add(String.valueOf(pc)+"/工时");
                             headList.add(String.valueOf(pc)+"/"+MessageUtils.message("entry.workHours"));
+                        }
+                        if (functionCostList.size()>0){
                             //headList.add(String.valueOf(pc)+"/成本");
                             headList.add(String.valueOf(pc)+"/"+MessageUtils.message("entry.cost"));
                         }
@@ -5611,9 +5637,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     //headList.add("成本/合计");
                     headList.add(MessageUtils.message("entry.cost")+"/"+MessageUtils.message("entry.total"));
                 }else {
-                    if(functionTimeList.size()>0 && functionCostList.size()>0){
+                    if(functionTimeList.size()>0){
                         //headList.add("工时/合计");
                         headList.add(MessageUtils.message("entry.workHours")+"/"+MessageUtils.message("entry.total"));
+                    }
+                    if(functionCostList.size()>0){
                         //headList.add("成本/合计");
                         headList.add(MessageUtils.message("entry.cost")+"/"+MessageUtils.message("entry.total"));
                     }
@@ -5641,8 +5669,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             }else if ("cost".equals(exportContent) && functionCostList.size()>0){
                                 membRowData.add(String.valueOf(resultList.get(0).get("costMoney")));
                             }else {
-                                if(functionTimeList.size()>0 && functionCostList.size()>0){
+                                if(functionTimeList.size()>0){
                                     membRowData.add(String.valueOf(resultList.get(0).get("cost")));
+                                }
+                                if(functionCostList.size()>0){
                                     membRowData.add(String.valueOf(resultList.get(0).get("costMoney")));
                                 }
                             }
@@ -5655,8 +5685,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             }else if ("cost".equals(exportContent) && functionCostList.size()>0){
                                 membRowData.add("");
                             }else {
-                                if(functionTimeList.size()>0 && functionCostList.size()>0){
+                                if(functionTimeList.size()>0){
                                     membRowData.add("");
+                                }
+                                if (functionCostList.size()>0){
                                     membRowData.add("");
                                 }
                             }
@@ -5667,8 +5699,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }else if ("cost".equals(exportContent) && functionCostList.size()>0){
                         membRowData.add(moneyCost.toString());
                     }else {
-                        if(functionTimeList.size()>0 && functionCostList.size()>0){
+                        if(functionTimeList.size()>0){
                             membRowData.add(""+new BigDecimal(costTime).setScale(1, BigDecimal.ROUND_HALF_UP));
+                        }
+                        if(functionCostList.size()>0){
                             membRowData.add(moneyCost.toString());
                         }
                     }