Administrator 2 rokov pred
rodič
commit
87fe9833f9

+ 8 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RecordLeaveController.java

@@ -44,6 +44,14 @@ public class RecordLeaveController extends BaseController
         List<RecordLeave> list = recordLeaveService.selectRecordLeaveList(recordLeave);
         return getDataTable(list);
     }
+    /**
+     * app请假记录数量通知
+     */
+    @PostMapping("/recordLeave")
+    public void recordLeave(RecordLeave recordLeave)
+    {
+        recordLeaveService.selectRecordLeaveNum(recordLeave);
+    }
 
     /**
      * 导出请假记录信息列表

+ 1 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordLeaveMapper.java

@@ -26,6 +26,7 @@ public interface RecordLeaveMapper
      * @return 请假记录信息集合
      */
     public List<RecordLeave> selectRecordLeaveList(RecordLeave recordLeave);
+    public int selectRecordLeaveNum(RecordLeave recordLeave);
 
     /**
      * 新增请假记录信息

+ 9 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordLeaveService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.RecordLeave;
 
 /**
@@ -27,6 +29,13 @@ public interface IRecordLeaveService
      */
     public List<RecordLeave> selectRecordLeaveList(RecordLeave recordLeave);
 
+    /**
+     * app请假记录数量通知
+     * @param recordLeave
+     * @return
+     */
+    public AjaxResult selectRecordLeaveNum(RecordLeave recordLeave);
+
     /**
      * 新增请假记录信息
      * 

+ 34 - 1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordLeaveServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.FormalParentsStudent;
 import com.ruoyi.common.core.domain.entity.FormalTeacherClass;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -48,7 +49,14 @@ public class RecordLeaveServiceImpl implements IRecordLeaveService
     @Override
     public RecordLeave selectRecordLeaveById(Long id)
     {
-        return recordLeaveMapper.selectRecordLeaveById(id);
+        RecordLeave recordLeave = recordLeaveMapper.selectRecordLeaveById(id);
+
+        //更新为查看
+        RecordLeave recordLeavePass = new RecordLeave();
+        recordLeavePass.setId(id);
+        recordLeavePass.setIsPass("2");
+        recordLeaveMapper.updateRecordLeave(recordLeavePass);
+        return recordLeave;
     }
 
     /**
@@ -104,6 +112,31 @@ public class RecordLeaveServiceImpl implements IRecordLeaveService
         return recordLeaveList;
     }
 
+    /**
+     * app请假记录数量通知
+     * @param recordLeave
+     * @return
+     */
+    @Override
+    public AjaxResult selectRecordLeaveNum(RecordLeave recordLeave) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        StringBuilder classId = new StringBuilder("0,");
+        FormalTeacherClass formalTeacherClass = new FormalTeacherClass();
+        formalTeacherClass.setTeacherId(user.getUserId());
+        List<FormalTeacherClass> formalTeacherClasses = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
+        if (formalTeacherClasses != null && formalTeacherClasses.size() > 0) {
+            for (FormalTeacherClass teacherClass : formalTeacherClasses) {
+                classId.append(teacherClass.getClassId()).append(",");
+            }
+        }
+        if (StringUtils.isNotBlank(classId.toString())) {
+            classId = new StringBuilder(classId.substring(0, classId.length() - 1));
+        }
+        recordLeave.setClassId(classId.toString());
+        int num =recordLeaveMapper.selectRecordLeaveNum(recordLeave);
+        return AjaxResult.success(num);
+    }
+
     /**
      * 新增请假记录信息
      * 

+ 5 - 1
ruoyi-system/src/main/resources/mapper/system/RecordLeaveMapper.xml

@@ -56,7 +56,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectRecordLeaveVo"/>
         where id = #{id}
     </select>
-        
+    <select id="selectRecordLeaveNum" resultType="java.lang.Integer">
+       select count(1) from record_leave
+        where   is_pass = '0'  and find_in_set(class_id,#{classId})
+    </select>
+
     <insert id="insertRecordLeave" parameterType="RecordLeave" useGeneratedKeys="true" keyProperty="id">
         insert into record_leave
         <trim prefix="(" suffix=")" suffixOverrides=",">