上传拉去家校通讯

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -132,6 +132,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/wx/user/getToken").permitAll()
                 .antMatchers("/wx/user/getToken").permitAll()
                 //钉钉免登录接口
                 //钉钉免登录接口
                 .antMatchers("/dd/App/user/**").permitAll()
                 .antMatchers("/dd/App/user/**").permitAll()
+                .antMatchers("/dd/djtx/**").permitAll()
                 //开发一个接口字典
                 //开发一个接口字典
                 .antMatchers("/system/dict/data/type/**").permitAll()
                 .antMatchers("/system/dict/data/type/**").permitAll()
 //                .antMatchers("/**").permitAll()
 //                .antMatchers("/**").permitAll()

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolClass/SchoolClass.java

@@ -100,4 +100,5 @@ public class SchoolClass extends OurBaseEntity {
                     "7=物理+地理+化学,8=物理+地理+生物,9=物理+化学+生物,10=物理+历史+地理,11=化学+政治+地理,12=化学+政治+历史" +
                     "7=物理+地理+化学,8=物理+地理+生物,9=物理+化学+生物,10=物理+历史+地理,11=化学+政治+地理,12=化学+政治+历史" +
                     "13=化学+政治+生物,14=化学+历史+地理,15=化学+历史+生物,16=化学+地理+生物,17=生物+政治+地理,18=生物+历史+地理,19=生物+政治+历史,20=政治+历史+地理",width = 25)
                     "13=化学+政治+生物,14=化学+历史+地理,15=化学+历史+生物,16=化学+地理+生物,17=生物+政治+地理,18=生物+历史+地理,19=生物+政治+历史,20=政治+历史+地理",width = 25)
     private String chooseCourse;
     private String chooseCourse;
+    private String ddClassId;
 }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolgrade/SchoolGrade.java

@@ -36,4 +36,7 @@ public class SchoolGrade extends OurBaseEntity {
     /** 级部名称 */
     /** 级部名称 */
     @Excel(name = "级部名称")
     @Excel(name = "级部名称")
     private String gradeName;
     private String gradeName;
+
+
+    private String ddClassId;
 }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/student/SchoolStudent.java

@@ -147,6 +147,8 @@ public class SchoolStudent extends OurBaseEntity {
     private String support;
     private String support;
     //独生子女（0否 1是）
     //独生子女（0否 1是）
     private String onlyChild;
     private String onlyChild;
+    //钉钉userId
+    private String ddUserId;
 
 
     /*
     /*
      * 校园一卡通
      * 校园一卡通

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolClass/SchoolClassMapper.java

@@ -66,4 +66,6 @@ public interface SchoolClassMapper extends BaseMapper<SchoolClass> {
      * 获取本级部下的班级
      * 获取本级部下的班级
      * */
      * */
     List<Long> getClassesIdByGradeId(Long gradeId);
     List<Long> getClassesIdByGradeId(Long gradeId);
+
+    public  Long selectDdClassId(String ddClssId);
 }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolgrade/SchoolGradeMapper.java

@@ -31,4 +31,6 @@ public interface SchoolGradeMapper extends BaseMapper<SchoolGrade> {
     public  List<String>  getYearList();
     public  List<String>  getYearList();
 
 
     List<SchoolGrade> selectNowSchoolGrade();
     List<SchoolGrade> selectNowSchoolGrade();
+
+    public  Long selectDdClassId(String ddClssId);
 }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolClass/SchoolClassImpl.java

@@ -2433,4 +2433,8 @@ public class SchoolClassImpl extends ServiceImpl<SchoolClassMapper, SchoolClass>
     }
     }
 
 
 
 
+    @Override
+    public Long selectDdClassId(String ddId) {
+        return schoolClassMapper.selectDdClassId(ddId);
+    }
 }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolgrade/ISchoolGradeImpl.java

@@ -238,4 +238,9 @@ public class ISchoolGradeImpl extends ServiceImpl<SchoolGradeMapper, SchoolGrade
     public int isNewSchoolYear() {
     public int isNewSchoolYear() {
         return schoolGradeMapper.isNewSchoolYear();
         return schoolGradeMapper.isNewSchoolYear();
     }
     }
+
+    @Override
+    public Long selectDdClassId(String ddId) {
+        return schoolGradeMapper.selectDdClassId(ddId);
+    }
 }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolClass/ISchoolClassService.java

@@ -91,4 +91,8 @@ public interface ISchoolClassService extends IService<SchoolClass> {
 
 
     /**批量新增班级*/
     /**批量新增班级*/
     int batchAdd(ClassBatchVo vo);
     int batchAdd(ClassBatchVo vo);
+
+
+    Long selectDdClassId(String ddId);
+
 }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolgrade/ISchoolGradeService.java

@@ -25,5 +25,6 @@ public interface ISchoolGradeService extends IService<SchoolGrade> {
 
 
     //获取最新学年
     //获取最新学年
     int isNewSchoolYear();
     int isNewSchoolYear();
+    Long selectDdClassId(String ddId);
 
 
 }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/student/SchoolStudentVO.java

@@ -301,4 +301,5 @@ public class SchoolStudentVO {
 
 
     //教务-学生管理-学籍表-所在年级
     //教务-学生管理-学籍表-所在年级
     private String currentGrade;
     private String currentGrade;
+    private String ddUserId;
 }
 }

smart-campus/src/main/resources/mapper/schoolClass/SchoolClassMapper.xml

@@ -159,4 +159,9 @@
         where del_flag = '0' and grade_id = #{gradeId}
         where del_flag = '0' and grade_id = #{gradeId}
     </select>
     </select>
 
 
+    <select id="selectDdClassId" resultType="java.lang.Long">
+        select sg.id from school_class_copy sg
+        where sg.del_flag = '0'  and sg.dd_class_id=#{ddClssId}
+    </select>
+
 </mapper>
 </mapper>

smart-campus/src/main/resources/mapper/schoolgrade/SchoolGradeMapper.xml

@@ -54,5 +54,8 @@
         <include refid="selectSchoolGradeVo"/>
         <include refid="selectSchoolGradeVo"/>
         where school_year = (select max(school_year) from school_grade )
         where school_year = (select max(school_year) from school_grade )
     </select>
     </select>
-
+    <select id="selectDdClassId" resultType="java.lang.Long">
+        select sg.id from school_grade_copy sg
+        where sg.del_flag = '0'  and sg.dd_class_id=#{ddClssId}
+    </select>
 </mapper>
 </mapper>

smart-campus/src/main/resources/mapper/student/SchoolStudentMapper.xml

@@ -29,6 +29,7 @@
         <result property="appearance" column="appearance"/>
         <result property="appearance" column="appearance"/>
         <result property="registeredAddress" column="registered_address"/>
         <result property="registeredAddress" column="registered_address"/>
         <result property="registeredType" column="registered_type"/>
         <result property="registeredType" column="registered_type"/>
+        <result property="ddUserId" column="dd_user_id"/>
     </resultMap>
     </resultMap>
 
 
     <sql id="selectSchoolStudentVo">
     <sql id="selectSchoolStudentVo">
@@ -42,6 +43,7 @@
                native_place,
                native_place,
                avatar,
                avatar,
                id_card,
                id_card,
+               dd_user_id,
                school_no,
                school_no,
                student_status,
                student_status,
                student_type,
                student_type,
@@ -72,6 +74,7 @@
             <if test="studentStatus != null">student_status,</if>
             <if test="studentStatus != null">student_status,</if>
             <if test="studentType != null">student_type,</if>
             <if test="studentType != null">student_type,</if>
             <if test="oneCard != null and oneCard != ''">one_card,</if>
             <if test="oneCard != null and oneCard != ''">one_card,</if>
+            <if test="ddUserId != null and oneCard != ''">dd_user_id,</if>
         </trim>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="classId != null">#{classId},</if>
             <if test="classId != null">#{classId},</if>
@@ -90,6 +93,7 @@
             <if test="studentStatus != null">#{studentStatus},</if>
             <if test="studentStatus != null">#{studentStatus},</if>
             <if test="studentType != null">#{studentType},</if>
             <if test="studentType != null">#{studentType},</if>
             <if test="oneCard != null and oneCard != ''">#{oneCard},</if>
             <if test="oneCard != null and oneCard != ''">#{oneCard},</if>
+            <if test="ddUserId != null and ddUserId != ''">#{ddUserId},</if>
         </trim>
         </trim>
     </insert>
     </insert>
 
 
@@ -100,7 +104,7 @@
     <select id="queryList" parameterType="SchoolStudentVO" resultType="yangtz.cs.liu.campus.vo.student.SchoolStudentVO">
     <select id="queryList" parameterType="SchoolStudentVO" resultType="yangtz.cs.liu.campus.vo.student.SchoolStudentVO">
         select ss.id,ss.class_id,ss.student_name,ss.sex,ss.birthday,ss.nation,ss.stu_telephone,ss.postal_code,
         select ss.id,ss.class_id,ss.student_name,ss.sex,ss.birthday,ss.nation,ss.stu_telephone,ss.postal_code,
                ss.nature,ss.provincial_number,ss.national_number,ss.enrollment_year,ss.home_address,
                ss.nature,ss.provincial_number,ss.national_number,ss.enrollment_year,ss.home_address,
-               ss.native_place, ss.avatar, ss.id_card,ss.school_no, ss.student_status, ss.platform,
+               ss.native_place, ss.avatar,ss.dd_user_id, ss.id_card,ss.school_no, ss.student_status, ss.platform,
                ss.birth_address,ss.postal_address,ss.junior_school,ss.region,ss.foreign_languages,
                ss.birth_address,ss.postal_address,ss.junior_school,ss.region,ss.foreign_languages,
                ss.blood_type,ss.health,ss.other_regions,ss.floating_population,ss.support,ss.only_child,
                ss.blood_type,ss.health,ss.other_regions,ss.floating_population,ss.support,ss.only_child,
                ss.student_type, ss.one_card, ss.enrollment_time, ss.appearance, ss.registered_address, ss.registered_type,
                ss.student_type, ss.one_card, ss.enrollment_time, ss.appearance, ss.registered_address, ss.registered_type,
@@ -123,6 +127,7 @@
             <if test="schoolNo != null  and schoolNo != ''">and ss.school_no like concat('%', #{schoolNo}, '%')</if>
             <if test="schoolNo != null  and schoolNo != ''">and ss.school_no like concat('%', #{schoolNo}, '%')</if>
             <if test="studentStatus != null and studentStatus !=''">and ss.student_status = #{studentStatus}</if>
             <if test="studentStatus != null and studentStatus !=''">and ss.student_status = #{studentStatus}</if>
             <if test="studentType != null and studentType !=''">and ss.student_type = #{studentType}</if>
             <if test="studentType != null and studentType !=''">and ss.student_type = #{studentType}</if>
+            <if test="ddUserId != null and ddUserId !=''">and ss.dd_user_id = #{ddUserId}</if>
         </where>
         </where>
         order by ss.class_id asc
         order by ss.class_id asc
     </select>
     </select>
@@ -146,6 +151,7 @@
             <if test="studentStatus != null and studentStatus !=''">and student_status = #{studentStatus}</if>
             <if test="studentStatus != null and studentStatus !=''">and student_status = #{studentStatus}</if>
             <if test="studentType != null and studentType !=''">and student_type = #{studentType}</if>
             <if test="studentType != null and studentType !=''">and student_type = #{studentType}</if>
             <if test="oneCard != null and oneCard !=''">and one_card = #{oneCard}</if>
             <if test="oneCard != null and oneCard !=''">and one_card = #{oneCard}</if>
+            <if test="ddUserId != null and ddUserId !=''">and dd_user_id = #{ddUserId}</if>
             and del_flag = '0'
             and del_flag = '0'
         </where>
         </where>
         order by create_time desc
         order by create_time desc
@@ -179,6 +185,7 @@
                ss.student_type,
                ss.student_type,
                ss.one_card,
                ss.one_card,
                sg.class_alias
                sg.class_alias
+               sg.dd_user_id
         FROM school_student ss
         FROM school_student ss
                  LEFT JOIN school_class sg ON sg.id = ss.class_id
                  LEFT JOIN school_class sg ON sg.id = ss.class_id
                  LEFT JOIN school_teacher st ON st.id = sg.teacher_id
                  LEFT JOIN school_teacher st ON st.id = sg.teacher_id
@@ -213,6 +220,7 @@
                ssp.parent_name,
                ssp.parent_name,
                ssp.relationship,
                ssp.relationship,
                ssp.telephone
                ssp.telephone
+               ssp.dd_user_id
         FROM school_student s
         FROM school_student s
         LEFT JOIN school_class sg on sg.id = s.class_id
         LEFT JOIN school_class sg on sg.id = s.class_id
         LEFT JOIN school_student_parent ssp on ssp.student_id = s.id
         LEFT JOIN school_student_parent ssp on ssp.student_id = s.id
@@ -244,7 +252,7 @@
     <select id="getInfo" resultType="yangtz.cs.liu.campus.vo.student.SchoolStudentVO">
     <select id="getInfo" resultType="yangtz.cs.liu.campus.vo.student.SchoolStudentVO">
         select ss.id,ss.class_id,ss.student_name,ss.sex,ss.birthday,ss.nation,ss.stu_telephone,ss.postal_code,
         select ss.id,ss.class_id,ss.student_name,ss.sex,ss.birthday,ss.nation,ss.stu_telephone,ss.postal_code,
                ss.nature,ss.provincial_number,ss.national_number,ss.enrollment_year,ss.home_address,
                ss.nature,ss.provincial_number,ss.national_number,ss.enrollment_year,ss.home_address,
-               ss.native_place, ss.avatar, ss.id_card,ss.school_no, ss.student_status, ss.platform,
+               ss.native_place, ss.avatar,ss.dd_user_id, ss.id_card,ss.school_no, ss.student_status, ss.platform,
                ss.birth_address,ss.postal_address,ss.junior_school,ss.region,ss.foreign_languages,
                ss.birth_address,ss.postal_address,ss.junior_school,ss.region,ss.foreign_languages,
                ss.blood_type,ss.health,ss.other_regions,ss.floating_population,ss.support,ss.only_child,
                ss.blood_type,ss.health,ss.other_regions,ss.floating_population,ss.support,ss.only_child,
                ss.student_type, ss.one_card, ss.enrollment_time, ss.appearance, ss.registered_address, ss.registered_type,
                ss.student_type, ss.one_card, ss.enrollment_time, ss.appearance, ss.registered_address, ss.registered_type,
@@ -284,7 +292,7 @@
     <select id="getInfoByidCard" resultType="yangtz.cs.liu.campus.vo.student.SchoolStudentVO">
     <select id="getInfoByidCard" resultType="yangtz.cs.liu.campus.vo.student.SchoolStudentVO">
         select ss.id,ss.class_id,ss.student_name,ss.sex,ss.birthday,ss.nation,ss.stu_telephone,ss.postal_code,
         select ss.id,ss.class_id,ss.student_name,ss.sex,ss.birthday,ss.nation,ss.stu_telephone,ss.postal_code,
         ss.nature,ss.provincial_number,ss.national_number,ss.enrollment_year,ss.home_address,
         ss.nature,ss.provincial_number,ss.national_number,ss.enrollment_year,ss.home_address,
-        ss.native_place,sc.school_year, ss.avatar, ss.id_card,ss.school_no, ss.student_status,ss.platform,
+        ss.native_place,sc.school_year, ss.dd_user_id,ss.avatar, ss.id_card,ss.school_no, ss.student_status,ss.platform,
         ss.birth_address,ss.postal_address,ss.junior_school,ss.region,ss.foreign_languages,
         ss.birth_address,ss.postal_address,ss.junior_school,ss.region,ss.foreign_languages,
         ss.blood_type,ss.health,ss.other_regions,ss.floating_population,ss.support,ss.only_child,
         ss.blood_type,ss.health,ss.other_regions,ss.floating_population,ss.support,ss.only_child,
         ss.student_type, ss.one_card, ss.enrollment_time, ss.appearance, ss.registered_address, ss.registered_type,
         ss.student_type, ss.one_card, ss.enrollment_time, ss.appearance, ss.registered_address, ss.registered_type,
@@ -314,6 +322,7 @@
                     <if test="data.studentStatus != null and data.studentStatus != ''">student_status,</if>
                     <if test="data.studentStatus != null and data.studentStatus != ''">student_status,</if>
                     <if test="data.studentType != null and data.studentType != ''">student_type,</if>
                     <if test="data.studentType != null and data.studentType != ''">student_type,</if>
                     <if test="data.oneCard != null and data.oneCard != ''">one_card,</if>
                     <if test="data.oneCard != null and data.oneCard != ''">one_card,</if>
+                    <if test="data.ddUserId != null and data.ddUserId != ''">dd_user_id,</if>
                 </trim>
                 </trim>
                 <trim prefix="values (" suffix=")" suffixOverrides=",">
                 <trim prefix="values (" suffix=")" suffixOverrides=",">
                     <if test="data.classId != null">#{data.classId},</if>
                     <if test="data.classId != null">#{data.classId},</if>
@@ -330,6 +339,7 @@
                     <if test="data.studentStatus != null and data.studentStatus != ''">#{data.studentStatus},</if>
                     <if test="data.studentStatus != null and data.studentStatus != ''">#{data.studentStatus},</if>
                     <if test="data.studentType != null and data.studentType != ''">#{data.studentType},</if>
                     <if test="data.studentType != null and data.studentType != ''">#{data.studentType},</if>
                     <if test="data.oneCard != null and data.oneCard != ''">#{data.oneCard},</if>
                     <if test="data.oneCard != null and data.oneCard != ''">#{data.oneCard},</if>
+                    <if test="data.ddUserId != null and data.ddUserId != ''">#{data.ddUserId},</if>
                 </trim>
                 </trim>
         </foreach>
         </foreach>
     </insert>
     </insert>