鉴定评语逻辑修改

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());
+    }
 }

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<SrsIdentifytable> {
      * @return 结果
      */
     int deleteSrsGraduataByIds(Long[] ids);
+
+    /**
+     * 获取对应人的班级信息
+     *
+     * @param userName 用户名称
+     * @return 结果
+     */
+    List<SrsClass> selectDeptByDeptCodes(String userName);
+
 }

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<SrsIdentifytable> {
      * @return 结果
      */
     int deleteSrsIdentifytableById(Long id);
+
+    /**
+     * 获取对应人的班级信息
+     *
+     * @param
+     * @return 集合结果
+     */
+    List<SrsClass> deptDataLsit();
 }

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.common.utils.SecurityUtils;
-import com.srs.comprehensive.domain.SaveStudent;
+import com.srs.comprehensive.domain.*;
-import com.srs.comprehensive.mapper.GraduateTextMapper;
+import com.srs.comprehensive.mapper.*;
-import com.srs.comprehensive.mapper.SrsGraduateStudentMapper;
+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<SrsIdentifytableMap
     public int deleteSrsIdentifytableById(Long id) {
         return srsIdentifytableMapper.deleteSrsIdentifytableById(id);
     }
+
+
+    /**
+     * 获取对应人的班级信息
+     *
+     * @param
+     * @return 集合结果
+     */
+    @Override
+    public List<SrsClass> deptDataLsit() {
+        //获取登录人的信息
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        List<SrsClass> depts = srsIdentifytableMapper.selectDeptByDeptCodes(loginUser.getUsername());
+        if(depts != null && depts.size() > 0) {
+            return depts;
+        }
+        return new ArrayList<>();
+    }
+
 }

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
     </select>
 
 

srs-comprehensive/src/main/resources/mapper/comprehensive/SrsIdentifytableMapper.xml

@@ -54,6 +54,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+<!--  班级信息  -->
+    <select id="selectDeptByDeptCodes" parameterType="String" resultType="com.srs.comprehensive.domain.SrsClass">
+        SELECT DISTINCT v.class_id,v.class_name
+        FROM srs_dev.view_stu_info v
+                 JOIN srs_class c ON v.teacher_id = c.teacher_id
+        WHERE v.t_no = #{userName}
+    </select>
+
+
 <!--    <insert id="insertSrsIdentifytable" parameterType="SrsIdentifytable" useGeneratedKeys="true" keyProperty="id">-->
 <!--        insert into srs_identifytable-->
 <!--        <trim prefix="(" suffix=")" suffixOverrides=",">-->