修改

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

@@ -9161,7 +9161,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     rowData.add(((BigDecimal)map.get("costMoney")).toString());
                 }
                 allList.add(rowData);
-                String degreeId = "-1";
+                String degreeId = null;
                 if (map.containsKey("id")){
                     degreeId = map.get("id").toString();
                 }
@@ -9211,7 +9211,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             allList.add(sumRow);
             //生成excel文件导出
             //String fileName = "维度成本工时统计_"+System.currentTimeMillis();
-            String fileName = MessageUtils.message("fileName.degreeCost")+System.currentTimeMillis();
+            String fileName = timeType.getCustomDegreeName() + MessageUtils.message("fileName.degreeCost")+System.currentTimeMillis();
             return excelExportService.exportGeneralExcelByTitleAndList(wxCorpInfo,fileName , allList, path);
         } catch (NullPointerException e) {
             e.printStackTrace();

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages.properties

@@ -539,7 +539,7 @@ fileName.monthWork=月度工时表
 fileName.deptJoinPro=部门参与项目情况表
 fileName.leaveRemaining = 假期剩余表
 fileName.expense = 费用报销单据列表
-fileName.degreeCost = 维度成本工时统计_
+fileName.degreeCost = 成本工时统计_
 #excel
 excel.publicProject=是否为非项目
 excel.projectName=项目名称必填

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages_en_US.properties

@@ -539,7 +539,7 @@ fileName.monthWork=Monthly man hour Table
 fileName.deptJoinPro=Department Participation in Projects
 fileName.leaveRemaining = Leave Remaining Table
 fileName.expense = Expense reimbursement document list
-fileName.degreeCost = Dimension Cost Work Statistics_
+fileName.degreeCost = Cost Work Statistics_
 #excel
 excel.publicProject=Whether it is a non project
 excel.projectName=Project name is required

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -1539,6 +1539,9 @@
         <if test="degreeId != null">
             and a.degree_id = #{degreeId}
         </if>
+        <if test="degreeId == null">
+            and a.degree_id is null
+        </if>
         <if test="startDate != null and endDate != null">
             AND a.create_date between #{startDate} and #{endDate}
         </if>