Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

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

@@ -717,8 +717,10 @@ public class ProjectController {
         heads.add(MessageUtils.message("entry.publicProject"));
         //heads.add("项目名称");
         heads.add(MessageUtils.message("entry.projectName"));
+        heads.add("项目描述");
         exampleDataList.add("否");
         exampleDataList.add("示例-项目名称");
+        exampleDataList.add("项目描述");
         if(timeType.getMainProjectState()!=1){
             //heads.add("子项目(多个用，隔开)");
             heads.add(MessageUtils.message("entry.sonProject"));
@@ -804,8 +806,6 @@ public class ProjectController {
                 exampleDataList.add("");
             }
         }
-        heads.add("项目描述");
-        exampleDataList.add("项目描述");
         List<List<String>> allList = new ArrayList<>();
         allList.add(heads);
         allList.add(exampleDataList);

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

@@ -3802,25 +3802,25 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     XSSFCell categoryCell = row.getCell(1);
                     XSSFCell isPublicCell = row.getCell(2);
                     XSSFCell nameCell = row.getCell(3);
-                    XSSFCell subNameCell = row.getCell(4);
-                    XSSFCell participatorCell = row.getCell(5);
-                    XSSFCell inchargerCell = row.getCell(6);
+                    XSSFCell descCell = row.getCell(4);
+                    XSSFCell subNameCell = row.getCell(5);
+                    XSSFCell participatorCell = row.getCell(6);
+                    XSSFCell inchargerCell = row.getCell(7);
                     XSSFCell reportAuditorsCell=null;
                     XSSFCell reportCcCell=null;
                     int i=0;
                     if(timeType.getReportAuditType()==0||timeType.getReportAuditType()==4||timeType.getReportAuditType()==6){
                         i++;
-                        reportAuditorsCell = row.getCell(6+i);
+                        reportAuditorsCell = row.getCell(7+i);
                     }
-                    if(timeType.getReportAuditType()==6){
+                    if(timeType.getReportAuditType()==7){
                         i++;
-                        reportCcCell=row.getCell(6+i);
+                        reportCcCell=row.getCell(7+i);
                     }
-                    XSSFCell levelCell = row.getCell(7+i);
-                    XSSFCell startDateCell = row.getCell(8+i);
-                    XSSFCell endDateCell = row.getCell(9+i);
-                    XSSFCell amountCell = row.getCell(10+i);
-                    XSSFCell descCell = row.getCell(11+i);
+                    XSSFCell levelCell = row.getCell(8+i);
+                    XSSFCell startDateCell = row.getCell(9+i);
+                    XSSFCell endDateCell = row.getCell(10+i);
+                    XSSFCell amountCell = row.getCell(11+i);
 
 
                     if (codeCell != null)codeCell.setCellType(CellType.STRING);
@@ -4217,9 +4217,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         if (!StringUtils.isEmpty(part)) {
                             String[] partSplit = part.split("\\，|\\,");
                             for (String str : partSplit) {
-                                if(str.equals(inchargerCell.getStringCellValue())){
-                                    continue;
-                                }
                                 ProjectCcuser projectCcuser = new ProjectCcuser();
                                 String s1;
                                 if(str.startsWith("/")){
@@ -4460,73 +4457,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         }
                         isPublicCell = row.getCell(2+i);
                         nameCell = row.getCell(3+i);
-                        participatorCell = row.getCell(4+i);
-                        inchargerCell = row.getCell(5+i);
-                        if(timeType.getReportAuditType()==0||timeType.getReportAuditType()==4||timeType.getReportAuditType()==6){
-                            i++;
-                            reportAuditorsCell=row.getCell(5+i);
-                        }
-                        if(timeType.getReportAuditType()==6){
-                            i++;
-                            reportCcCell=row.getCell(5+i);
-                        }
-                        levelCell = row.getCell(6+i);
-                        if(timeType.getProjectWithDept()==1){
-                            deptCell=row.getCell(7+i);
-                            i++;
-                        }
-                        if(company.getPackageCustomer()==1){
-                            customerCell=row.getCell(7+i);
-                            i++;
-                        }
-                        if(company.getPackageProvider()==1){
-                            for (int j = 0; j < providerCategoryList.size(); j++) {
-                                if(company.getPackageProvider()==1){
-                                    i++;
-                                }
-                            }
-                        }
-                        startDateCell = row.getCell(7+i);
-                        endDateCell = row.getCell(8+i);
-                        amountCell = row.getCell(9+i);
-                        if(company.getId()==936){
-                            warrantyStartDateCell=row.getCell(10+i);
-                            warrantyEndDateCell=row.getCell(11+i);
-                            projectCategorySubCell=row.getCell(12+i);
-                            regionCell=row.getCell(13+i);
-                            buCell=row.getCell(14+i);
-                            stateCell=row.getCell(15+i);
-                            stageCell=row.getCell(16+i);
-                            plate1=row.getCell(17+i);
-                            plate2=row.getCell(18+i);
-                            plate3=row.getCell(19+i);
-                            plate4=row.getCell(20+i);
-                            plate5=row.getCell(21+i);
-                            plate6=row.getCell(22+i);
-                            plate7=row.getCell(23+i);
-                            plate8=row.getCell(24+i);
-                            plate9=row.getCell(25+i);
-                            plate10=row.getCell(26+i);
-                            plate11=row.getCell(27+i);
-                            plate12=row.getCell(28+i);
-                            plate13=row.getCell(29+i);
-                            plate14=row.getCell(30+i);
-                            plate15=row.getCell(31+i);
-                            plate16=row.getCell(32+i);
-                            plate17=row.getCell(33+i);
-                            plate18=row.getCell(34+i);
-                            descCell=row.getCell(35+i);
-                        }else descCell=row.getCell(10+i);
-                    }else {
-                        codeCell = row.getCell(0);
-                        if(company.getId()==936){
-                            contractCell=row.getCell(1);
-                            i++;
-                        }
-                        categoryCell = row.getCell(1+i);
-                        isPublicCell = row.getCell(2+i);
-                        nameCell = row.getCell(3+i);
-                        subNameCell = row.getCell(4+i);
+                        descCell=row.getCell(4+i);
                         participatorCell = row.getCell(5+i);
                         inchargerCell = row.getCell(6+i);
                         if(timeType.getReportAuditType()==0||timeType.getReportAuditType()==4||timeType.getReportAuditType()==6){
@@ -4582,8 +4513,75 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             plate16=row.getCell(33+i);
                             plate17=row.getCell(34+i);
                             plate18=row.getCell(35+i);
-                            descCell=row.getCell(36+i);
-                        }else descCell=row.getCell(11+i);
+
+                        }
+                    }else {
+                        codeCell = row.getCell(0);
+                        if(company.getId()==936){
+                            contractCell=row.getCell(1);
+                            i++;
+                        }
+                        categoryCell = row.getCell(1+i);
+                        isPublicCell = row.getCell(2+i);
+                        nameCell = row.getCell(3+i);
+                        descCell=row.getCell(4+i);
+                        subNameCell = row.getCell(5+i);
+                        participatorCell = row.getCell(6+i);
+                        inchargerCell = row.getCell(7+i);
+                        if(timeType.getReportAuditType()==0||timeType.getReportAuditType()==4||timeType.getReportAuditType()==6){
+                            i++;
+                            reportAuditorsCell=row.getCell(7+i);
+                        }
+                        if(timeType.getReportAuditType()==6){
+                            i++;
+                            reportCcCell=row.getCell(7+i);
+                        }
+                        levelCell = row.getCell(8+i);
+                        if(timeType.getProjectWithDept()==1){
+                            deptCell=row.getCell(9+i);
+                            i++;
+                        }
+                        if(company.getPackageCustomer()==1){
+                            customerCell=row.getCell(9+i);
+                            i++;
+                        }
+                        if(company.getPackageProvider()==1){
+                            for (int j = 0; j < providerCategoryList.size(); j++) {
+                                if(company.getPackageProvider()==1){
+                                    i++;
+                                }
+                            }
+                        }
+                        startDateCell = row.getCell(9+i);
+                        endDateCell = row.getCell(10+i);
+                        amountCell = row.getCell(11+i);
+                        if(company.getId()==936){
+                            warrantyStartDateCell=row.getCell(12+i);
+                            warrantyEndDateCell=row.getCell(13+i);
+                            projectCategorySubCell=row.getCell(14+i);
+                            regionCell=row.getCell(15+i);
+                            buCell=row.getCell(16+i);
+                            stateCell=row.getCell(17+i);
+                            stageCell=row.getCell(18+i);
+                            plate1=row.getCell(19+i);
+                            plate2=row.getCell(20+i);
+                            plate3=row.getCell(21+i);
+                            plate4=row.getCell(22+i);
+                            plate5=row.getCell(23+i);
+                            plate6=row.getCell(24+i);
+                            plate7=row.getCell(25+i);
+                            plate8=row.getCell(26+i);
+                            plate9=row.getCell(27+i);
+                            plate10=row.getCell(28+i);
+                            plate11=row.getCell(29+i);
+                            plate12=row.getCell(30+i);
+                            plate13=row.getCell(31+i);
+                            plate14=row.getCell(32+i);
+                            plate15=row.getCell(33+i);
+                            plate16=row.getCell(34+i);
+                            plate17=row.getCell(35+i);
+                            plate18=row.getCell(36+i);
+                        }
 
                     }
                     if (codeCell != null)codeCell.setCellType(CellType.STRING);
@@ -5454,9 +5452,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         if (!StringUtils.isEmpty(part)) {
                             String[] partSplit = part.split("\\，|\\,");
                             for (String str : partSplit) {
-                                if(str.equals(inchargerCell.getStringCellValue())){
-                                    continue;
-                                }
                                 String s1;
                                 if(str.startsWith("/")){
                                     s1=str.substring(1,str.length());