修复

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

@@ -1458,6 +1458,7 @@ public class WeiXinCorpController {
                         project.setCreateDate(LocalDate.now());
                         project.setProjectCode("example");
                         project.setProjectName("示例项目");
+                        project.setManDay(1);//默认开通预估工时
                         //设置为公共项目，这样测试的用户都能填报
                         project.setIsPublic(1);
                         projectMapper.insert(project);
@@ -1737,6 +1738,7 @@ public class WeiXinCorpController {
         String url = GET_USER_INFO_URL.replace("ACCESS_TOKEN", accessToken).replace("USERID", userId);
         String result = restTemplate.getForObject(url, String.class);
         JSONObject obj = JSONObject.parseObject(result);
+        System.out.println("人员详情："+obj.toJSONString());
         return obj;
     }
 

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

@@ -4081,11 +4081,19 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }
                     XSSFCell participatorCell = row.getCell(6+(projectWithDept?1:0));
                     XSSFCell inchargerCell = row.getCell(7+(projectWithDept?1:0));
-                    if (participatorCell!=null)participatorCell.setCellType(CellType.STRING);
-                    if (inchargerCell != null)inchargerCell.setCellType(CellType.STRING);
-                    String part = participatorCell.getStringCellValue().trim();
-                    String inchargerName = inchargerCell.getStringCellValue().trim();
-                    if(part.equals("参与人")){
+
+                    String part = "";
+                    String inchargerName = "";
+                    if (participatorCell!=null) {
+                        participatorCell.setCellType(CellType.STRING);
+                        part = participatorCell.getStringCellValue().trim();
+                    }
+                    if (inchargerCell != null) {
+                        inchargerCell.setCellType(CellType.STRING);
+                        inchargerName = inchargerCell.getStringCellValue().trim();
+                    }
+                    //兼容繁体
+                    if(part.equals("参与人") || part.equals("參與人")){
                         continue;
                     }
                     String[] partSplit = part.split("\\，|\\,");
@@ -4167,10 +4175,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     boolean exists=false;
                     if (codeCell != null) {
                         String code = codeCell.getStringCellValue().trim().replaceAll("\\u00a0", "");
-                        if ((code.equals("项目编号") || code.equals("project No")) && rowIndex == 0) {
+                        if ((code.equals("项目编号") || code.equals("項目編號") || code.equals("project No")) && rowIndex == 0) {
                             //检查是否有子项目列
                             //if (!subNameCell.getStringCellValue().trim().startsWith("子项目")) {
-                            if (!subNameCell.getStringCellValue().trim().startsWith(MessageUtils.message("Template.subProject"))) {
+                            String subNameVal = subNameCell.getStringCellValue().trim();
+                            if (!subNameVal.startsWith(MessageUtils.message("Template.subProject")) && !subNameVal.startsWith("子項目")) {
                                 throw new Exception("缺少子项目列，请下载最新模板");
                             }
                             //跳过第一行标题
@@ -4716,7 +4725,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     if (inchargerCell != null)inchargerCell.setCellType(CellType.STRING);
                     String part = participatorCell.getStringCellValue().trim();
                     String inchargerName = inchargerCell.getStringCellValue().trim();
-                    if(part.equals("参与人")){
+                    if(part.equals("参与人") || part.equals("參與人")){
                         continue;
                     }
                     String[] partSplit = part.split("\\，|\\,");
@@ -4971,7 +4980,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     boolean exists=false;
                     if (codeCell != null) {
                         String code = codeCell.getStringCellValue().trim().replaceAll("\\u00a0", "");
-                        if ((code.equals("项目编号") || code.equals("project No")) && rowIndex == 0) {
+                        if ((code.equals("项目编号") || code.equals("項目編號")|| code.equals("project No")) && rowIndex == 0) {
                             //检查是否有子项目列
                             //if (subNameCell!=null&&!subNameCell.getStringCellValue().trim().startsWith("子项目")&&timeType.getMainProjectState()!=1) {
                             if (subNameCell!=null&&!subNameCell.getStringCellValue().trim().startsWith(MessageUtils.message("Template.subProject"))&&timeType.getMainProjectState()!=1) {

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -3156,7 +3156,7 @@
                     let formData = new FormData();
                     formData.append("file", item.file);
                     formData.append("companyId", this.user.companyId);
-                    let url = (this.user.timeType.enableNewWeeklyfill == 1 || this.user.companyId==936 || this.user.companyId==10)?'/report/importNewData':'/report/importData'
+                    let url = (this.user.timeType.enableNewWeeklyfill == 1 || this.user.companyId==936)?'/report/importNewData':'/report/importData'
                     this.http.uploadFile(url, formData,
                     res => {
                         this.$refs.upload.clearFiles();