Bladeren bron

1、git new commit

guanzi 4 jaren geleden
bovenliggende
commit
8179da02b8

+ 1 - 1
src/main/java/com/sprivacy/pms/service/impl/PerServiceImpl.java

@@ -788,7 +788,7 @@ public class PerServiceImpl extends ServiceImpl<PerMapper, Per> implements PerSe
         countByEducation.setCollegeNum(getCountByPerNatureAndEducation("-1", "大专"));
         countByEducation.setCollegeNum(getCountByPerNatureAndEducation("-1", "大专"));
         countByEducation.setUndergraduateCourseNum(getCountByPerNatureAndEducation("-1", "本科"));
         countByEducation.setUndergraduateCourseNum(getCountByPerNatureAndEducation("-1", "本科"));
         countByEducation.setShuoNum(getCountByPerNatureAndEducation("-1", "硕士"));
         countByEducation.setShuoNum(getCountByPerNatureAndEducation("-1", "硕士"));
-        countByEducation.setBoNum(getCountByPerNatureAndEducation("-1", "博士"));
+            countByEducation.setBoNum(getCountByPerNatureAndEducation("-1", "博士"));
         countByEducation.setHighSchoolNum(getCountByPerNatureAndEducation("-1", "高中"));
         countByEducation.setHighSchoolNum(getCountByPerNatureAndEducation("-1", "高中"));
         countByEducation.setTechnicalSecondarySchoolNum(getCountByPerNatureAndEducation("-1", "中专"));
         countByEducation.setTechnicalSecondarySchoolNum(getCountByPerNatureAndEducation("-1", "中专"));
         countByEducation.setOtherEducationNum(getCountByPerNatureAndEducation("-1", "其他"));
         countByEducation.setOtherEducationNum(getCountByPerNatureAndEducation("-1", "其他"));

+ 0 - 1
src/main/java/com/sprivacy/pms/service/impl/UploadServiceImpl.java

@@ -233,7 +233,6 @@ public class UploadServiceImpl implements UploadService {
      */
      */
     @Override
     @Override
     public void download(List<Long> ids, HttpServletRequest request, HttpServletResponse response) throws Exception {
     public void download(List<Long> ids, HttpServletRequest request, HttpServletResponse response) throws Exception {
-
         if (ids.size() == 1) {
         if (ids.size() == 1) {
             log.info("download single excel file START");
             log.info("download single excel file START");
             ExportExcelUtil.exportSingleExcelFile(savedDir, ids.get(0), request, response);
             ExportExcelUtil.exportSingleExcelFile(savedDir, ids.get(0), request, response);