增加当前阶段

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

@@ -13725,6 +13725,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             item.put("projectId",project.getId());
                             item.put("projectName",project.getProjectName());
                             item.put("projectCode",project.getProjectCode());
+                            item.put("currentStageName", project.getCurrentStageName());
                             item.put("groupName",groupName);
                             item.put("corpwxDeptId",corpwxDeptid);
                             item.put("department_name",departmentName);
@@ -13784,6 +13785,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             item.put("projectId",project.getId());
                             item.put("projectName",project.getProjectName());
                             item.put("projectCode",project.getProjectCode());
+                            item.put("currentStageName", project.getCurrentStageName());
                             item.put("groupName",groupName);
                             item.put("corpwxDeptId",corpwxDeptid);
                             item.put("department_name",departmentName);
@@ -13847,6 +13849,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             item.put("projectId",project.getId());
                             item.put("projectName",project.getProjectName());
                             item.put("projectCode",project.getProjectCode());
+                            item.put("currentStageName", project.getCurrentStageName());
                             item.put("groupName",groupName);
                             item.put("corpwxDeptId",corpwxDeptid);
                             item.put("department_name",departmentName);
@@ -13995,6 +13998,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<String> row_first =new ArrayList<>();
         row_first.add("项目名称");
         row_first.add("项目编码");
+        row_first.add("当前阶段");
         row_first.add("负责部门");
         row_first.add("任务分组");
         row_first.add("计划工时(财务)");
@@ -14009,13 +14013,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             tempCell.setCellValue(row_first.get(i));
             tempCell.setCellStyle(headStyle);
         }
-        sheet.addMergedRegion(new CellRangeAddress(0,0,5,9));
+        sheet.addMergedRegion(new CellRangeAddress(0,0,6,10));
         sheet.addMergedRegion(new CellRangeAddress(0,1,0,0));
         sheet.addMergedRegion(new CellRangeAddress(0,1,1,1));
         sheet.addMergedRegion(new CellRangeAddress(0,1,2,2));
         sheet.addMergedRegion(new CellRangeAddress(0,1,3,3));
         sheet.addMergedRegion(new CellRangeAddress(0,1,4,4));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,10,10));
+        sheet.addMergedRegion(new CellRangeAddress(0,1,5,5));
+        sheet.addMergedRegion(new CellRangeAddress(0,1,11,11));
         //第二行
         SXSSFRow row1 = sheet.createRow(rowNum++);
         row1.setHeight((short)500);
@@ -14025,6 +14030,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         row_second.add("");
         row_second.add("");
         row_second.add("");
+        row_second.add("");
         row_second.add("增补工时");
         row_second.add("正常工时");
         row_second.add("加班工时");
@@ -14046,6 +14052,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             if(maps.size()>1){
                 sheet.addMergedRegion(new CellRangeAddress(projectNum,projectNum+maps.size()-1,0,0));
                 sheet.addMergedRegion(new CellRangeAddress(projectNum,projectNum+maps.size()-1,1,1));
+                sheet.addMergedRegion(new CellRangeAddress(projectNum,projectNum+maps.size()-1,2,2));
             }
             Map<String, List<Map<String, Object>>> listMapGroupDeptList = maps.stream().collect(Collectors.groupingBy(m -> String.valueOf(m.get("corpwxDeptId"))));
             List<String> deptIdList = maps.stream().map(m -> String.valueOf(m.get("corpwxDeptId"))).distinct().collect(Collectors.toList());
@@ -14053,7 +14060,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             for (String deptId : deptIdList) {
                 List<Map<String, Object>> maps1 = listMapGroupDeptList.get(deptId);
                 if(maps1.size()>1){
-                    sheet.addMergedRegion(new CellRangeAddress(deptNum,deptNum+maps1.size()-1,2,2));
+                    sheet.addMergedRegion(new CellRangeAddress(deptNum,deptNum+maps1.size()-1,3,3));
                 }
                 deptNum+=maps1.size();
             }
@@ -14062,6 +14069,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         for (Map<String, Object> map : mapList) {
             list.add(String.valueOf(map.get("projectName")));
             list.add(String.valueOf(map.get("projectCode")));
+            list.add(String.valueOf(map.get("currentStageName")));
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 list.add("$departmentName="+map.get("corpwxDeptId")+"$");
             }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
@@ -14082,7 +14090,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         for(int i = 0;i<mapList.size();i++){
             SXSSFRow tempRow = sheet.createRow(rowNum++);
             tempRow.setHeight((short)500);
-            for(int j=0;j<11;j++){
+            for(int j=0;j<12;j++){
                 SXSSFCell tempCell = tempRow.createCell(j);
                 String cellValue = "";
                 tempCell.setCellStyle(cellStyle);

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -101,7 +101,8 @@
   },
   "headerTop": {
     "projectName": "project name",
-    "serialNumber": "serial number"
+    "serialNumber": "serial number",
+    "currentStage": "current stage"
   },
   "defaultText": {
     "pleaseEnterTheOldPassword": "Please enter the old password",

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -101,7 +101,8 @@
   },
   "headerTop": {
     "projectName": "项目名称",
-    "serialNumber": "序号"
+    "serialNumber": "序号",
+    "currentStage": "当前阶段"
   },
   "defaultText": {
     "pleaseEnterTheOldPassword": "请输入原密码",

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/packetConsumption/tables.vue

@@ -41,6 +41,7 @@
       <template v-if="types == 'all'">
         <el-table :key="24" border :data="tableList" highlight-current-row :height="(+tableHeight - 0) - 1" style="width: 100%;" :span-method="objectSpanMethod">
           <el-table-column align="center" prop="projectName" :label="$t('headerTop.projectName')" min-width="200"></el-table-column>
+          <el-table-column align="center" prop="currentStageName" :label="$t('headerTop.currentStage')" min-width="200"></el-table-column>
           <el-table-column align="center" prop="department_name" :label="$t('fuZeBuMen')" min-width="150">
             <template slot-scope="scope">
               <div>