实习登记导出调整

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/register/service/RegistrationService.java

@@ -751,16 +751,28 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
             // 实习经历
             List<RegistrationExperience> experiences = experienceMapper.getByRegisterId(id);
             if (CollectionUtils.isNotEmpty(experiences)) {
-                if (experiences.size()<2){
-                    for (int i = 0; i < 2; i++) {
-                        RegistrationExperience registrationExperience = new RegistrationExperience();
-                        registrationExperience.setStartTime("");
-                        registrationExperience.setEndTime("");
-                        registrationExperience.setPracticeUnit("");
-                        registrationExperience.setPost("");
-                        experiences.add(registrationExperience);
+                for (RegistrationExperience experience : experiences) {
+                    if (StringUtils.isBlank(experience.getStartTime())){
+                        experience.setStartTime("");
+                    }
+                    if (StringUtils.isBlank(experience.getEndTime())){
+                        experience.setEndTime("");
+                    }
+                    if (StringUtils.isBlank(experience.getPracticeUnit())){
+                        experience.setPracticeUnit("");
+                    }
+                    if (StringUtils.isBlank(experience.getPost())){
+                        experience.setPost("");
                     }
                 }
+                while (experiences.size() < 2) {
+                    RegistrationExperience registrationExperience = new RegistrationExperience();
+                    registrationExperience.setStartTime("");
+                    registrationExperience.setEndTime("");
+                    registrationExperience.setPracticeUnit("");
+                    registrationExperience.setPost("");
+                    experiences.add(registrationExperience);
+                }
                 data.put("experiences", experiences);
             } else {
                 ArrayList<RegistrationExperience> list = new ArrayList<>();
@@ -778,7 +790,21 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
             // 家庭成员
             List<RegistrationFamilyMembers> familyMembers = familyMembersMapper.getByRegisterId(id);
             if (CollectionUtils.isNotEmpty(familyMembers)) {
-                if (familyMembers.size()<2){
+                for (RegistrationFamilyMembers familyMember : familyMembers) {
+                    if (StringUtils.isBlank(familyMember.getCallName())){
+                        familyMember.setCallName("");
+                    }
+                    if (StringUtils.isBlank(familyMember.getName())){
+                        familyMember.setName("");
+                    }
+                    if (StringUtils.isBlank(familyMember.getPhone())){
+                        familyMember.setPhone("");
+                    }
+                    if (StringUtils.isBlank(familyMember.getWorkUnit())){
+                        familyMember.setWorkUnit("");
+                    }
+                }
+                while (familyMembers.size()<2){
                     RegistrationFamilyMembers members = new RegistrationFamilyMembers();
                     members.setCallName("");
                     members.setName("");
@@ -818,7 +844,7 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
             data.put("projectManager", "");
             data.put("practiceCompleteDay", "");
             ArrayList<RegistrationExperience> list = new ArrayList<>();
-            for (int i = 0; i < 2; i++) {
+            while (list.size()<2){
                 RegistrationExperience registrationExperience = new RegistrationExperience();
                 registrationExperience.setStartTime("");
                 registrationExperience.setEndTime("");
@@ -829,7 +855,7 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
             data.put("experiences",list);
 
             ArrayList<RegistrationFamilyMembers> list1 = new ArrayList<>();
-            for (int i = 0; i < 2; i++) {
+            while (list1.size()<2){
                 RegistrationFamilyMembers members = new RegistrationFamilyMembers();
                 members.setCallName("");
                 members.setName("");