bug修复

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

@@ -162,9 +162,6 @@ public class BandingTaskClassStudentServiceImpl extends MPJBaseServiceImpl<Bandi
                 BaseClass baseClass = classService.getOne(
                         new QueryWrapper<BaseClass>().lambda()
                                 .eq(BaseClass::getName, taskClass.getName())
-                                .eq(BaseClass::getClassroomId, taskClass.getClassroomId())
-                                .eq(BaseClass::getTeacherId, taskClass.getTeacherId())
-                                .eq(BaseClass::getMajorSetId, taskClass.getMajorSetId())
                                 .eq(BaseClass::getGradeId, bandingTask.getGradeId())
                                 .eq(BaseClass::getEnrollType, bandingTask.getEnrollType())
                 );

src/main/java/com/xjrsoft/module/hikvision/util/DataUtil.java

@@ -230,7 +230,7 @@ public class DataUtil {
                 paramJson.addProperty("orgIndexCode", baseClass.get("id").toString() + "-" + stduyStatu);
                 paramJson.addProperty("orgName", baseClass.get("name").toString());
                 paramJson.addProperty("parentIndexCode", baseClass.get("orgIndexCode").toString() + "-" + stduyStatu);
-                paramJson.addProperty("orgCode", baseClass.get("id").toString() + "-" + stduyStatu);
+//                paramJson.addProperty("orgCode", baseClass.get("id").toString() + "-" + stduyStatu);
                 dataArray.add(paramJson);
                 idCodeMap.put(clientId, baseClass.get("orgIndexCode").toString() + "-" + stduyStatu);
                 clientId ++;

src/test/java/com/xjrsoft/module/job/HikvisionBaseDataTaskTest.java

@@ -117,14 +117,14 @@ class HikvisionBaseDataTaskTest {
 //        dataUtil.insertCar(use, carTableName,baseClass, faceImportMapper);
 
 
-        tableName = "base_class";
-        Map<String, String> baseClass = dataMap.get(tableName);
-        Map<String, String> classes = dataUtil.insertClass(tableName, baseClass);
+//        tableName = "base_class";
+//        Map<String, String> baseClass = dataMap.get(tableName);
+//        Map<String, String> classes = dataUtil.insertClass(tableName, baseClass);
 
 
-//        tableName = "base_student";
-//        Map<String, String> baseStudent = dataMap.get(tableName);
-//        Map<String, String> student = insertStudentOne(tableName, baseStudent);
+        tableName = "base_student";
+        Map<String, String> baseStudent = dataMap.get(tableName);
+        Map<String, String> student = dataUtil.insertStudentOne(tableName, baseStudent);
 
 //        selectOrg(use, "base_class");