1、导入模块调整

2、导出模块调整

src/main/java/com/xjrsoft/module/dataexpert/controller/DataExpertTemplateController.java

@@ -142,9 +142,9 @@ public class DataExpertTemplateController {
     }
 
 
-    @GetMapping("/export")
+    @PostMapping("/export-query")
     @ApiOperation(value = "导出")
-    public ResponseEntity<byte[]> exportData(@Valid DataExpertDto dto) {
+    public ResponseEntity<byte[]> exportData(@Valid @RequestBody DataExpertDto dto) {
         //拼接字段
         String fields = "";
         Map<Integer, String> showNameMap = new HashMap<>();

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

@@ -412,7 +412,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
             studentSchoolRollMap.put(schoolRoll.getUserId(), schoolRoll);
         }
 
-        SimpleDateFormat sdf = new SimpleDateFormat();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
         //查询年级
         List<BaseGrade> gradeList = baseGradeMapper.selectList(new QueryWrapper<BaseGrade>().lambda().eq(BaseGrade::getDeleteMark, DeleteMark.NODELETE.getCode()));
@@ -531,8 +531,11 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
                 }
                 contact.setDeleteMark(DeleteMark.NODELETE.getCode());
             }else{
-
                 user = new BaseStudentUser();
+                user.setCredentialNumber(credentialNumber);
+                user.setCreateUserId(createUserId);
+                user.setCreateDate(LocalDateTime.now());
+
                 baseStudent = new BaseStudent();
                 baseStudent.setUserId(userId);
                 baseStudent.setCreateUserId(createUserId);
@@ -587,7 +590,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
                 baseStudent.setPyName(dataMaps.get(9).toString());//姓名拼音
             }
             if(dataMaps.get(10) != null && !"".equals(dataMaps.get(10).toString())){
-                baseStudent.setPyName(dataMaps.get(10).toString());//曾用名
+                baseStudent.setFormerName(dataMaps.get(10).toString());//曾用名
             }
             if(dataMaps.get(11) != null && !"".equals(dataMaps.get(11).toString())){
                 user.setCredentialType(dictionary.get(dataMaps.get(11).toString()));//证件类型
@@ -802,7 +805,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
                 studentFamily.setContact(dataMaps.get(76).toString());//联系人姓名
             }
             if(dataMaps.get(79) != null && !"".equals(dataMaps.get(79).toString())){
-                studentFamily.setPopulation(Integer.parseInt(dataMaps.get(76).toString()));//家庭人口
+                studentFamily.setPopulation(Integer.parseInt(dataMaps.get(79).toString()));//家庭人口
             }
             if(dataMaps.get(80) != null && !"".equals(dataMaps.get(80).toString())){
                 studentFamily.setAddress(dataMaps.get(80).toString());//家庭地址