收费管理增加班主任权限判定

src/main/java/com/xjrsoft/module/student/controller/ConsumptionController.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.student.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -134,6 +135,10 @@ public class ConsumptionController {
     @ApiOperation(value="学生消费管理页分页查询")
     @SaCheckPermission("consumption:detail")
     public RT<PageOutput<PbVXsxxsfytbPageVo>> pbVXsxxsfytbPage(@Valid PbVXsxxsfytbPageDto dto){
+        List<String> roleList = StpUtil.getRoleList();
+        if(roleList.size() == 2 && roleList.contains("TEACHER") && roleList.contains("CLASSTE")){
+            dto.setTeacherId(StpUtil.getLoginIdAsLong());
+        }
         IPage<PbVXsxxsfytbPageVo> page = pbVXsxxsfytbService.getPage(dto);
         PageOutput<PbVXsxxsfytbPageVo> pageOutput = ConventPage.getPageOutput(page, PbVXsxxsfytbPageVo.class);
         return RT.ok(pageOutput);

src/main/java/com/xjrsoft/module/student/dto/PbVXsxxsfytbPageDto.java

@@ -50,4 +50,7 @@ public class PbVXsxxsfytbPageDto extends PageInput {
 
     @ApiModelProperty("缴费状态")
     private String jfzt;
+
+    @ApiModelProperty("班主任id")
+    private Long teacherId;
 }

src/main/java/com/xjrsoft/module/student/service/impl/PbVXsxxsfytbServiceImpl.java

@@ -134,12 +134,13 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
 
         pbVXsxxsfytbMPJLambdaWrapper
                 .disableSubLogicDel()
-                .like(dto.getFeeitemname() != null && !dto.getFeeitemname().equals(""), PbVXsxxsfytb::getFeeitemname, dto.getFeeitemname())
-                .like(dto.getName() != null && !dto.getName().equals(""), PbVXsxxsfytb::getFeeobjname, dto.getName())
-                .eq(dto.getStudentId() != null && !dto.getStudentId().equals(""), BaseStudent::getStudentId, dto.getStudentId())
+                .like(dto.getFeeitemname() != null && !dto.getFeeitemname().isEmpty(), PbVXsxxsfytb::getFeeitemname, dto.getFeeitemname())
+                .like(dto.getName() != null && !dto.getName().isEmpty(), PbVXsxxsfytb::getFeeobjname, dto.getName())
+                .eq(dto.getStudentId() != null && !dto.getStudentId().isEmpty(), BaseStudent::getStudentId, dto.getStudentId())
                 .in(dto.getClassIdList() != null && !dto.getClassIdList().isEmpty(), BaseStudentSchoolRoll::getClassId, dto.getClassIdList())
                 .eq(dto.getSemesterId() != null && dto.getSemesterId() > 0, PbSemesterConfig::getBaseSemesterId, dto.getSemesterId())
                 .like(dto.getJfzt() != null && !"".equals(dto.getJfzt()), PbVXsxxsfytb::getJfzt, dto.getJfzt())
+                .eq(dto.getTeacherId() != null, BaseClass::getTeacherId, dto.getTeacherId())
                 .leftJoin(XjrUser.class, XjrUser::getCredentialNumber, PbVXsxxsfytb::getPersonalid)
                 .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, XjrUser::getId)
                 .leftJoin(BaseClass.class, BaseClass::getId, BaseStudentSchoolRoll::getClassId)

src/main/resources/mapper/room/RoomBedMapper.xml

@@ -287,7 +287,7 @@
     <select id="getClassStudetBed" parameterType="com.xjrsoft.module.room.dto.AdjustClassPageDto" resultType="com.xjrsoft.module.room.vo.AdjustBedClassStudentPageVo">
         SELECT t1.user_id,t4.id AS class_id, t4.name AS class_name,t2.name AS student_name,
         REPLACE(REPLACE(t2.gender,'SB10001','男'),'SB10002','女') AS gender_cn,t7.name AS build_name,t6.room_name,t5.bed_number
-        ,ifnull((SELECT (SUM(factrecarmny) >= SUM(factar)) FROM pb_v_xsxxsfytb WHERE Studentcode = t2.student_id), 0) AS pay_status
+        ,ifnull((SELECT (SUM(factrecarmny) >= SUM(factar)) FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number), 0) AS pay_status
         FROM base_student t1
         LEFT JOIN xjr_user t2 ON t1.user_id = t2.id
         LEFT JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id