翻译，项目编号导出，项目编号展示

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectController.java

@@ -319,6 +319,7 @@ public class ProjectController {
         OperationRecord operationRecord=new OperationRecord();
         operationRecord.setProjectName(project1.getProjectName());
         operationRecord.setOperationTime(LocalDateTime.now());
+        //operationRecord.setModuleName("项目管理");
         operationRecord.setModuleName("项目管理");
         operationRecord.setContent("完成了项目");
         operationRecord.setOperatorName(user.getName());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -752,27 +752,46 @@ public class WeiXinCorpController {
                         //生成费用报销默认条目
                         String[] expenseTypes = Constant.EXPENSE_TYPES;
                         List<String> commonly = new ArrayList<>();
-                        commonly.add("材料费");
-                        commonly.add("办公用品");
-                        commonly.add("培训费");
-                        commonly.add("打印费");
-                        commonly.add("快递费");
-                        commonly.add("制作费");
-                        commonly.add("律师费");
-                        commonly.add("水费");
-                        commonly.add("电费");
-                        commonly.add("团建费");
-                        commonly.add("其他");
+                        //commonly.add("材料费");
+                        commonly.add(MessageUtils.message("entry.materialCost"));
+                        //commonly.add("办公用品");
+                        commonly.add(MessageUtils.message("entry.workCost"));
+                        //commonly.add("培训费");
+                        commonly.add(MessageUtils.message("entry.trainCost"));
+                        //commonly.add("打印费");
+                        commonly.add(MessageUtils.message("entry.printCost"));
+                        //commonly.add("快递费");
+                        commonly.add(MessageUtils.message("entry.expressCost"));
+                        //commonly.add("制作费");
+                        commonly.add(MessageUtils.message("entry.makeCost"));
+                        //commonly.add("律师费");
+                        commonly.add(MessageUtils.message("entry.lawyerCost"));
+                        //commonly.add("水费");
+                        commonly.add(MessageUtils.message("entry.waterCost"));
+                        //commonly.add("电费");
+                        commonly.add(MessageUtils.message("entry.electricCost"));
+                        //commonly.add("团建费");
+                        commonly.add(MessageUtils.message("entry.leagueCost"));
+                        //commonly.add("其他");
+                        commonly.add(MessageUtils.message("entry.other"));
                         List<String> travel  = new ArrayList<>();
-                        travel.add("城市间交通费");
-                        travel.add("住宿费");
-                        travel.add("伙食补助费");
-                        travel.add("市内交通费");
-                        travel.add("其他差旅费");
+                        //travel.add("城市间交通费");
+                        travel.add(MessageUtils.message("entry.cityTrafficCost"));
+                        //travel.add("住宿费");
+                        travel.add(MessageUtils.message("entry.liveCost"));
+                        //travel.add("伙食补助费");
+                        travel.add(MessageUtils.message("entry.eatCost"));
+                        //travel.add("市内交通费");
+                        travel.add(MessageUtils.message("entry.insideCityCost"));
+                        //travel.add("其他差旅费");
+                        travel.add(MessageUtils.message("entry.otherLiveTraCost"));
                         List<String> outsource = new ArrayList<>();
-                        outsource.add("项目外包费");
-                        outsource.add("劳务外包费");
-                        outsource.add("其他外包费");
+                        //outsource.add("项目外包费");
+                        outsource.add(MessageUtils.message("entry.projectCost"));
+                        //outsource.add("劳务外包费");
+                        outsource.add(MessageUtils.message("entry.labourCost"));
+                        //outsource.add("其他外包费");
+                        outsource.add(MessageUtils.message("entry.OtherOutsourceCost"));
                         List<ExpenseType> expenseTypeList=new ArrayList<>();
                         for (String expenseType : expenseTypes) {
                             ExpenseType item=new ExpenseType();
@@ -819,7 +838,7 @@ public class WeiXinCorpController {
                         if (!enableNewVersion) {
                             //老版本的要兼容转化姓名
                             if (name.length() > 10) {
-                                name = "未知";
+                                name = MessageUtils.message("entry.unknown");
                             }
                         }
 

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

@@ -3321,6 +3321,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             titles.add("工号");
             titles.add("员工");
             titles.add("所在部门");
+            titles.add("项目编号");
             titles.add("项目名称");
             titles.add("项目分类");
             if(timeType.getMainProjectState()==1){
@@ -3514,16 +3515,17 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 row.createCell(1).setCellValue((String) map.get("jobNumber"));
                 row.createCell(2).setCellValue((String) map.get("name"));
                 row.createCell(3).setCellValue((String) map.get("departmentName"));
-                row.createCell(4).setCellValue((String) map.get("project"));
-                row.createCell(5).setCellValue((String) map.get("categoryName"));
+                row.createCell(4).setCellValue((String) map.get("projectCode"));
+                row.createCell(5).setCellValue((String) map.get("project"));
+                row.createCell(6).setCellValue((String) map.get("categoryName"));
                 if(timeType.getMainProjectState()==1){
-                    row.createCell(6).setCellValue((String) map.get("projectMainName"));
+                    row.createCell(7).setCellValue((String) map.get("projectMainName"));
                 }else {
-                    row.createCell(6).setCellValue((String) map.get("subProjectName"));
+                    row.createCell(7).setCellValue((String) map.get("subProjectName"));
                 }
-                int index = 7;
+                int index = 8;
                 if (company.getPackageProject() == 1) {
-                    row.createCell(7).setCellValue((String) map.get("taskName"));
+                    row.createCell(8).setCellValue((String) map.get("taskName"));
                     index++;
                 }
                 HSSFCell cell = row.createCell(index);

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

@@ -345,6 +345,7 @@ entry.staffName=员工姓名
 entry.goWorkTime=上班时间
 entry.offWorkTime=下班时间
 entry.actualWorkTime=实际工作时长
+entry.unknown=未知
 #文件名
 fileName.financialCost={0}_财务人员成本模板
 fileName.projectImport={0}_项目导入模板

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

@@ -345,6 +345,7 @@ entry.staffName=Employee Name
 entry.goWorkTime=work shift
 entry.offWorkTime=closing time
 entry.actualWorkTime=Actual working hours
+entry.unknown=unknown
 #ÎļþÃû
 fileName.financialCost={0}_ Financial Staff Cost Template
 fileName.projectImport={0}_ Project import template

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

@@ -294,7 +294,7 @@
 
     <!--新版获取待审核的列表,一次性获取全部 -->
     <select id="getAuditReportList" resultType="java.util.Map">
-        SELECT a.id, user.id as userId, user.name, DATE_FORMAT(a.create_date, '%Y-%m-%d') as date, a.project_id as projectId, b.project_name AS project, a.working_time AS time, a.content, a.state, a.time_type as timeType,
+        SELECT a.id, user.id as userId, user.name, DATE_FORMAT(a.create_date, '%Y-%m-%d') as date, a.project_id as projectId, b.project_code AS projectCode, b.project_name AS project, a.working_time AS time, a.content, a.state, a.time_type as timeType,
         a.cost, a.report_time_type as reportTimeType, a.start_time as startTime,
         a.end_time as endTime, b.incharger_id as inchargerId,dept.department_name as departmentName,
         a.creator_id as creatorId, d.name as subProjectName,a.task_id as taskId, task.name as taskName, a.is_overtime as isOvertime,a.progress as progress,