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

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

@@ -1207,8 +1207,8 @@ public class WeiXinCorpController {
                         project.setCreatorId(user.getId());
                         project.setCreatorName(user.getName());
                         project.setCreateDate(LocalDate.now());
-                        project.setProjectCode("example1");
-                        project.setProjectName(MessageUtils.message("project.example"));
+                        project.setProjectCode("example");
+                        project.setProjectName("示例项目");
                         projectMapper.insert(project);
                         //todo:  设置初始项目参与人
                         Participation participation=new Participation();
@@ -1224,13 +1224,13 @@ public class WeiXinCorpController {
                         TaskGroup taskGroup = new TaskGroup();
                         taskGroup.setProjectId(project.getId())
                                 .setInchargerId(user.getId())
-                                .setName(MessageUtils.message("entry.projectStage"));
+                                .setName("项目阶段");
                         taskGroupMapper.insert(taskGroup);
                         Stages stage = new Stages();
                         stage.setGroupId(taskGroup.getId());
                         stage.setSequence(1);
                         stage.setProjectId(project.getId());
-                        stage.setStagesName(MessageUtils.message("excel.WorkUnfolds"));
+                        stage.setStagesName("工作开展");
                         stagesMapper.insert(stage);
                         Task task=new Task();
                         task.setCreateDate(LocalDate.now());
@@ -1245,7 +1245,7 @@ public class WeiXinCorpController {
                         task.setStagesId(stage.getId());
                         task.setGroupId(taskGroup.getId());
                         task.setSeq(0);
-                        task.setName(MessageUtils.message("Stages.example"));
+                        task.setName("示例任务");
                         taskMapper.insert(task);
                     }
 

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -497,7 +497,7 @@ import timetoolVue from '../timetool/timetool.vue';
                 let hours = 0
                 for(let i in domains){
                     if(domains[i].projectId){
-                        hours += parseFloat(domains[i].workingTime)
+                        // hours += parseFloat(domains[i].workingTime)
                         if(this.reportTimeType.multiWorktime == 1){
                             for(let m in domains[i].worktimeList){
                                 if(domains[i].worktimeList[m].startTime && domains[i].worktimeList[m].endTime){