From d52514e9934e53821a61a96aebb9fa02a9deab04 Mon Sep 17 00:00:00 2001 From: mzh820631607 Date: Tue, 3 Nov 2020 16:34:47 +0800 Subject: [PATCH] =?UTF-8?q?0.2=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tms/common/utils/ExcelImportHelper.java | 16 +++---- .../com/msdw/tms/dao/ProjectRecordDao.java | 1 + .../com/msdw/tms/dao/SystemSetttingDao.java | 2 +- .../com/msdw/tms/entity/vo/StaffExportVo.java | 4 +- .../impl/ProjectRecordServiceImpl.java | 3 +- .../service/impl/QuestionsServiceImpl.java | 5 ++- .../impl/SystemSettingServiceImpl.java | 39 ++++++++++++------ .../员工信息导入模板.xlsx | Bin 9431 -> 9603 bytes .../员工导入失败数据导出模板.xlsx | Bin 0 -> 9442 bytes .../虚拟仿真实验报告导出模板.xlsx | Bin 10329 -> 10321 bytes .../resources/mapper/tms/ProjectRecordDao.xml | 25 +++++++++++ .../resources/mapper/tms/SystemSetting.xml | 4 +- 12 files changed, 72 insertions(+), 27 deletions(-) create mode 100644 src/main/resources/excel-template/员工导入失败数据导出模板.xlsx diff --git a/src/main/java/com/msdw/tms/common/utils/ExcelImportHelper.java b/src/main/java/com/msdw/tms/common/utils/ExcelImportHelper.java index 8e5ec3f..164137b 100644 --- a/src/main/java/com/msdw/tms/common/utils/ExcelImportHelper.java +++ b/src/main/java/com/msdw/tms/common/utils/ExcelImportHelper.java @@ -127,27 +127,27 @@ public class ExcelImportHelper { // Cell staffGradeName = row.getCell(4); if (row.getCell(4)!=null){ row.getCell(4).setCellType(CellType.STRING); - staffGradeName = row.getCell(4); + staffProfessionalArchitectureName = row.getCell(4); }else { - staffGradeName = row.createCell(4); + staffProfessionalArchitectureName = row.createCell(4); } if (row.getCell(5)!=null){ row.getCell(5).setCellType(CellType.STRING); - staffProfessionalArchitectureName = row.getCell(5); + staffGradeName = row.getCell(5); }else { - staffProfessionalArchitectureName = row.createCell(5); + staffGradeName = row.createCell(5); } if (row.getCell(6)!=null){ row.getCell(6).setCellType(CellType.STRING); - staffGradeNameTwo = row.getCell(6); + staffProfessionalArchitectureNameTwo = row.getCell(6); }else { - staffGradeNameTwo = row.createCell(6); + staffProfessionalArchitectureNameTwo = row.createCell(6); } if (row.getCell(7)!=null){ row.getCell(7).setCellType(CellType.STRING); - staffProfessionalArchitectureNameTwo = row.getCell(7); + staffGradeNameTwo = row.getCell(7); }else { - staffProfessionalArchitectureNameTwo = row.createCell(7); + staffGradeNameTwo = row.createCell(7); } diff --git a/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java b/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java index d1cb7f8..0473934 100644 --- a/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java +++ b/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java @@ -33,4 +33,5 @@ public interface ProjectRecordDao extends BaseMapper { boolean updateUserRecord(ProjectRecordEntity projectRecord); + List getByRecordImport(ProjectRecordEntity projectRecord); } diff --git a/src/main/java/com/msdw/tms/dao/SystemSetttingDao.java b/src/main/java/com/msdw/tms/dao/SystemSetttingDao.java index 091dfd9..5c8612f 100644 --- a/src/main/java/com/msdw/tms/dao/SystemSetttingDao.java +++ b/src/main/java/com/msdw/tms/dao/SystemSetttingDao.java @@ -54,5 +54,5 @@ public interface SystemSetttingDao { Integer queryDepartmentNameOrganization(String staffProfessionalArchitectureName,Integer schoolId); - boolean judgmentGrade(String name,Integer schoolId); + List judgmentGrade(String name,Integer schoolId); } diff --git a/src/main/java/com/msdw/tms/entity/vo/StaffExportVo.java b/src/main/java/com/msdw/tms/entity/vo/StaffExportVo.java index 0e383dd..6c149ef 100644 --- a/src/main/java/com/msdw/tms/entity/vo/StaffExportVo.java +++ b/src/main/java/com/msdw/tms/entity/vo/StaffExportVo.java @@ -54,11 +54,11 @@ public class StaffExportVo { private String email; //所属院校 - @ExcelAttribute(sort = 10) + @ExcelAttribute(sort = 11) private String schoolAppellationName; //失败原因 - @ExcelAttribute(sort = 11) + @ExcelAttribute(sort = 10) private String failureMsg; diff --git a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java index c480cef..e27ed14 100644 --- a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java @@ -76,7 +76,8 @@ public class ProjectRecordServiceImpl extends ServiceImpl projectRecordVos = this.baseMapper.getByUserRecordImport(projectRecord); + List projectRecordVos = this.baseMapper.getByRecordImport(projectRecord); +// List projectRecordVos = this.baseMapper.getByUserRecordImport(projectRecord); List importRequests = projectRecordVos.stream().map(project -> { ProjectRecordImportRequest request = new ProjectRecordImportRequest(); diff --git a/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java index 2fafc67..ab1195f 100644 --- a/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java @@ -574,11 +574,12 @@ public class QuestionsServiceImpl extends ServiceImpl a = systemSetttingDao.judgmentGrade(architectureName,ConstantUtils.Keda_schoolId); + if (a.size()==0){ StaffExportVo vo = new StaffExportVo(); vo.setFailureMsg("不存在此子级部门"); vo.setIndex(ii).setUserName(staffVo.getUserName()).setAccount(staffVo.getAccount()).setRole(staffVo.getRole()).setWorkNumber(staffVo.getWorkNumber()).setStaffGradeName(staffVo.getStaffGradeName()).setStaffProfessionalArchitectureName(staffVo.getStaffProfessionalArchitectureName()).setStaffGradeNameTwo(staffVo.getStaffGradeNameTwo()).setStaffProfessionalArchitectureNameTwo(staffVo.getStaffProfessionalArchitectureNameTwo()).setPhone(staffVo.getPhone()).setEmail(staffVo.getEmail()).setSchoolAppellationName(staffVo.getSchoolAppellationName()); @@ -372,8 +370,8 @@ public class SystemSettingServiceImpl implements SystemSetttingService { failVo1.add(vo); continue; } - boolean a = systemSetttingDao.judgmentGrade(architectureNameTwo,ConstantUtils.Keda_schoolId); - if (!a){ + List a = systemSetttingDao.judgmentGrade(architectureNameTwo,ConstantUtils.Keda_schoolId); + if (a.size()==0){ StaffExportVo vo = new StaffExportVo(); vo.setFailureMsg("不存在此子级部门"); vo.setIndex(ii).setUserName(staffVo.getUserName()).setAccount(staffVo.getAccount()).setRole(staffVo.getRole()).setWorkNumber(staffVo.getWorkNumber()).setStaffGradeName(staffVo.getStaffGradeName()).setStaffProfessionalArchitectureName(staffVo.getStaffProfessionalArchitectureName()).setStaffGradeNameTwo(staffVo.getStaffGradeNameTwo()).setStaffProfessionalArchitectureNameTwo(staffVo.getStaffProfessionalArchitectureNameTwo()).setPhone(staffVo.getPhone()).setEmail(staffVo.getEmail()).setSchoolAppellationName(staffVo.getSchoolAppellationName()); @@ -445,15 +443,32 @@ public class SystemSettingServiceImpl implements SystemSetttingService { parse.sort(Comparator.comparing(StaffExportVo::getIndex)); //2.加载模板流数据 - org.springframework.core.io.Resource resource = new ClassPathResource("excel-template/员工信息导入失败模板.xlsx"); -// org.springframework.core.io.Resource resource = new FileSystemResource("E:/JavaworkSpace2/msdw_tms/src/main/resources/excel-template/员工信息导入失败模板.xlsx"); + org.springframework.core.io.Resource resource = new ClassPathResource("excel-template/员工导入失败数据导出模板.xlsx"); +// FileInputStream fis = new FileInputStream(resource.getFile()); InputStream inputStream = resource.getInputStream(); -// InputStream inputStream = new FileInputStream("E:/JavaworkSpace2/msdw_tms/src/main/resources/excel-template/员工信息导入失败模板.xlsx"); - - //3、通过工具类下载文件 new ExcelExportUtil(StaffExportVo.class, Constant.ROW_INDEX, Constant.STYLE_INDEX). - export(response, inputStream, parse, "员工信息导入失败数据表.xlsx"); + export(response, inputStream, parse, "导入失败数据表.xlsx"); + + if (inputStream!=null){ + inputStream.close(); + } + + + + + +// //2.加载模板流数据 +// org.springframework.core.io.Resource resource = new ClassPathResource("excel-template/staff/测试.xlsx"); +//// org.springframework.core.io.Resource resource = new FileSystemResource("E:/JavaworkSpace2/msdw_tms/src/main/resources/excel-template/员工信息导入失败模板.xlsx"); +// InputStream inputStream = resource.getInputStream(); +// //3、通过工具类下载文件 +// new ExcelExportUtil(StaffExportVo.class, Constant.ROW_INDEX, Constant.STYLE_INDEX). +// export(response, inputStream, parse, "员工信息导入失败数据表.xlsx"); +// +// if (inputStream!=null){ +// inputStream.close(); +// } } @Override diff --git a/src/main/resources/excel-template/员工信息导入模板.xlsx b/src/main/resources/excel-template/员工信息导入模板.xlsx index e4d75dbc7912b88af8ae01e98bedde5725661a48..70142e8a5a6e58a7961d3e41cfa082f627a62c09 100644 GIT binary patch delta 4944 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 Olcppq24*1u0001y!!9QP delta 4733 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

c~eo!o~8pbf-|7hU!rHW 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 X2!#Cex+^LJc1FX*BxtHH{>A @@ -54,6 +56,8 @@ tpr.userId = #{pro.userid} AND tpr.isdel = #{pro.isdel} + AND + tp.projectPermissions !=0 @@ -126,6 +132,25 @@ and recordState=#{pro.recordState} and ( projectName like concat('%',#{pro.condition},'%') or schoolName like concat('%',#{pro.condition},'%') or userName like concat('%',#{pro.condition},'%') ) + update tms_project_record diff --git a/src/main/resources/mapper/tms/SystemSetting.xml b/src/main/resources/mapper/tms/SystemSetting.xml index 8d5380d..e513654 100644 --- a/src/main/resources/mapper/tms/SystemSetting.xml +++ b/src/main/resources/mapper/tms/SystemSetting.xml @@ -92,6 +92,7 @@ u.logInNumber, u.lastLoginTime, u.schoolId, + u.account, s.staffId, s.workNumber, s.staffProfessionalArchitectureId, @@ -159,7 +160,7 @@ - SELECT staffGradeName FROM @@ -169,5 +170,6 @@ WHERE g.staffProfessionalArchitectureId = a.staffProfessionalArchitectureId AND a.schoolId = #{schoolId} AND a.staffProfessionalArchitectureName = #{name} + AND g.isdel = 0 AND a.isdel = 0 \ No newline at end of file