Browse Source

调整导入程序

dzx 1 year ago
parent
commit
dfa54717ef

+ 4 - 4
src/main/java/com/xjrsoft/module/student/service/impl/StudentManagerServiceImpl.java

@@ -469,8 +469,8 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
         List<BaseStudentFamily> insertFamilyList = new ArrayList();
         List<BaseStudentContact> insertContactList = new ArrayList();
 
-        long createUserId = StpUtil.getLoginIdAsLong();
-//        long createUserId = 1000000000000000000L;
+//        long createUserId = StpUtil.getLoginIdAsLong();
+        long createUserId = 1000000000000000000L;
         int row = 3;
         for (Map<Integer, Object> dataMaps : excelDataList) {
             if(dataMaps.get(0) == null){
@@ -606,7 +606,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
                 baseStudent.setDayOfBirth(birthday.toLocalDate());//出生日期
             }
             if(dataMaps.get(13) != null && !"".equals(dataMaps.get(13).toString())){
-                baseStudent.setBirthType(dictionary.get("birth_type" + dataMaps.get(13).toString()));//生日类型
+                baseStudent.setBirthType(dictionary.get("date_type" + dataMaps.get(13).toString()));//生日类型
             }
             if(dataMaps.get(14) != null && !"".equals(dataMaps.get(14).toString())){
                 baseStudent.setNation(dictionary.get("nation" + dataMaps.get(14).toString()));//民族
@@ -901,7 +901,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
         codeList.add("choose_status");codeList.add("foster_type");
         codeList.add("recruit_type");codeList.add("recruit_target");
         codeList.add("education");codeList.add("recruit_target");
-        codeList.add("education");
+        codeList.add("date_type");
         List<DictionaryDetail> detailList = dictionarydetailMapper.selectJoinList(DictionaryDetail.class,
             new MPJLambdaWrapper<DictionaryDetail>()
             .leftJoin(DictionaryItem.class, DictionaryItem::getId, DictionaryDetail::getItemId)