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

web/src/main/java/com/ibeetl/jlw/entity/TeachingManagement.java

@@ -53,6 +53,7 @@ public class TeachingManagement extends BaseEntity{
     //组织机构ID
 
     private Long orgId ;
+    private String classId ;
 
     public TeachingManagement(){
     }
@@ -174,5 +175,11 @@ public class TeachingManagement extends BaseEntity{
         this.orgId = orgId;
     }
 
+    public String getClassId() {
+        return classId;
+    }
 
+    public void setClassId(String classId) {
+        this.classId = classId;
+    }
 }

web/src/main/java/com/ibeetl/jlw/service/TeachingManagementService.java

@@ -163,16 +163,26 @@ public class TeachingManagementService extends CoreBaseService<TeachingManagemen
         List<TeachingManagement> teachingManagementList = new ArrayList<>();
 
         for (TeachingManagement teacherBoundClass : teacherBoundClassList) {
-            TeachingManagement teachingManagement = new TeachingManagement();
-            teachingManagement.setUniversityFacultyInfo(teachingManagementQuery.getUniversityFacultyInfo());
-            teachingManagement.setUniversitySystemInfo(teachingManagementQuery.getUniversitySystemInfo());
-            teachingManagement.setTeacherInfo(teacherBoundClass.getTeacherInfo());
-            teachingManagement.setSchoolClassInfo(teacherBoundClass.getSchoolClassInfo());
-            teachingManagement.setTeacherMergeClassThirdAddTime(new Date());
-            teachingManagement.setTeacherMergeClassThirdStatus(1);
-            teachingManagement.setOrgId(teachingManagementQuery.getOrgId());
-            teachingManagement.setUserId(teachingManagementQuery.getUserId());
-            teachingManagementList.add(teachingManagement);
+
+            TeachingManagementQuery query = new TeachingManagementQuery();
+            query.setUniversityFacultyInfo(teachingManagementQuery.getUniversityFacultyInfo());
+            query.setUniversitySystemInfo(teachingManagementQuery.getUniversitySystemInfo());
+            query.setTeacherInfo(teachingManagementQuery.getTeacherInfo());
+            query.setSchoolClassInfo(teacherBoundClass.getClassId());
+            List<TeachingManagement> valuesByQueryNotWithPermission = teachingManagementDao.getValuesByQueryNotWithPermission(query);
+
+            if (CollectionUtil.isEmpty(valuesByQueryNotWithPermission)){
+                TeachingManagement teachingManagement = new TeachingManagement();
+                teachingManagement.setUniversityFacultyInfo(teachingManagementQuery.getUniversityFacultyInfo());
+                teachingManagement.setUniversitySystemInfo(teachingManagementQuery.getUniversitySystemInfo());
+                teachingManagement.setTeacherInfo(teachingManagementQuery.getTeacherInfo());
+                teachingManagement.setSchoolClassInfo(teacherBoundClass.getClassId());
+                teachingManagement.setTeacherMergeClassThirdAddTime(new Date());
+                teachingManagement.setTeacherMergeClassThirdStatus(1);
+                teachingManagement.setOrgId(teachingManagementQuery.getOrgId());
+                teachingManagement.setUserId(teachingManagementQuery.getUserId());
+                teachingManagementList.add(teachingManagement);
+            }
         }
 
         if (CollectionUtil.isNotEmpty(teachingManagementList)){
@@ -204,15 +214,32 @@ public class TeachingManagementService extends CoreBaseService<TeachingManagemen
             return "请选择老师绑定班级";
         }
 
-        TeachingManagement teachingManagement = new TeachingManagement();
-        teachingManagement.setTeacherMergeClassThirdId(teachingManagementQuery.getTeacherMergeClassThirdId());
         for (TeachingManagement management : teacherBoundClassList) {
-            teachingManagement.setSchoolClassInfo(management.getSchoolClassInfo());
-            teachingManagement.setTeacherMergeClassThirdStatus(management.getTeacherMergeClassThirdStatus());
-        }
-
-        teachingManagementDao.updateTemplateById(teachingManagement);
 
+            TeachingManagementQuery query = new TeachingManagementQuery();
+            query.setUniversityFacultyInfo(teachingManagementQuery.getUniversityFacultyInfo());
+            query.setUniversitySystemInfo(teachingManagementQuery.getUniversitySystemInfo());
+            query.setTeacherInfo(teachingManagementQuery.getTeacherInfo());
+            query.setSchoolClassInfo(management.getClassId());
+            List<TeachingManagement> valuesByQueryNotWithPermission = teachingManagementDao.getValuesByQueryNotWithPermission(query);
+
+            if (CollectionUtil.isEmpty(valuesByQueryNotWithPermission)){
+                TeachingManagement addTeachingManagement = new TeachingManagement();
+                addTeachingManagement.setUniversityFacultyInfo(teachingManagementQuery.getUniversityFacultyInfo());
+                addTeachingManagement.setUniversitySystemInfo(teachingManagementQuery.getUniversitySystemInfo());
+                addTeachingManagement.setTeacherInfo(teachingManagementQuery.getTeacherInfo());
+                addTeachingManagement.setSchoolClassInfo(management.getClassId());
+                addTeachingManagement.setTeacherMergeClassThirdAddTime(new Date());
+                addTeachingManagement.setTeacherMergeClassThirdStatus(1);
+                addTeachingManagement.setOrgId(teachingManagementQuery.getOrgId());
+                addTeachingManagement.setUserId(teachingManagementQuery.getUserId());
+                teachingManagementDao.insert(addTeachingManagement);
+            }else {
+                TeachingManagement updataTeachingManagement = valuesByQueryNotWithPermission.get(0);
+                updataTeachingManagement.setTeacherMergeClassThirdStatus(management.getTeacherMergeClassThirdStatus());
+                teachingManagementDao.updateById(updataTeachingManagement);
+            }
+        }
         String msg = "";
 //        TeachingManagement teachingManagement = teachingManagementQuery.pojo();
 //        teachingManagementDao.updateTemplateById(teachingManagement);