From af3ca8d50ff71eda9df124a473c56f4cc1842a3d Mon Sep 17 00:00:00 2001
From: wgf <121463602@qq.com>
Date: Mon, 9 Oct 2023 11:52:58 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8E=88=E8=AF=BE=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=81=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ibeetl/jlw/entity/TeachingManagement.java |  9 ++-
 .../service/TeachingManagementService.java    | 61 +++++++++++++------
 2 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeachingManagement.java b/web/src/main/java/com/ibeetl/jlw/entity/TeachingManagement.java
index 22b0b42a..8321f5b0 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeachingManagement.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeachingManagement.java
@@ -53,7 +53,8 @@ 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;
+    }
 }
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeachingManagementService.java b/web/src/main/java/com/ibeetl/jlw/service/TeachingManagementService.java
index 5d2d12ba..50f2e4c1 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeachingManagementService.java
+++ b/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);