修正

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/domain/resp/time/RespClaTime.java

@@ -45,7 +45,7 @@ public class RespClaTime {
     private String realEndTime;
 
     // 应到
-    private Integer needAttendCnt;
+    private Integer bookAttendCnt;
 
     // 实到
     private Integer realAttendCnt;

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/mapping/ScClaTimeMapper.xml

@@ -58,11 +58,11 @@
                ct.status,
                ct.cla_date,ct.start_time,ct.end_time,
                ct.real_cla_date,ct.real_start_time,ct.real_end_time,
-               ct.need_attend_cnt,ct.real_attend_cnt,ct.leave_cnt,ct.out_cnt,
+               ct.book_attend_cnt,ct.real_attend_cnt,ct.out_cnt,
                ct.pay_hour,ct.pay_total_hour,
                ct.pay_total_fee,
                ct.room_name,ct.class_theme,ct.memo,
-               (select u.name from sys_user u where u.user_id=ct.last_update_user) as last_update_user_name,
+               (select u.user_name from sys_user u where u.user_id=ct.last_update_user) as last_update_user_name,
                ct.create_time,ct.last_update_time
         from sc_course_cla cc
                  left join sc_course course on cc.course_id=course.course_id,

ruoyi-admin/src/main/java/cn/xluobo/business/sc/course/repo/model/ScClaTime.java

@@ -140,8 +140,8 @@ public class ScClaTime implements Serializable {
     /**
      * 应到人数
      */
-    @TableField("need_attend_cnt")
+    @TableField("book_attend_cnt")
-    private Integer needAttendCnt;
+    private Integer bookAttendCnt;
 
     /**
      * 实到人数
@@ -158,8 +158,8 @@ public class ScClaTime implements Serializable {
     /**
      * 请假人数
      */
-    @TableField("leave_cnt")
+//    @TableField("leave_cnt")
-    private Integer leaveCnt;
+//    private Integer leaveCnt;
 
     /**
      * 缺勤人数

ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/service/BusinessScStudentCourseService.java

@@ -247,7 +247,7 @@ public class BusinessScStudentCourseService {
             updateClaTime.setRealStartTime(startTime);
             updateClaTime.setRealEndTime(endTime);
             updateClaTime.setStatus(ClaTimeStatusEnums.HAD_CLASS.getStatus());
-            updateClaTime.setNeedAttendCnt(needAttendCnt);
+            updateClaTime.setBookAttendCnt(needAttendCnt);
             updateClaTime.setRealAttendCnt(realAttendCnt.intValue());
             updateClaTime.setMemo(reqClaTimeAttend.getMemo());
             updateClaTime.setLastUpdateUser(loginUser.getUserId());
@@ -269,7 +269,7 @@ public class BusinessScStudentCourseService {
             updateClaTime.setRealStartTime(startTime);
             updateClaTime.setRealEndTime(endTime);
             updateClaTime.setStatus(ClaTimeStatusEnums.HAD_CLASS.getStatus());
-            updateClaTime.setNeedAttendCnt(needAttendCnt);
+            updateClaTime.setBookAttendCnt(needAttendCnt);
             updateClaTime.setRealAttendCnt(realAttendCnt.intValue());
             updateClaTime.setMemo(reqClaTimeAttend.getMemo());
             updateClaTime.setLastUpdateUser(loginUser.getUserId());
@@ -291,7 +291,7 @@ public class BusinessScStudentCourseService {
             addClaTime.setSource(ClaTimeSourceEnums.UN_PLAN_CLA_TIME.getSource());
             addClaTime.setStatus(ClaTimeStatusEnums.HAD_CLASS.getStatus());
             addClaTime.setPayHour(dbCla.getEveryStuLoseHour());
-            addClaTime.setNeedAttendCnt(needAttendCnt);
+            addClaTime.setBookAttendCnt(needAttendCnt);
             addClaTime.setRealAttendCnt(realAttendCnt.intValue());
             addClaTime.setMemo(reqClaTimeAttend.getMemo());
             addClaTime.setCreateUser(loginUser.getUserId());
@@ -448,7 +448,7 @@ public class BusinessScStudentCourseService {
         updateClaTime.setPayTotalHour(totalPayHour);
         updateClaTime.setPayTotalFee(totalPayFee);
         updateClaTime.setAtClassCnt(realAttendCnt.intValue());
-        updateClaTime.setLeaveCnt(leaveCnt.intValue());
+//        updateClaTime.setLeaveCnt(leaveCnt.intValue());
         updateClaTime.setOutCnt(outCnt.intValue());
         claTimeService.updateById(updateClaTime);
 

ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/controller/ISysDeptController.java

@@ -36,6 +36,16 @@ public class ISysDeptController {
         return sysDeptService.searchList(reqSearchSysDept);
     }
 
+    /**
+     * 前端select
+     *
+     * @return
+     */
+    @GetMapping("/list/treeSelect")
+    public APIResponse treeSelect() {
+        return sysDeptService.treeSelect();
+    }
+
     /**
      * 详情
      *

ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/BusinessSysDeptService.java

@@ -17,9 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -61,6 +59,64 @@ public class BusinessSysDeptService {
         return APIResponse.toAPIResponse(null);
     }
 
+    /**
+     * 前端select
+     *
+     * @return
+     */
+    public APIResponse treeSelect() {
+        SysDept sysDept = new SysDept();
+        QueryWrapper<SysDept> qw = new QueryWrapper(sysDept);
+        qw.orderByAsc("sort");
+        List<SysDept> list = sysDeptService.list(qw);
+        SysDept tree = new SysDept();
+        tree.setDeptId(-1L);
+        this.converterTree(list,tree);
+        List<SysDept> children = tree.getChildren();
+        List<RespTreeSelect> respTreeSelects = children.stream().map(RespTreeSelect::new).collect(Collectors.toList());
+        return APIResponse.toAPIResponse(respTreeSelects);
+    }
+
+    private static Map<Long, List<SysDept>> subTreeMap = new HashMap<>();
+    private List<SysDept> children;
+    /**
+     * 树转换
+     * @param sysDeptList
+     */
+    public void converterTree(List<SysDept> sysDeptList,SysDept tree) {
+        subTreeMap.clear();
+        for (SysDept menu : sysDeptList) {
+            List<SysDept> subTreeList = subTreeMap.get(menu.getParentId());
+            if (null == subTreeList) {
+                subTreeList = new LinkedList<>();
+                subTreeMap.put(menu.getParentId(),subTreeList);
+            }
+            subTreeList.add(menu);
+        }
+
+        this.children = treeDepth(tree).getChildren();
+        if(this.children.isEmpty()){
+            this.children = sysDeptList;
+        }
+    }
+    private SysDept treeDepth(SysDept sysDept) {
+        Long deptId = sysDept.getDeptId();
+        List<SysDept> childMenuList = subTreeMap.get(deptId);
+        if(null != childMenuList){
+            List<SysDept> childList = Lists.newLinkedList();
+            for (SysDept childMenu : childMenuList) {
+                SysDept child = treeDepth(childMenu);
+                childList.add(child);
+            }
+            sysDept.setChildren(childList);
+            return sysDept;
+        }else{
+            sysDept.setChildren(Lists.newLinkedList());
+            return sysDept;
+        }
+    }
+
+
     /**
      * 详情
      *