tanzh 3 năm trước cách đây
mục cha
commit
beb90ed7b0

+ 11 - 0
zhongzheng-api/src/main/java/com/zhongzheng/controller/mock/MockApplyController.java

@@ -164,4 +164,15 @@ public class MockApplyController extends BaseController {
         return AjaxResult.success("", iMockApplyService.mockLiving(loginUser.getUser().getUserId()));
     }
 
+    /**
+     * 获取模考标题
+     */
+    @ApiOperation("获取模考标题")
+    @PreAuthorize("@ss.hasPermi('system:apply:list')")
+    @GetMapping("/listApplyName")
+    public TableDataInfo<MockMajorSubjectVo> listApplyName(MockApplyQueryBo bo) {
+        List<MockMajorSubjectVo> list = iMockApplyService.listApplyName(bo);
+        return getDataTable(list);
+    }
+
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/mapper/MockApplyMapper.java

@@ -5,6 +5,7 @@ import com.zhongzheng.modules.mock.bo.MockApplyQueryBo;
 import com.zhongzheng.modules.mock.domain.MockApply;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.mock.vo.MockApplyVo;
+import com.zhongzheng.modules.mock.vo.MockMajorSubjectVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -30,4 +31,6 @@ public interface MockApplyMapper extends BaseMapper<MockApply> {
     List<MockApplyVo> listSubjects();
 
     String mockLiving(Long userId);
+
+    List<MockMajorSubjectVo> listApplyName(MockApplyQueryBo bo);
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/IMockApplyService.java

@@ -69,4 +69,6 @@ public interface IMockApplyService extends IService<MockApply> {
     List<MockApplyVo> listSubjects();
 
     String mockLiving(Long userId);
+
+    List<MockMajorSubjectVo> listApplyName(MockApplyQueryBo bo);
 }

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/impl/MockApplyServiceImpl.java

@@ -526,4 +526,9 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
     public String mockLiving(Long userId) {
         return baseMapper.mockLiving(userId);
     }
+
+    @Override
+    public List<MockMajorSubjectVo> listApplyName(MockApplyQueryBo bo) {
+        return baseMapper.listApplyName(bo);
+    }
 }

+ 9 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1361,9 +1361,16 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 classGradeStudentVos.addAll(iClassGradeService.listGrade(bo1));
             });
         }
-
-
+        Set<Long> userIds = new HashSet<>();
+        List<ClassGradeStudentVo> classGradeStudentList = new ArrayList<>();
         for (ClassGradeStudentVo classGradeStudentVo : classGradeStudentVos) {
+            if (!userIds.contains(classGradeStudentVo.getUserId())) {
+                userIds.add(classGradeStudentVo.getUserId());
+                classGradeStudentList.add(classGradeStudentVo);
+            }
+        }
+
+        for (ClassGradeStudentVo classGradeStudentVo : classGradeStudentList) {
             InformRemindVo informRemindVo = informRemindService.queryById(25L);
             if (informRemindVo.getWayStatus().equals(1)) {
                 InformUserAddBo informUserAddBo = new InformUserAddBo();

+ 13 - 0
zhongzheng-system/src/main/resources/mapper/modules/mock/MockApplyMapper.xml

@@ -243,6 +243,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and unix_timestamp(now()) &gt; cs.live_start_time
           and unix_timestamp(now()) &lt; cs.live_end_time
     </select>
+    <select id="listApplyName" parameterType="com.zhongzheng.modules.mock.bo.MockApplyQueryBo" resultMap="MockApplyVoResult">
+        SELECT
+        *
+        FROM
+        mock_apply
+        WHERE 1=1
+        <if test="startTime != null and startTime !=''">
+            apply_start_time &gt; #{startTime}
+        </if>
+        <if test="endTime != null and endTime !=''">
+            apply_end_time &lt; #{endTime}
+        </if>
+    </select>
 
 
 </mapper>