Merge branch 'pre'

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/base/vo/WhitelistManagementPageVo.java

@@ -9,6 +9,8 @@ import lombok.Data;
 
 import com.xjrsoft.common.annotation.Trans;
 import com.xjrsoft.common.enums.TransType;
+
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
@@ -95,4 +97,10 @@ public class WhitelistManagementPageVo {
 
     @ApiModelProperty("班主任")
     private String teacher;
+
+    @ApiModelProperty("是否临时性的(1:是 0:否)")
+    private Integer isTemporary;
+
+    @ApiModelProperty("临时使用结束时间")
+    private LocalDate endTime;
 }

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/main/java/com/xjrsoft/module/student/vo/BaseNewStudentPageVo.java

@@ -155,4 +155,12 @@ public class BaseNewStudentPageVo {
     @ApiModelProperty("家庭地址")
     private String familyAddress;
 
+    @ExcelProperty("班级名称")
+    @ApiModelProperty("班级名称")
+    private String className;
+
+
+    @ExcelProperty("班主任")
+    @ApiModelProperty("班主任")
+    private String teacherName;
 }

src/main/resources/mapper/base/WhitelistManagement.xml

@@ -4,7 +4,7 @@
                 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.base.mapper.WhitelistManagementMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.base.dto.WhitelistManagementPageDto" resultType="com.xjrsoft.module.base.vo.WhitelistManagementPageVo">
-        SELECT t.id, t.credential_number as credentialNumber, t.name, t.phone,
+        SELECT t.id, t.credential_number as credentialNumber, t.name, t.phone,t.is_temporary,t.end_time,
             CASE
                WHEN t1.gender = 'SB1001' THEN '男'
                WHEN t1.gender = 'SB1002' THEN '女'

src/main/resources/mapper/student/BaseNewStudentMapper.xml

@@ -6,13 +6,17 @@
     <select id="getPage" parameterType="com.xjrsoft.module.student.dto.BaseNewStudentPageDto" resultType="com.xjrsoft.module.student.vo.BaseNewStudentPageVo">
         SELECT t1.id,t1.graduate_school,t1.name,t1.gender,t2.name AS gender_cn,t1.credential_number,t1.height,t1.weight,
         t1.score,t1.graduate_class,t1.source,t5.name as source_cn,t1.stduy_status,t3.name AS stduy_status_cn,t1.mobile,t7.name as first_ambition,
-        t8.name as second_ambition,t1.is_adjust,t1.status FROM base_new_student t1
+        t8.name as second_ambition,t1.is_adjust,t1.status,t11.name AS class_name,t12.name AS teacher_name FROM base_new_student t1
         LEFT JOIN xjr_dictionary_detail t2 ON t1.gender = t2.code AND t2.item_id = 2023000000000000004
         LEFT JOIN xjr_dictionary_detail t3 ON t1.stduy_status = t3.code AND t3.item_id = 2023000000000000030
         LEFT JOIN xjr_dictionary_detail t5 ON t1.source = t5.code AND t5.item_id = 2023000000000000028
         LEFT JOIN enrollment_plan t4 ON t1.enrollment_plan_id = t4.id
         LEFT JOIN base_major_set t7 ON t1.first_ambition = t7.id
         LEFT JOIN base_major_set t8 ON t1.second_ambition = t8.id
+        LEFT JOIN xjr_user t9 ON t1.credential_number = t9.credential_number
+        LEFT JOIN base_student_school_roll t10 ON t9.id = t10.user_id
+        LEFT JOIN base_class t11 ON t10.class_id = t11.id
+        LEFT JOIN xjr_user t12 ON t11.teacher_id = t12.id
         WHERE t1.delete_mark = 0
         <if test="dto.name != null and dto.name != ''">
             and t1.name like concat('%', #{dto.name}, '%')

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");