班级管理

controller/src/main/java/com/koobietech/eas/controller/EasEduClassController.java

@@ -6,6 +6,7 @@ import com.koobietech.eas.common.constant.Disabled;
 import com.koobietech.eas.common.result.JsonPageResult;
 import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.common.result.PageDataResult;
+import com.koobietech.eas.dao.dto.GroupStudentsDto;
 import com.koobietech.eas.mbg.model.EasEduClass;
 import com.koobietech.eas.mbg.model.EasEduCltRelation;
 import com.koobietech.eas.service.EasEduClassService;
@@ -118,11 +119,20 @@ public class EasEduClassController {
      * 查询班级学员
      * @return
      */
-    @GetMapping(value = "/queryClassStudentById/{classId}")
+    @GetMapping(value = "/queryClassStudentByGroupId/{groupId}")
+    @Operation(summary = "查询所有的班级类根据Id",description = "查询所有的班级类")
+    public JsonResult queryClassStudentByGroupId(@PathVariable Integer groupId){;
+        return JsonResult.data(easEduClassService.queryClassStudentById(groupId));
+    }
+
+    /**
+     * 查询班级学员
+     * @return
+     */
+    @PostMapping(value = "/groupStudent")
     @Operation(summary = "查询所有的班级类",description = "查询所有的班级类")
-    public JsonResult queryClassStudentById(@PathVariable int classId){
-        List<EasEduCltRelation> easEduCltRelation = easEduClassService.queryClassStudentById(classId);
-        return JsonResult.data(easEduCltRelation);
+    public JsonResult queryClassStudent(@RequestBody GroupStudentsDto dto){;
+        return JsonResult.data(easEduClassService.queryClassStudent(dto));
     }
 
 
@@ -130,11 +140,34 @@ public class EasEduClassController {
      * 通过条件查询班级类
      * @return
      */
-    @PostMapping(value = "/submitGroupStudentForm/{groupId}")
+    @PostMapping(value = "/groupStudent/{groupId}")
     @Operation(summary = "更新班级学员", description = "更新班级学员")
-    public JsonResult submitGroupStudentForm(@RequestBody Integer[] studentIds,
+    public JsonResult groupStudent(@RequestBody Integer[] studentIds,
                                           @PathVariable Integer groupId) {
         boolean success =  easEduClassService.updateGroupStudentForm(groupId, studentIds);
         return JsonResult.bool(success);
     }
+
+    /**
+     * 删除学员
+     * @return
+     */
+    @DeleteMapping(value = "/groupStudent/{rowId}")
+    @Operation(summary = "删除班级学员", description = "删除班级学员")
+    public JsonResult groupStudent( @PathVariable Integer rowId) {
+        boolean success =  easEduClassService.groupStudentDelete(rowId);
+        return JsonResult.bool(success);
+    }
+
+    /**
+     * 删除学员
+     * @return
+     */
+    @PutMapping(value = "/groupStudent")
+    @Operation(summary = "班级班级学员", description = "班级班级学员")
+    public JsonResult groupStudent(@RequestBody EasEduCltRelation easEduCltRelation) {
+        boolean success =  easEduClassService.groupStudentUpdate(easEduCltRelation);
+        return JsonResult.bool(success);
+    }
+
 }

dao/src/main/java/com/koobietech/eas/dao/dto/GroupStudentsDto.java

@@ -0,0 +1,21 @@
+package com.koobietech.eas.dao.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class GroupStudentsDto {
+    private String avatar;
+    private Date enrollmentDate;
+    private String gender;
+    private Integer managerId;
+    private String phone;
+    private String studentName;
+    private Integer studentId;
+    private Integer admissionsId;
+    private String type;
+    private String admissionsName;
+    private String managerName;
+    private Integer groupId;
+}

dao/src/main/java/com/koobietech/eas/dao/mapper/GroupStudentsMapper.java

@@ -0,0 +1,10 @@
+package com.koobietech.eas.dao.mapper;
+
+import com.koobietech.eas.dao.dto.GroupStudentsDto;
+import com.koobietech.eas.dao.pojo.GroupStudentsPojo;
+
+import java.util.List;
+
+public interface GroupStudentsMapper {
+    List<GroupStudentsPojo> getStudents(GroupStudentsDto dto);
+}

dao/src/main/java/com/koobietech/eas/dao/pojo/GroupStudentsPojo.java

@@ -0,0 +1,33 @@
+package com.koobietech.eas.dao.pojo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class GroupStudentsPojo {
+    private Long studentId;
+    private String studentName;
+    private String avatar;
+    private String studentNumber;
+    private String managerName;
+    private String phone;
+    private String email;
+    private String gender;
+    private String enrollmentDate;
+    private String morning;
+    private String afternoon;
+    private Date checkinDate;
+    private String admissionsName;
+    private Integer scheduleId;
+    private String category;
+    private String subject;
+    private String teacher;
+    private String teacherPhone;
+    private String groupId;
+    private String groupName;
+    private Integer managerId;
+    private Integer admissionsId;
+    private String type;
+    private Integer id;
+}

dao/src/main/resources/com/koobietech/eas/dao/mapper/GroupStudentsMapper.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.koobietech.eas.dao.mapper.GroupStudentsMapper">
+    <resultMap id="groupStudentResultMap" type="com.koobietech.eas.dao.pojo.GroupStudentsPojo">
+        <result column="avatar" property="avatar"/>
+        <result column="id" property="id"/>
+        <result column="enrollment_date" property="enrollmentDate"/>
+        <result column="gender" property="gender"/>
+        <result column="manager_id" property="managerId"/>
+        <result column="phone" property="phone"/>
+        <result column="email" property="email"/>
+        <result column="student_name" property="studentName"/>
+        <result column="student_number" property="studentNumber"/>
+        <result column="student_id" property="studentId"/>
+        <result column="admissions_id" property="admissionsId"/>
+        <result column="type" property="type"/>
+        <result column="admissions_name" property="admissionsName"/>
+        <result column="manager_name" property="managerName"/>
+    </resultMap>
+    <select id="getStudents" resultType="com.koobietech.eas.dao.dto.GroupStudentsDto" resultMap="groupStudentResultMap">
+        SELECT
+            re.id,
+            ss.avatar,
+            ss.enrollment_date,
+            ss.gender,
+            ss.manager_id,
+            ss.phone,
+            ss.email,
+            ss.student_name,
+            ss.id AS student_id,
+            ss.admissions_id,
+            ss.student_number,
+            re.type,
+            su.relname AS admissions_name,
+            suu.relname AS  manager_name
+        FROM
+            eas_edu_clt_relation AS re
+                INNER JOIN eas_sys_student AS ss ON ss.id = re.student_id
+                INNER JOIN eas_edu_class AS ec ON ec.id = re.class_id
+                LEFT JOIN eas_sys_userinfo AS su ON su.id = ss.admissions_id
+                LEFT JOIN eas_sys_userinfo AS suu ON suu.id = ss.manager_id
+        WHERE ec.disabled = 'N'
+        <if test="enrollmentDate != null">
+            AND ss.enrollment_date = #{enrollmentDate}
+        </if>
+        <if test="gender != null and gender != ''">
+            AND ss.gender = #{gender}
+        </if>
+        <if test="managerId != null and managerId != 0">
+            AND ss.manager_id = #{managerId}
+        </if>
+        <if test="phone != null and phone != ''">
+            AND ss.phone LIKE CONCAT('%', #{phone}, '%')
+        </if>
+        <if test="studentName != null and studentName != ''">
+            AND ss.student_name LIKE CONCAT('%', #{studentName}, '%')
+        </if>
+        <if test="studentId != null  and studentId != 0">
+            AND ss.id = #{studentId}
+        </if>
+        <if test="admissionsId != null and admissionsId != 0">
+            AND ss.admissions_id = #{admissionsId}
+        </if>
+        <if test="type != null and type != ''">
+            AND re.type = #{type}
+        </if>
+        <if test="admissionsName != null and admissionsName != ''">
+            AND su.relname = #{admissionsName}
+        </if>
+        <if test="managerName != null and managerName != ''">
+            AND suu.relname = #{managerName}
+        </if>
+        AND re.class_id = #{groupId}
+    </select>
+</mapper>

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduCltRelation.java

@@ -50,6 +50,8 @@ public class EasEduCltRelation implements Serializable {
     @Schema(description = "创建用户ID")
     private Integer createUid;
 
+    private String type;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -100,6 +102,14 @@ public class EasEduCltRelation implements Serializable {
         this.createUid = createUid;
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -112,6 +122,7 @@ public class EasEduCltRelation implements Serializable {
         sb.append(", createTime=").append(createTime);
         sb.append(", modifyTime=").append(modifyTime);
         sb.append(", createUid=").append(createUid);
+        sb.append(", type=").append(type);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduCltRelationExample.java

@@ -464,6 +464,76 @@ public class EasEduCltRelationExample {
             addCriterion("create_uid not between", value1, value2, "createUid");
             return (Criteria) this;
         }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(String value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(String value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(String value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(String value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(String value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLike(String value) {
+            addCriterion("type like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotLike(String value) {
+            addCriterion("type not like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<String> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<String> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(String value1, String value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(String value1, String value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasEduCltRelationMapper.xml

@@ -8,6 +8,7 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime" />
     <result column="create_uid" jdbcType="INTEGER" property="createUid" />
+    <result column="type" jdbcType="CHAR" property="type" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -68,7 +69,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, class_id, student_id, create_time, modify_time, create_uid
+    id, class_id, student_id, create_time, modify_time, create_uid, type
   </sql>
   <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasEduCltRelationExample" resultMap="BaseResultMap">
     select
@@ -105,9 +106,11 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into eas_edu_clt_relation (class_id, student_id, create_time, 
-      modify_time, create_uid)
+      modify_time, create_uid, type
+      )
     values (#{classId,jdbcType=BIGINT}, #{studentId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER})
+      #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER}, #{type,jdbcType=CHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasEduCltRelation">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
@@ -130,6 +133,9 @@
       <if test="createUid != null">
         create_uid,
       </if>
+      <if test="type != null">
+        type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="classId != null">
@@ -147,6 +153,9 @@
       <if test="createUid != null">
         #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="type != null">
+        #{type,jdbcType=CHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.koobietech.eas.mbg.model.EasEduCltRelationExample" resultType="java.lang.Long">
@@ -176,6 +185,9 @@
       <if test="record.createUid != null">
         create_uid = #{record.createUid,jdbcType=INTEGER},
       </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=CHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -188,7 +200,8 @@
       student_id = #{record.studentId,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{record.createUid,jdbcType=INTEGER}
+      create_uid = #{record.createUid,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=CHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -211,6 +224,9 @@
       <if test="createUid != null">
         create_uid = #{createUid,jdbcType=INTEGER},
       </if>
+      <if test="type != null">
+        type = #{type,jdbcType=CHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -220,7 +236,8 @@
       student_id = #{studentId,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-      create_uid = #{createUid,jdbcType=INTEGER}
+      create_uid = #{createUid,jdbcType=INTEGER},
+      type = #{type,jdbcType=CHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

service/src/main/java/com/koobietech/eas/service/EasEduClassService.java

@@ -1,6 +1,8 @@
 package com.koobietech.eas.service;
 
 import com.koobietech.eas.common.result.PageDataResult;
+import com.koobietech.eas.dao.dto.GroupStudentsDto;
+import com.koobietech.eas.dao.pojo.GroupStudentsPojo;
 import com.koobietech.eas.mbg.model.EasEduClass;
 import com.koobietech.eas.mbg.model.EasEduCltRelation;
 
@@ -20,7 +22,13 @@ public interface EasEduClassService {
 
     PageDataResult selectCondition(EasEduClass easEduClass );
 
+    List<GroupStudentsPojo> queryClassStudent(GroupStudentsDto dto);
+
     List<EasEduCltRelation> queryClassStudentById(int classId);
 
     boolean updateGroupStudentForm(Integer groupId, Integer[] studentIds);
+
+    boolean groupStudentDelete(Integer rowId);
+
+    boolean groupStudentUpdate(EasEduCltRelation easEduCltRelation);
 }

service/src/main/java/com/koobietech/eas/service/impl/EasEduClassServiceImpl.java

@@ -1,6 +1,10 @@
 package com.koobietech.eas.service.impl;
 
 import com.koobietech.eas.common.result.PageDataResult;
+import com.koobietech.eas.common.utils.SecurityManager;
+import com.koobietech.eas.dao.dto.GroupStudentsDto;
+import com.koobietech.eas.dao.mapper.GroupStudentsMapper;
+import com.koobietech.eas.dao.pojo.GroupStudentsPojo;
 import com.koobietech.eas.mbg.mapper.EasEduClassMapper;
 import com.koobietech.eas.mbg.mapper.EasEduCltRelationMapper;
 import com.koobietech.eas.mbg.model.EasEduClass;
@@ -10,12 +14,9 @@ import com.koobietech.eas.mbg.model.EasEduCltRelationExample;
 import com.koobietech.eas.service.EasEduClassService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
-import com.koobietech.eas.common.utils.SecurityManager;
 
 import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 @Service
 public class EasEduClassServiceImpl implements EasEduClassService {
@@ -23,6 +24,9 @@ public class EasEduClassServiceImpl implements EasEduClassService {
     @Resource
     EasEduClassMapper easEduClassMapper;
 
+    @Resource
+    GroupStudentsMapper  groupStudentsMapper;
+
     @Resource
     EasEduCltRelationMapper easEduCltRelationMapper;
 
@@ -45,7 +49,6 @@ public class EasEduClassServiceImpl implements EasEduClassService {
 
     @Override
     public EasEduClass selectId(Long id) {
-        System.out.println("Id" + id);
         return easEduClassMapper.selectByPrimaryKey(id);
     }
 
@@ -96,20 +99,66 @@ public class EasEduClassServiceImpl implements EasEduClassService {
         return easEduCltRelationMapper.selectByExample(easEduCltRelationExample);
     }
 
+    @Override
+    public List<GroupStudentsPojo> queryClassStudent(GroupStudentsDto dto) {
+        List<GroupStudentsPojo> students = groupStudentsMapper.getStudents(dto);
+        return students;
+    }
+
     @Override
     public boolean updateGroupStudentForm(Integer groupId, Integer[] studentIds) {
         EasEduCltRelationExample easEduCltRelationExample = new EasEduCltRelationExample();
         EasEduCltRelationExample.Criteria criteria = easEduCltRelationExample.createCriteria();
         criteria.andClassIdEqualTo(groupId.longValue());
-        easEduCltRelationMapper.deleteByExample(easEduCltRelationExample);
-        for (Integer studentId: studentIds) {
+        List<EasEduCltRelation> easEduCltRelations = easEduCltRelationMapper.selectByExample(easEduCltRelationExample);
+        ArrayList<Integer> arr1 = new ArrayList<>();
+        for (EasEduCltRelation existingStudent : easEduCltRelations) {
+            arr1.add(existingStudent.getStudentId());
+        }
+
+        //insert 从set2中删除在set1中出现的元素
+        Set<Integer> set1 = new HashSet<Integer>(arr1);
+        Set<Integer> set2 = new HashSet<>(Arrays.asList(studentIds));
+        set2.removeAll(set1);
+        Integer[] studentList = set2.toArray(new Integer[0]);
+        //delete 从set1中删除在set2中出现的元素
+        Set<Integer> set3 = new HashSet<Integer>(arr1);
+        Set<Integer> set4 = new HashSet<>(Arrays.asList(studentIds));
+        set1.removeAll(set2);
+        Integer[] studentDel = set1.toArray(new Integer[0]);
+
+        //删除
+        if (studentDel.length > 0) {
+            EasEduCltRelationExample delExample = new EasEduCltRelationExample();
+            EasEduCltRelationExample.Criteria criteriaDel = delExample.createCriteria();
+            criteriaDel.andClassIdEqualTo(groupId.longValue());
+            criteriaDel.andStudentIdIn(Arrays.asList(studentDel));
+            easEduCltRelationMapper.deleteByExample(delExample);
+        }
+
+        //新增
+        for (Integer studentId: studentList) {
             EasEduCltRelation easEduCltRelation = new EasEduCltRelation();
             easEduCltRelation.setClassId(groupId.longValue());
             easEduCltRelation.setStudentId(studentId);
             easEduCltRelation.setCreateTime(new Date());
             easEduCltRelation.setCreateUid( SecurityManager.getLoginUid().intValue() );
+            easEduCltRelation.setType("正式");
             easEduCltRelationMapper.insert(easEduCltRelation);
         }
         return true;
     }
+
+    @Override
+    public boolean groupStudentDelete(Integer rowId) {
+        return easEduCltRelationMapper.deleteByPrimaryKey(rowId) == 1;
+    }
+
+    @Override
+    public boolean groupStudentUpdate(EasEduCltRelation easEduCltRelation) {
+        EasEduCltRelation updateEduCltRelation = new EasEduCltRelation();
+        updateEduCltRelation.setId(easEduCltRelation.getId());
+        updateEduCltRelation.setType(easEduCltRelation.getType());
+        return easEduCltRelationMapper.updateByPrimaryKeySelective(updateEduCltRelation) == 1;
+    }
 }

service/src/main/java/com/koobietech/eas/service/impl/EasStuProfileServiceImpl.java

@@ -36,6 +36,10 @@ import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static java.util.regex.Pattern.*;
 
 @Service
 public class EasStuProfileServiceImpl implements EasStuProfileService {
@@ -182,17 +186,28 @@ public class EasStuProfileServiceImpl implements EasStuProfileService {
         EasSysStudentExample.Criteria criteria = easSysStudentExample.createCriteria();
         criteria.andStudentNameLike("%" + keyword + "%");
         EasSysStudentExample.Criteria criteria1 = easSysStudentExample.createCriteria();
-        criteria1.andStudentNumberLike("%" + keyword + "%");
+        criteria1.andStudentNumberLike("STX" + keyword + "%");
         easSysStudentExample.or(criteria1);
         EasSysStudentExample.Criteria criteria2 = easSysStudentExample.createCriteria();
-        criteria2.andPhoneLike("%" + keyword + "%");
+        criteria2.andPhoneEqualTo(keyword );
         easSysStudentExample.or(criteria2);
-        EasSysStudentExample.Criteria criteria3 = easSysStudentExample.createCriteria();
-        criteria3.andIdEqualTo( Long.valueOf(keyword) );
-        easSysStudentExample.or(criteria3);
+        if ( isNumeric(keyword) ) {
+            EasSysStudentExample.Criteria criteria3 = easSysStudentExample.createCriteria();
+            criteria3.andIdEqualTo(Long.parseLong(keyword));
+            easSysStudentExample.or(criteria3);
+        }
         return easSysStudentMapper.selectByExample(easSysStudentExample);
     }
 
+    public boolean isNumeric(String str) {
+        if (str == null || str.length() == 0) {
+            return false;
+        }
+        Pattern pattern = compile("^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?$");
+        Matcher matcher = pattern.matcher(str);
+        return matcher.matches();
+    }
+
     private Map<String, Object> generateDataMap(EasArcTlsStudents easArcTlsStudents, String studentNumber) {
         Map<String, Object> map = new HashMap<>();
         map.put("student_name", easArcTlsStudents.getStudentName());