diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/controller/SrsIdentifytableController.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/controller/SrsIdentifytableController.java index 177c8f1..8b02515 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/controller/SrsIdentifytableController.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/controller/SrsIdentifytableController.java @@ -126,4 +126,15 @@ public class SrsIdentifytableController extends BaseController { { return toAjax(srsIdentifytableService.deleteSrsIdentifytableByIds(ids)); } + + /** + * 班级信息 + */ + @Log(title = "学生鉴定信息", businessType = BusinessType.DELETE) + @GetMapping("/deptdata") + @ApiOperation("获取对应人的班级信息") + public AjaxResult deptData() + { + return success(srsIdentifytableService.deptDataLsit()); + } } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsIdentifytableMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsIdentifytableMapper.java index 15ecd27..fe99489 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsIdentifytableMapper.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsIdentifytableMapper.java @@ -2,6 +2,8 @@ package com.srs.comprehensive.mapper; import java.util.List; +import com.srs.common.core.domain.entity.SysDept; +import com.srs.comprehensive.domain.SrsClass; import com.srs.comprehensive.domain.SrsIdentifytable; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -107,4 +109,13 @@ public interface SrsIdentifytableMapper extends BaseMapper { * @return 结果 */ int deleteSrsGraduataByIds(Long[] ids); + + /** + * 获取对应人的班级信息 + * + * @param userName 用户名称 + * @return 结果 + */ + List selectDeptByDeptCodes(String userName); + } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsIdentifytableService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsIdentifytableService.java index d24ce27..5d548a2 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsIdentifytableService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsIdentifytableService.java @@ -3,6 +3,8 @@ package com.srs.comprehensive.service; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; +import com.srs.comprehensive.domain.CascaderEntity; +import com.srs.comprehensive.domain.SrsClass; import com.srs.comprehensive.domain.SrsIdentifytable; /** @@ -59,4 +61,12 @@ public interface ISrsIdentifytableService extends IService { * @return 结果 */ int deleteSrsIdentifytableById(Long id); + + /** + * 获取对应人的班级信息 + * + * @param + * @return 集合结果 + */ + List deptDataLsit(); } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsIdentifytableServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsIdentifytableServiceImpl.java index 494b65a..ec86368 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsIdentifytableServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsIdentifytableServiceImpl.java @@ -1,17 +1,20 @@ package com.srs.comprehensive.service.impl; +import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; + +import com.srs.common.core.domain.entity.SysDept; +import com.srs.common.core.domain.model.LoginUser; import com.srs.common.utils.DateUtils; -import com.srs.comprehensive.domain.GraduateStudentNews; -import com.srs.comprehensive.domain.SaveStudent; -import com.srs.comprehensive.mapper.GraduateTextMapper; -import com.srs.comprehensive.mapper.SrsGraduateStudentMapper; +import com.srs.common.utils.SecurityUtils; +import com.srs.comprehensive.domain.*; +import com.srs.comprehensive.mapper.*; +import com.srs.comprehensive.service.ICascaderDataStudentService; import com.srs.comprehensive.util.FileUploadUtil; import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import com.srs.comprehensive.mapper.SrsIdentifytableMapper; -import com.srs.comprehensive.domain.SrsIdentifytable; import com.srs.comprehensive.service.ISrsIdentifytableService; /** @@ -156,4 +159,23 @@ public class SrsIdentifytableServiceImpl extends ServiceImpl deptDataLsit() { + //获取登录人的信息 + LoginUser loginUser = SecurityUtils.getLoginUser(); + List depts = srsIdentifytableMapper.selectDeptByDeptCodes(loginUser.getUsername()); + if(depts != null && depts.size() > 0) { + return depts; + } + return new ArrayList<>(); + } + } diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml index c17a5f6..ab54c16 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml @@ -781,6 +781,12 @@ from sys_performance as a where (a.shstatus IS NOT NULL and a.ksstatus IS NULL) -- 科室复核待办 or (a.ksstatus IS NOT NULL and a.xgstatus IS NULL) -- 学工处长待办 + -- 邵政文-(宿舍管理-住宿费用-辅导员确认待办) + union + select concat('zsfy-',count(a.id)) as `all` + from dms_new_record as a + left join view_dms_record as d on a.stu_no = d.stu_no + where d.employee_id = #{tNo} and a.apply_status = 6 diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsIdentifytableMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsIdentifytableMapper.xml index 95af267..5ce6e37 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsIdentifytableMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsIdentifytableMapper.xml @@ -54,6 +54,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + + +