yueke

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

@@ -7,6 +7,7 @@ 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.mbg.model.EasEduClass;
+import com.koobietech.eas.mbg.model.EasEduCltRelation;
 import com.koobietech.eas.service.EasEduClassService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -112,4 +113,31 @@ public class EasEduClassController {
         PageDataResult data = easEduClassService.selectCondition(easEduClass);
         return JsonPageResult.data(data);
     }
+
+    /**
+     * 查询班级学员
+     * @return
+     */
+    @GetMapping(value = "/queryClassStudentById/{classId}")
+    @Operation(summary = "查询所有的班级类",description = "查询所有的班级类")
+    public JsonResult queryClassStudentById(@PathVariable int classId){
+        List<EasEduCltRelation> easEduCltRelation = easEduClassService.queryClassStudentById(classId);
+        return JsonResult.data(easEduCltRelation);
+    }
+
+
+    /**
+     * 通过条件查询班级类
+     * @param easEduClass
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @PostMapping(value = "/submitGroupStudentForm/{groupId}")
+    @Operation(summary = "更新班级学员", description = "更新班级学员")
+    public JsonResult submitGroupStudentForm(@RequestBody Integer[] studentIds,
+                                          @PathVariable Integer groupId) {
+        boolean success =  easEduClassService.updateGroupStudentForm(groupId, studentIds);
+        return JsonResult.bool(success);
+    }
 }

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

@@ -5,6 +5,7 @@ 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.mbg.model.EasArcTlsStudents;
+import com.koobietech.eas.mbg.model.EasSysStudent;
 import com.koobietech.eas.service.EasStuProfileService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -14,6 +15,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
 
 /**
  * @author lc
@@ -70,4 +72,12 @@ public class EasSysStuProfileController {
         }
         return JsonResult.bool(result);
     }
+
+    @GetMapping("/getAll")
+    @Operation(summary = "查询所有学员信息", description = "查询所有学员信息")
+    public JsonResult getAll(){
+        List<EasSysStudent> res = easStuProfileService.getAll();
+        return JsonResult.data(res);
+    }
+
 }

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

@@ -69,8 +69,7 @@ public class EasSysUserInfoController {
     @GetMapping("/queryUserByRealname/{realname}")
     @Operation(summary = "查询用户信息根据用户名", description = "根据参数查询用户信息表信息")
     public JsonResult queryByRealname(@PathVariable String realname ) {
-        EasSysUserinfo userinfo = easSysUserInfoService.queryByRealname(realname);
-        return JsonResult.data(userinfo);
+        return JsonResult.data(easSysUserInfoService.queryByRealname(realname));
     }
 
     @GetMapping("/queryAll")

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

@@ -2,6 +2,7 @@ package com.koobietech.eas.service;
 
 import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasEduClass;
+import com.koobietech.eas.mbg.model.EasEduCltRelation;
 
 import java.util.List;
 
@@ -19,4 +20,7 @@ public interface EasEduClassService {
 
     PageDataResult selectCondition(EasEduClass easEduClass );
 
+    List<EasEduCltRelation> queryClassStudentById(int classId);
+
+    boolean updateGroupStudentForm(Integer groupId, Integer[] studentIds);
 }

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

@@ -2,8 +2,10 @@ package com.koobietech.eas.service;
 
 import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasArcTlsStudents;
+import com.koobietech.eas.mbg.model.EasSysStudent;
 
 import java.io.InputStream;
+import java.util.List;
 
 /**
  * @author lc
@@ -18,4 +20,6 @@ public interface EasStuProfileService {
     boolean delete(int id);
 
     boolean importExcel(InputStream inputStream);
+
+    List<EasSysStudent> getAll();
 }

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

@@ -17,7 +17,7 @@ public interface EasSysUserInfoService {
 
     EasSysUserinfo queryByUid(Long uid);
 
-    EasSysUserinfo queryByRealname(String realname);
+    List<EasSysUserinfo> queryByRealname(String realname);
 
     List<EasSysUserinfo> queryAll();
 }

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

@@ -2,11 +2,15 @@ package com.koobietech.eas.service.impl;
 
 import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.mapper.EasEduClassMapper;
+import com.koobietech.eas.mbg.mapper.EasEduCltRelationMapper;
 import com.koobietech.eas.mbg.model.EasEduClass;
 import com.koobietech.eas.mbg.model.EasEduClassExample;
+import com.koobietech.eas.mbg.model.EasEduCltRelation;
+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;
@@ -18,6 +22,10 @@ public class EasEduClassServiceImpl implements EasEduClassService {
 
     @Resource
     EasEduClassMapper easEduClassMapper;
+
+    @Resource
+    EasEduCltRelationMapper easEduCltRelationMapper;
+
     @Override
     public int addClass(EasEduClass easEduClass) {
         easEduClass.setCreateTime(new Date());
@@ -81,42 +89,27 @@ public class EasEduClassServiceImpl implements EasEduClassService {
         return PageDataResult.init(easEduClasses,l);
     }
 
-//    @Override
-//    public PageDataResult selectCondition(EasEduClass easEduClass) {
-//        EasEduClassExample easEduClassExample = new EasEduClassExample();
-//        EasEduClassExample.Criteria criteria = easEduClassExample.createCriteria();
-//        if (Objects.nonNull(easEduClass)){
-//            if (Objects.nonNull(easEduClass.getId())){
-//                criteria.andIdEqualTo(easEduClass.getId());
-//            }
-//            if (StringUtils.hasText((easEduClass.getName()))){
-//                criteria.andNameLike("%" + easEduClass.getName() + "%");
-//            }
-//            if (Objects.nonNull(easEduClass.getManageId())){
-//                criteria.andManageIdEqualTo(easEduClass.getManageId());
-//            }
-//            if (Objects.nonNull(easEduClass.getAssistantId())){
-//                criteria.andManageIdEqualTo(easEduClass.getManageId());
-//            }
-//            if (Objects.nonNull(easEduClass.getCreateTime())){
-//                criteria.andCreateTimeGreaterThan(easEduClass.getCreateTime());
-//            }
-//            if (Objects.nonNull(easEduClass.getModifyTime())){
-//                criteria.andModifyTimeGreaterThan(easEduClass.getModifyTime());
-//            }
-//            if (Objects.nonNull(easEduClass.getCreateUid())){
-//                criteria.andCreateUidEqualTo(easEduClass.getCreateUid());
-//            }
-//            if (StringUtils.hasText(easEduClass.getDisabled())){
-//                criteria.andDisabledEqualTo(easEduClass.getDisabled());
-//            }
-//        }
-//        List<EasEduClass> easEduClasses = easEduClassMapper.selectByExample(easEduClassExample);
-//        long l = easEduClassMapper.countByExample(easEduClassExample);
-//        PageDataResult ret = new PageDataResult();
-//        ret.setData(easEduClasses);
-//        ret.setTotal(l);
-//        return ret;
-//    }
+    @Override
+    public List<EasEduCltRelation> queryClassStudentById(int classId) {
+        EasEduCltRelationExample easEduCltRelationExample = new EasEduCltRelationExample();
+        easEduCltRelationExample.createCriteria().andClassIdEqualTo(Long.valueOf(classId));
+        return easEduCltRelationMapper.selectByExample(easEduCltRelationExample);
+    }
 
+    @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) {
+            EasEduCltRelation easEduCltRelation = new EasEduCltRelation();
+            easEduCltRelation.setClassId(groupId.longValue());
+            easEduCltRelation.setStudentId(studentId);
+            easEduCltRelation.setCreateTime(new Date());
+            easEduCltRelation.setCreateUid( SecurityManager.getLoginUid().intValue() );
+            easEduCltRelationMapper.insert(easEduCltRelation);
+        }
+        return true;
+    }
 }

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

@@ -21,7 +21,7 @@ public class EasEduClassroomServiceImpl implements EasEduClassroomService {
     @Override
     public Boolean update(EasEduClassroom classroom) {
         classroom.setModifyTime(new Date());
-        return easEduClassroomMapper.updateByPrimaryKey(classroom) == 1;
+        return easEduClassroomMapper.updateByPrimaryKeySelective(classroom) == 1;
     }
 
     @Override

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

@@ -174,6 +174,11 @@ public class EasStuProfileServiceImpl implements EasStuProfileService {
         return false;
     }
 
+    @Override
+    public List<EasSysStudent> getAll() {
+        return easSysStudentMapper.selectByExample(null);
+    }
+
     private Map<String, Object> generateDataMap(EasArcTlsStudents easArcTlsStudents, String studentNumber) {
         Map<String, Object> map = new HashMap<>();
         map.put("student_name", easArcTlsStudents.getStudentName());

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

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -121,12 +122,11 @@ public class EasSysUserInfoServiceImpl implements EasSysUserInfoService {
     }
 
     @Override
-    public EasSysUserinfo queryByRealname(String realname) {
+    public List<EasSysUserinfo> queryByRealname(String realname) {
         EasSysUserinfoExample easSysUserinfoExample = new EasSysUserinfoExample();
-        easSysUserinfoExample.createCriteria().andRelnameEqualTo(realname);
+        easSysUserinfoExample.createCriteria().andRelnameLike("%" + realname + "%");
         List<EasSysUserinfo> easSysUserinfos = easSysUserinfoMapper.selectByExample(easSysUserinfoExample);
-        EasSysUserinfo easSysUserinfo = easSysUserinfos.stream().findFirst().orElse(null);
-        return easSysUserinfo;
+        return Objects.isNull(easSysUserinfos) ? Collections.emptyList() : easSysUserinfos;
     }
 
     @Override