新增班级班主任字段

EricsHu

2023-11-24 691f717df93c32d89b13f7f73f0678441d60c840

新增班级班主任字段

 src/main/java/com/qxueyou/scc/admin/classes/service/IClassService.java

@@ -22,7 +22,7 @@
     * @return
     */
    Result insertClass(String className, String classNumber, Date startTime, Date endTime, String subjectId,
                       String teacherId);
                       String teacherId,String chargeClassName);

    /**
     *
@@ -40,7 +40,7 @@
     */
    Result updateClass(String classId, String className, String classNumber, Date startTime, Date endTime,
                       String subjectId, boolean needJoinAudit, boolean needQuitAudit, boolean showAnalysisAfterExer,
                       boolean canMultiExer, boolean needForum, String teacherId);
                       boolean canMultiExer, boolean needForum, String teacherId, String chargeClassName);

    /**
     * 获取班级列表

 src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClsClassService.java

@@ -61,7 +61,7 @@
     */
    @Override
    public Result insertClass(String className, String classNumber, Date startTime, Date endTime, String subjectId,
                              String teacherId) {
                              String teacherId,String chargeClassName) {

        ClsClass cls = new ClsClass();

@@ -72,6 +72,7 @@
        cls.setStartTime(startTime);
        cls.setEndTime(endTime);
        cls.setTeacherId(teacherId);
        cls.setChargeClassName(chargeClassName);
        cls.setOrgId(ClientUtils.getOrgId());
        save(cls);
        return new Result(true, "success",CollectionUtils.newStringMap("classId",cls.getClassId()));
@@ -109,7 +110,7 @@
    @Override
    public Result updateClass(String classId, String className, String classNumber, Date startTime, Date endTime,
                              String subjectId, boolean needJoinAudit, boolean needQuitAudit, boolean showAnalysisAfterExer,
                              boolean canMultiExer, boolean needForum, String teacherId) {
                              boolean canMultiExer, boolean needForum, String teacherId, String chargeClassName) {

        ClsClass cls = read(ClsClass.class, classId);

@@ -124,6 +125,7 @@
        cls.setShowAnalysisAfterExer(showAnalysisAfterExer);
        cls.setCanMultiExer(canMultiExer);
        cls.setNeedForum(needForum);
        cls.setChargeClassName(chargeClassName);
        cls.setTeacherId(teacherId);
        save(cls);


 src/main/java/com/qxueyou/scc/controller/ClassController.java

@@ -242,10 +242,10 @@
     */
    @PostMapping(value = "add")
    public Result add(String className, String classNumber, String startTime, String endTime, String subjectId,
                      String teacherId) {
                      String teacherId,String chargeClassName ) {
        try {
            return classService.insertClass(className, classNumber, DateUtils.convertStringToDate(startTime),
                    DateUtils.convertStringToDate(endTime), subjectId, teacherId);
                    DateUtils.convertStringToDate(endTime), subjectId, teacherId,chargeClassName);

        } catch (ParseException e) {
            log.error(e, e);
@@ -312,9 +312,9 @@
        int count = classService.getClassLstCount(keyword, teacherId, pageType);
        // 转成前端所需字段和结构
       List<Map<String, Object>> lstResult = QBeanUtils.listBean2ListMap(clsLst,
                CollectionUtils.newStringMap("chargeClassName","chargeClassId","name", "className", "classId", "classId", "classNumber", "classNumber","classTypes","classTypes",
                CollectionUtils.newStringMap("name", "className", "classId", "classId", "classNumber", "classNumber","classTypes","classTypes",
                        "studentCount", "studentCount", "createTime", "createTime", "startTime", "startTime", "endTime",
                        "endTime", "subjects", "sbjLst"));
                        "endTime", "subjects", "sbjLst","chargeClassName","chargeClassName","chargeClassId","chargeClassId"));

        // 单独处理课程的字段和结构
        for (Map<String, Object> item : lstResult) {
@@ -427,6 +427,7 @@
     * @param showAnalysisAfterExer 完成练习后是否显示答案
     * @param canMultiExer          是否允许重复学习
     * @param needForum             是否开通论坛
     * @param chargeClassName       班主任名称
     * @return
     */
    @PostMapping(value = "update")
@@ -435,11 +436,12 @@
                         @RequestParam(defaultValue = "false") Boolean needQuitAudit,
                         @RequestParam(defaultValue = "false") Boolean showAnalysisAfterExer,
                         @RequestParam(defaultValue = "false") Boolean canMultiExer,
                         @RequestParam(defaultValue = "false") Boolean needForum) {
                         @RequestParam(defaultValue = "false") Boolean needForum,
    String chargeClassName) {
        try {
            return classService.updateClass(classId, className, classNumber, DateUtils.convertStringToDate(startTime),
                    DateUtils.convertStringToDate(endTime), subjectId, needJoinAudit, needQuitAudit,
                    showAnalysisAfterExer, canMultiExer, needForum, teacherId);
                    showAnalysisAfterExer, canMultiExer, needForum, teacherId,chargeClassName);
        } catch (ParseException e) {
            log.error(e, e);
            return new Result(false, "日期参数错误");