Merge branch 'dev' into pre

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

@@ -145,11 +145,21 @@ public class MockApplyController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:apply:list')")
     @GetMapping("/listMockLive")
     public TableDataInfo<MockMajorSubjectVo> listMockLive(MockApplyQueryBo bo) {
+        Integer pageNum = 0;
+        Integer pageSize = 0;
+        if (Validator.isNotEmpty(bo.getPageNum()) && Validator.isNotEmpty(bo.getPageSize())) {
+            pageNum = bo.getPageNum();
+            pageSize = bo.getPageSize();
+            bo.setPageNum(null);
+            bo.setPageSize(null);
+        }
         List<MockMajorSubjectVo> list = iMockApplyService.listMockLive(bo);
+        bo.setPageNum(pageNum);
+        bo.setPageSize(pageSize);
         if (Validator.isEmpty(bo.getPageNum()) || Validator.isEmpty(bo.getPageSize())) {
             return getDataTable(list);
         }
-        return getDataTable(getPageInfo(bo.getPageNum(), bo.getPageSize(), list).getList());
+        return getDataTable(getPageInfo(pageNum, pageSize, list).getList());
     }
 
     /**
@@ -164,4 +174,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);
+    }
+
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserMockSubscribeController.java

@@ -139,6 +139,8 @@ public class UserMockSubscribeController extends BaseController {
             bo.setPageSize(null);
         }
         List<UserMockSubscribeVo> list = iUserMockSubscribeService.listSubscribe(bo);
+        bo.setPageNum(pageNum);
+        bo.setPageSize(pageSize);
         if (Validator.isEmpty(bo.getPageNum()) || Validator.isEmpty(bo.getPageSize())) {
             return getDataTable(list);
         }
@@ -152,6 +154,6 @@ public class UserMockSubscribeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:subscribe:query')")
     @GetMapping("/info/{subscribeId}")
     public AjaxResult<UserMockSubscribeVo> getSubscribeInfo(@PathVariable("subscribeId" ) Long subscribeId) {
-        return AjaxResult.success(iUserMockSubscribeService.queryById(subscribeId));
+        return AjaxResult.success(iUserMockSubscribeService.listSubscribeInfo(subscribeId));
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java

@@ -160,6 +160,11 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 	 */
 	@ApiModelProperty("业务层次id")
 	private Long businessId;
+	/**
+	 * 项目id
+	 */
+	@ApiModelProperty("项目id")
+	private Long projectId;
 	/**
 	 * 所属院校
 	 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -1677,6 +1677,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 List<CourseProjectType> courseProjectTypeList = iCourseProjectTypeService.list(lqw3);
                 if (Validator.isNotEmpty(courseProjectTypeList)) {
                     vo.setProjectName(courseProjectTypeList.get(0).getProjectName());
+                    vo.setProjectId(goods.getProjectId());
                 }
                 LambdaQueryWrapper<CourseEducationType> lqw4 = Wrappers.lambdaQuery();
                 lqw4.eq(Validator.isNotEmpty(goods.getEducationTypeId()), CourseEducationType::getId, goods.getEducationTypeId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/StudyAccountStatusVo.java

@@ -29,6 +29,10 @@ public class StudyAccountStatusVo {
 	@Excel(name = "业务层次名称")
 	@ApiModelProperty("业务层次名称")
 	private String businessName;
+	/** 项目ID */
+	@Excel(name = "项目ID")
+	@ApiModelProperty("项目ID")
+	private Integer projectId;
 	/** 项目类型名称 */
 	@Excel(name = "项目类型名称")
 	@ApiModelProperty("项目类型名称")

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

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

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

@@ -502,7 +502,7 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
                         mockApplyVo.setLiveStatus(2);
                         playBackList.add(mockApplyVo);
                     }
-                    if (System.currentTimeMillis() / 1000 > mockApplyVo.getLiveEndTime()) {
+                    if (System.currentTimeMillis() / 1000 > mockApplyVo.getLiveEndTime() && mockApplyVo.getSectionType() != 3) {
                         mockApplyVo.setLiveStatus(3);
                         overList.add(mockApplyVo);
                     }
@@ -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);
+    }
 }

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

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserMockSubscribeMapper.java

@@ -26,4 +26,6 @@ public interface UserMockSubscribeMapper extends BaseMapper<UserMockSubscribe> {
     List<UserMockSubscribeVo> listBySubject(UserMockSubscribeQueryBo bo);
 
     List<UserMockSubscribeVo> listLiveSubscribe();
+
+    UserMockSubscribeVo listSubscribeInfo(Long subscribeId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserMockSubscribeService.java

@@ -59,4 +59,6 @@ public interface IUserMockSubscribeService extends IService<UserMockSubscribe> {
     List<UserMockSubscribeVo> listSubscribe(UserMockSubscribeQueryBo bo);
 
     List<UserMockSubscribeVo> listLiveSubscribe();
+
+	UserMockSubscribeVo listSubscribeInfo(Long subscribeId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserMockSubscribeServiceImpl.java

@@ -285,6 +285,12 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
                 //把用户预约的数据和默认数据组合在一起
                 userMockSubscribeList2.forEach(userMockSubscribe -> {
                     UserMockSubscribeVo userMockSubscribeVo = iMockMajorSubjectTimeService.listByEachExamId(userMockSubscribe.getEachExamId());
+                    if (Validator.isNotEmpty(userMockSubscribe.getHandStatus())){
+                        userMockSubscribeVo.setHandStatus(userMockSubscribe.getHandStatus());
+                    }
+                    if (Validator.isNotEmpty(userMockSubscribe.getSubscribeId())){
+                        userMockSubscribeVo.setSubscribeId(userMockSubscribe.getSubscribeId());
+                    }
                     LambdaQueryWrapper<MockMajorSubjectTime> lqw = Wrappers.lambdaQuery();
                     lqw.eq(MockMajorSubjectTime::getMockMajorSubjectId, userMockSubscribe.getMockMajorSubjectId());
                     lqw.orderByDesc(MockMajorSubjectTime::getId).last("limit 1");
@@ -323,4 +329,9 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
     public List<UserMockSubscribeVo> listLiveSubscribe() {
         return baseMapper.listLiveSubscribe();
     }
+
+    @Override
+    public UserMockSubscribeVo listSubscribeInfo(Long subscribeId) {
+        return baseMapper.listSubscribeInfo(subscribeId);
+    }
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -463,6 +463,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="learnStatus != null">
             AND cgu.learn_status = #{learnStatus}
         </if>
+        <if test="projectId != null and projectId != ''">
+            AND g.project_id = #{projectId}
+        </if>
         <if test="businessId != null and businessId != ''">
             AND g.business_id = #{businessId}
         </if>

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -1214,8 +1214,6 @@
         LEFT JOIN goods g ON cgg.goods_id = g.goods_id
         WHERE
           cgu.`status` = 1
-          and g.`status` = 1
-          and cg.`status` = 1
           and g.project_id = #{projectId}
           and (cg.interface_account_id is not null or cg.no_interface_account_id is not null)
     </select>

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()) > cs.live_start_time
           and unix_timestamp(now()) < 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 !=''">
+            and apply_start_time &gt; #{startTime}
+        </if>
+        <if test="endTime != null and endTime !=''">
+            and apply_end_time &lt; #{endTime}
+        </if>
+    </select>
 
 
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/user/UserMockSubscribeMapper.xml

@@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="liveSubscribe" column="live_subscribe"/>
         <result property="liveStartTime" column="live_start_time"/>
         <result property="liveEndTime" column="live_end_time"/>
+        <result property="liveUrl" column="live_url"/>
         <result property="prefixName" column="prefix_name"/>
         <result property="hasMockRemind" column="has_mock_remind"/>
         <result property="hasLiveSubscribe" column="has_live_subscribe"/>
@@ -154,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND mms.subject_id = #{subjectId}
         </if>
         <if test="applyName != null and applyName != ''">
-            AND ma.apply_Name = #{applyName}
+            AND ma.apply_name = #{applyName}
         </if>
         <if test="subscribeStatus != null and subscribeStatus != ''">
             AND ums.subscribe_status = #{subscribeStatus}
@@ -184,7 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and ums.user_id = #{userId}
         </if>
         <if test="applyName != null and applyName != ''">
-            and ma.applyName = #{applyName}
+            and ma.apply_name = #{applyName}
         </if>
         AND ma.`status` = 1
     </select>
@@ -205,6 +206,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and ums.has_live_subscribe = 0
           and cs.live_start_time is not null
     </select>
+    <select id="listSubscribeInfo" parameterType="java.lang.Long" resultMap="UserMockSubscribeVoResult">
+        SELECT
+        ums.*,
+        cs.live_start_time,
+        cs.live_end_time,
+        cs.live_url
+        FROM
+        user_mock_subscribe ums
+        LEFT JOIN mock_major_subject mms ON ums.mock_major_subject_id = mms.mock_major_subject_id
+        LEFT JOIN course_section cs ON mms.section_id = cs.section_id
+        WHERE
+        ums.subscribe_id =#{subscribeId}
+    </select>
 
 
 </mapper>