Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskClassServiceImpl.java

@@ -462,7 +462,6 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
                         .eq(BandingTask::getGradeId, baseClass.getGradeId())
                         .eq(BandingTask::getEnrollType, baseClass.getEnrollType())
                         .orderByDesc(BandingTask::getId)
-                        .eq(BandingTask::getStatus, 0)
         );
         if(bandingTasks.isEmpty()){
             return true;

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

@@ -555,9 +555,9 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
         }
         //查询班级
         List<BaseClass> classList = baseClassMapper.selectList(new QueryWrapper<BaseClass>().lambda().eq(BaseClass::getDeleteMark, DeleteMark.NODELETE.getCode()));
-        Map<String, Long> classMap = new HashMap<>();
-        for (BaseClass grade : classList) {
-            classMap.put(grade.getName(), grade.getId());
+        Map<String, BaseClass> classMap = new HashMap<>();
+        for (BaseClass baseclass : classList) {
+            classMap.put(baseclass.getName(), baseclass);
         }
         //查询专业
         List<BaseMajorSet> majorSetList = baseMajorSetMapper.selectList(new QueryWrapper<BaseMajorSet>().lambda().eq(BaseMajorSet::getDeleteMark, DeleteMark.NODELETE.getCode()));
@@ -861,8 +861,11 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
             if (dataMaps.get(52) != null && !"".equals(dataMaps.get(52).toString())) {
                 schoolRoll.setStudyYear(Double.parseDouble(dataMaps.get(52).toString()));//学制
             }
-            if (dataMaps.get(53) != null && !"".equals(dataMaps.get(53).toString())) {
-                //schoolRoll.setClassId(classMap.get(dataMaps.get(53).toString()));//班级
+            if (dataMaps.get(53) != null && !"".equals(dataMaps.get(53).toString()) && schoolRoll.getId() == null) {
+                schoolRoll.setClassId(classMap.get(dataMaps.get(53).toString()).getId());//班级
+                if(schoolRoll.getMajorSetId() == null){
+                    schoolRoll.setMajorSetId(classMap.get(dataMaps.get(53).toString()).getMajorSetId());
+                }
             }
             if (dataMaps.get(54) != null && !"".equals(dataMaps.get(54).toString())) {
                 schoolRoll.setStudentSource(dictionary.get("student_type" + dataMaps.get(54).toString()));//学生来源
@@ -959,23 +962,46 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
             if (dataMaps.get(83) != null && !"".equals(dataMaps.get(83).toString())) {
                 studentFamily.setRailwayStation(dataMaps.get(83).toString());//离家最近火车站
             }
-            if (studentUserMap.containsKey(credentialNumber)) {
-                updateStudentUserList.add(user);
-                updateBaseStudentList.add(baseStudent);
-                updateSchoolRollList.add(schoolRoll);
-                updateSubsidizeList.add(subsidize);
-                updateFamilyList.add(studentFamily);
-                updateContactList.add(contact);
-            } else {
+
+            if(user.getId() == null){
                 insertStudentUserList.add(user);
+            }else{
+                updateStudentUserList.add(user);
+            }
+
+            if(baseStudent.getId() == null){
                 insertBaseStudentList.add(baseStudent);
-                if (schoolRoll.getClassId() != null && schoolRoll.getGradeId() != null && schoolRoll.getMajorSetId() != null) {
-                    insertSchoolRollList.add(schoolRoll);
+            }else{
+                updateBaseStudentList.add(baseStudent);
+            }
+
+            if(schoolRoll.getId() == null){
+                if(schoolRoll.getArchivesStatus() == null){
+                    schoolRoll.setArchivesStatus(ArchivesStatusEnum.FB2901.getCode());
                 }
+                insertSchoolRollList.add(schoolRoll);
+            }else{
+                updateSchoolRollList.add(schoolRoll);
+            }
+
+            if(subsidize.getId() == null){
                 insertSubsidizeList.add(subsidize);
+            }else{
+                updateSubsidizeList.add(subsidize);
+            }
+
+            if(studentFamily.getId() == null){
                 insertFamilyList.add(studentFamily);
+            }else{
+                updateFamilyList.add(studentFamily);
+            }
+
+            if(contact.getId() == null){
                 insertContactList.add(contact);
+            }else{
+                updateContactList.add(contact);
             }
+
             row++;
         }
         //批量修改