fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ConsoleServiceImpl.java

@@ -208,6 +208,11 @@ public class ConsoleServiceImpl implements IConsoleService {
         map.put("interfNum",interfNum);
         map.put("noInterfNum",noInterfNum);
 
+        Integer noOpenNum = 0;
+        Integer openNum = 0;
+        Integer failNum = 0;
+        Integer noFinishNum = 0;
+        Integer finishNum = 0;
         ConsoleQueryBo bo2 = new ConsoleQueryBo();
         LambdaQueryWrapper<Goods> lqw = Wrappers.lambdaQuery();
         lqw.eq(Goods::getBusinessId,bo.getBusinessId());
@@ -215,19 +220,19 @@ public class ConsoleServiceImpl implements IConsoleService {
         List<Goods> goodsList = iGoodsService.list(lqw);
         if (goodsList != null && goodsList.size() > 0) {
             bo2.setProjectId(goodsList.get(0).getProjectId());
+            bo2.setLearnStatus(0);
+            noOpenNum = iClassGradeService.getConsoleGradeUserAccountNum(bo2);
+            bo2.setLearnStatus(1);
+            openNum = iClassGradeService.getConsoleGradeUserAccountNum(bo2);
+            bo2.setLearnStatus(2);
+            failNum = iClassGradeService.getConsoleGradeUserAccountNum(bo2);
+
+            bo2.setLearnStatus(null);
+            bo2.setFinishStatus(0);
+            noFinishNum = iClassGradeService.getConsoleGradeUserAccountNum(bo2);
+            bo2.setFinishStatus(1);
+            finishNum = iClassGradeService.getConsoleGradeUserAccountNum(bo2);
         }
-        bo2.setLearnStatus(0);
-        Integer noOpenNum = iClassGradeService.getConsoleGradeUserAccountNum(bo2);
-        bo2.setLearnStatus(1);
-        Integer openNum = iClassGradeService.getConsoleGradeUserAccountNum(bo2);
-        bo2.setLearnStatus(2);
-        Integer failNum = iClassGradeService.getConsoleGradeUserAccountNum(bo2);
-
-        bo2.setLearnStatus(null);
-        bo2.setFinishStatus(0);
-        Integer noFinishNum = iClassGradeService.getConsoleGradeUserAccountNum(bo2);
-        bo2.setFinishStatus(1);
-        Integer finishNum = iClassGradeService.getConsoleGradeUserAccountNum(bo2);
         map.put("noOpenNum",noOpenNum);
         map.put("openNum",openNum);
         map.put("failNum",failNum);

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/vo/MockMajorSubjectVo.java

@@ -89,6 +89,11 @@ public class MockMajorSubjectVo {
 	@ApiModelProperty("封面地址")
 	private String coverUrl;
 
+	/** 节名称 */
+	@Excel(name = "节名称")
+	@ApiModelProperty("节名称")
+	private String name;
+
 	/** 模考专业科目绑定时间集合 */
 	@Excel(name = "模考专业科目绑定时间集合")
 	@ApiModelProperty("模考专业科目绑定时间集合")

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

@@ -1399,9 +1399,9 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 UserVo userVo = iUserService.queryById(classGradeStudentVo.getUserId());
                 Map<String, Object> param = new HashMap<>();
                 param.put("businessName", classGradeStudentVo.getBusinessName() + classGradeStudentVo.getProjectName());
-                /*if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), mockBookingReminder))) {
+                if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), mockBookingReminder))) {
                     iInformUserService.insertByAddBo(informUserAddBo);
-                }*/
+                }
             }
         }
         mockApplyVos.forEach(mockApplyVo -> {
@@ -1471,9 +1471,9 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     Map<String, Object> param = new HashMap<>();
                     param.put("subjectName", courseSubject.getSubjectName());
                     param.put("applyName", mockApply.getApplyName());
-                    /*if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), mockRemind))) {
+                    if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), mockRemind))) {
                         iInformUserService.insertByAddBo(informUserAddBo);
-                    }*/
+                    }
                 }
                 UserMockSubscribeEditBo bo1 = new UserMockSubscribeEditBo();
                 bo1.setSubscribeId(subscribeVo.getSubscribeId());
@@ -1500,7 +1500,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 informUserAddBo.setRemindId(27L);
                 informUserAddBo.setSystemStatus(1);
                 informUserAddBo.setRemind("直播开课提醒");
-                informUserAddBo.setText("祥粤云学堂提醒：您学习【" + userMockSubscribeVo.getSubjectName() + "】科目中的【" + userMockSubscribeVo.getPrefixName() + "直播】已将于60分钟后开始直播，请及时在【祥粤云小程序】或【web.xyyxt.net】进行观看。");
+                informUserAddBo.setText("祥粤云学堂提醒：您学习【" + userMockSubscribeVo.getSubjectName() + "】科目中的【" + userMockSubscribeVo.getName() + "直播】已将于60分钟后开始直播，请及时在【祥粤云小程序】或【web.xyyxt.net】进行观看。");
                 iInformUserService.insertByAddBo(informUserAddBo);
             }
             if (informRemindVo.getNoteStatus().equals(1)) {
@@ -1513,14 +1513,15 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 informUserAddBo.setRemindId(27L);
                 informUserAddBo.setSystemStatus(3);
                 informUserAddBo.setRemind("直播开课提醒");
-                informUserAddBo.setText("祥粤云学堂提醒：您学习【" + userMockSubscribeVo.getSubjectName() + "】科目中的【" + userMockSubscribeVo.getPrefixName() + "直播】已将于60分钟后开始直播，请及时在【祥粤云小程序】或【web.xyyxt.net】进行观看。");
+                informUserAddBo.setText("祥粤云学堂提醒：您学习【" + userMockSubscribeVo.getSubjectName() + "】科目中的【" + userMockSubscribeVo.getName() + "直播】已将于60分钟后开始直播，请及时在【祥粤云小程序】或【web.xyyxt.net】进行观看。");
                 UserVo userVo = iUserService.queryById(userMockSubscribeVo.getUserId());
                 Map<String, Object> param = new HashMap<>();
                 param.put("subjectName", userMockSubscribeVo.getSubjectName());
-                param.put("prefixName", userMockSubscribeVo.getPrefixName());
-                /*if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), liveStartRemind))) {
+                //注意是节名称
+                param.put("prefixName", userMockSubscribeVo.getName());
+                if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), liveStartRemind))) {
                     iInformUserService.insertByAddBo(informUserAddBo);
-                }*/
+                }
             }
             UserMockSubscribeEditBo bo1 = new UserMockSubscribeEditBo();
             bo1.setSubscribeId(userMockSubscribeVo.getSubscribeId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserMockSubscribeVo.java

@@ -224,4 +224,8 @@ public class UserMockSubscribeVo {
 	@Excel(name = "是否已发送直播通知 0否 1是")
 	@ApiModelProperty("是否已发送直播通知 0否 1是")
 	private Integer hasLiveSubscribe;
+	/** 节名称 */
+	@Excel(name = "节名称")
+	@ApiModelProperty("节名称")
+	private String name;
 }

zhongzheng-system/src/main/resources/mapper/modules/mock/MockMajorSubjectMapper.xml

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="recordingUrl" column="recording_url"/>
         <result property="coverUrl" column="cover_url"/>
         <result property="applyName" column="apply_name"/>
+        <result property="name" column="name"/>
     </resultMap>
 
     <select id="listMockLive" parameterType="com.zhongzheng.modules.mock.bo.MockApplyQueryBo" resultMap="MockMajorSubjectVoResult">
@@ -45,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cs.live_end_time,
         cs.recording_url,
         cs.cover_url,
+        cs.name,
         (SELECT ma.apply_name FROM mock_apply ma LEFT JOIN mock_major mm ON ma.apply_id = mm.apply_id LEFT JOIN mock_major_subject mms1 ON mm.mock_major_id = mms1.mock_major_id WHERE mms1.mock_major_subject_id = mms.mock_major_subject_id LIMIT 1) apply_name
         FROM
         mock_major_subject mms

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

@@ -68,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="prefixName" column="prefix_name"/>
         <result property="hasMockRemind" column="has_mock_remind"/>
         <result property="hasLiveSubscribe" column="has_live_subscribe"/>
+        <result property="name" column="name"/>
     </resultMap>
     <select id="getInfo" parameterType="java.lang.Long" resultMap="UserMockSubscribeVoResult">
         SELECT 	ums.*,
@@ -196,6 +197,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cs.live_start_time,
             cs.live_end_time,
             cs.prefix_name,
+            cs.name,
             css.subject_name
         FROM
             user_mock_subscribe ums