fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeUserMapper.java

@@ -75,5 +75,5 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
 
     List<ClassGradeUserGoodsVo> selectGoodsGradeList(Long goodsId);
 
-    List<ClassGradeUserVo> queryCountList(Long businessId);
+    List<ClassGradeUserVo> queryCountList(Integer projectId);
 }

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

@@ -1653,26 +1653,17 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         }
 
         List<StudyAccountStatusVo> list = new ArrayList<>();
-        int notConfiguredNum = 0;
-        int interfaceNum = 0;
-        int noInterfaceNum = 0;
-        int openNum = 0;
-        int noOpenNum = 0;
-        int failNum = 0;
-        int finishNum = 0;
-        int noFinishNum = 0;
         if (!CollectionUtils.isEmpty(set)) {
             for (Long businessId : set) {
-                notConfiguredNum = 0;
-                interfaceNum = 0;
-                noInterfaceNum = 0;
-                openNum = 0;
-                noOpenNum = 0;
-                failNum = 0;
-                finishNum = 0;
-                noFinishNum = 0;
+                Integer notConfiguredNum = 0;
+                Integer interfaceNum = 0;
+                Integer noInterfaceNum = 0;
+                Integer openNum = 0;
+                Integer noOpenNum = 0;
+                Integer failNum = 0;
+                Integer finishNum = 0;
+                Integer noFinishNum = 0;
                 StudyAccountStatusVo vo = new StudyAccountStatusVo();
-                List<ClassGradeUserVo> countList = queryCountList(businessId);
                 vo.setBusinessId(businessId);
                 LambdaQueryWrapper<CourseBusiness> lqw2 = Wrappers.lambdaQuery();
                 lqw2.eq(CourseBusiness::getId, businessId);
@@ -1694,34 +1685,30 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     vo.setEducationName(courseEducationType.getEducationName());
                     vo.setEducationTypeId(courseEducationType.getId());
                 }
-                for (ClassGradeUserVo classGrade : countList) {
-                    LambdaQueryWrapper<ClassGradeUser> lq = Wrappers.lambdaQuery();
-                    lq.eq(ClassGradeUser::getGradeId, classGrade.getGradeId());
-                    List<ClassGradeUser> classGradeUsers = iClassGradeUserService.list(lq);
-                    for (ClassGradeUser classGradeUser : classGradeUsers) {
-                        if (Validator.isNotEmpty(classGradeUser.getLearnStatus())) {
-                            //统计账号未开通数量
-                            if (classGradeUser.getLearnStatus() == 0) {
-                                noOpenNum++;
-                            }
-                            //统计账号未开通数量
-                            if (classGradeUser.getLearnStatus() == 1) {
-                                openNum++;
-                            }
-                            //统计账号标记失败数量
-                            if (classGradeUser.getLearnStatus() == 2) {
-                                failNum++;
-                            }
+                List<ClassGradeUserVo> countList = queryCountList(goods.getProjectId());
+                for (ClassGradeUserVo classGradeUser : countList) {
+                    if (Validator.isNotEmpty(classGradeUser.getLearnStatus())) {
+                        //统计账号未开通数量
+                        if (classGradeUser.getLearnStatus() == 0) {
+                            noOpenNum++;
                         }
-                        if (Validator.isNotEmpty(classGradeUser.getFinishStatus())) {
-                            //统计已学完数量
-                            if (classGradeUser.getFinishStatus() == 1) {
-                                finishNum++;
-                            }
-                            //统计未学完数量
-                            if (classGradeUser.getFinishStatus() == 0) {
-                                noFinishNum++;
-                            }
+                        //统计账号未开通数量
+                        if (classGradeUser.getLearnStatus() == 1) {
+                            openNum++;
+                        }
+                        //统计账号标记失败数量
+                        if (classGradeUser.getLearnStatus() == 2) {
+                            failNum++;
+                        }
+                    }
+                    if (Validator.isNotEmpty(classGradeUser.getFinishStatus())) {
+                        //统计已学完数量
+                        if (classGradeUser.getFinishStatus() == 1) {
+                            finishNum++;
+                        }
+                        //统计未学完数量
+                        if (classGradeUser.getFinishStatus() == 0) {
+                            noFinishNum++;
                         }
                     }
                 }
@@ -1763,8 +1750,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     }
 
 
-    private List<ClassGradeUserVo> queryCountList(Long businessId) {
-        return baseMapper.queryCountList(businessId);
+    private List<ClassGradeUserVo> queryCountList(Integer projectId) {
+        return baseMapper.queryCountList(projectId);
     }
 
 

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

@@ -244,7 +244,7 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
             if (Validator.isNotEmpty(bo.getMockStatus()) && bo.getMockStatus() == 0) {
                 userMockSubscribeVoList.stream().forEach(userMockSubscribeVo -> {
                     try {
-                        if (System.currentTimeMillis()/1000 < formatTime(userMockSubscribeVo.getApplySiteExamTime(), userMockSubscribeVo.getApplySiteStartTime())+Integer.parseInt(userMockSubscribeVo.getTimeLimit()) * 60L) {
+                        if (System.currentTimeMillis()/1000 < formatTime(userMockSubscribeVo.getApplySiteExamTime(), userMockSubscribeVo.getApplySiteEndTime())) {
                             userMockSubscribeVos.add(userMockSubscribeVo);
                         }
                     } catch (ParseException e) {

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

@@ -1200,7 +1200,7 @@
             cgg.goods_id = #{goodsId}
           AND cgu.user_id IS NOT NULL
     </select>
-    <select id="queryCountList" parameterType="java.lang.Long" resultMap="ClassGradeUserVoResult">
+    <select id="queryCountList" parameterType="java.lang.Integer" resultMap="ClassGradeUserVoResult">
         SELECT
             cgu.*,
             cg.interface_account_id,
@@ -1214,6 +1214,7 @@
           cgu.`status` = 1
           and g.`status` = 1
           and cg.`status` = 1
-          and g.business_id = #{businessId}
+          and g.project_id = #{projectId}
+          and (cg.interface_account_id is not null or cg.no_interface_account_id is not null)
     </select>
 </mapper>

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

@@ -144,42 +144,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY mmst.exam_time
     </select>
     <select id="listApplyBusiness" resultType="com.zhongzheng.modules.mock.vo.MockApplyVo">
-        SELECT  a.business_id,a.business_name,a.project_id,a.project_name FROM
-            (SELECT DISTINCT
-                 ma.business_id,
-                 cb.business_name,
-                 ma.project_id,
-                 cpt.project_name
-             FROM mock_apply ma
-                      LEFT JOIN course_project_type cpt ON ma.project_id = cpt.id
-                      LEFT JOIN course_business cb ON ma.business_id = cb.id
-                      LEFT JOIN mock_major mm ON ma.apply_id = mm.apply_id
-                      LEFT JOIN mock_major_subject mms ON mm.mock_major_id = mms.mock_major_id
-                      LEFT JOIN mock_major_subject_time mmst ON mms.mock_major_subject_id = mmst.id
-             WHERE 1=1
+        SELECT  a.business_id,a.business_name,a.project_id,a.project_name,a.education_type_id,a.education_name
+        FROM
+        (SELECT DISTINCT
+        ma.business_id,
+        cb.business_name,
+        ma.project_id,
+        cpt.project_name,
+        ma.education_type_id,
+        cet.education_name
+        FROM mock_apply ma
+        LEFT JOIN course_project_type cpt ON ma.project_id = cpt.id
+        LEFT JOIN course_business cb ON ma.business_id = cb.id
+        LEFT JOIN mock_major mm ON ma.apply_id = mm.apply_id
+        LEFT JOIN mock_major_subject mms ON mm.mock_major_id = mms.mock_major_id
+        LEFT JOIN mock_major_subject_time mmst ON mms.mock_major_subject_id = mmst.id
+        LEFT JOIN course_education_type cet ON ma.education_type_id = cet.id
+        WHERE 1=1
         <if test="startTime != null and startTime != ''">
             and mmst.exam_time &gt; #{startTime}
         </if>
         <if test="endTime != null and endTime != ''">
             and mmst.exam_time &lt; #{endTime}
         </if>
-             UNION ALL
-             SELECT 	DISTINCT
-                 g.business_id,
-                 cb.business_name,
-                 g.project_id,
-                 cpt.project_name
-             FROM `order` o
-                      LEFT JOIN order_goods og ON o.order_sn = og.order_sn
-                      LEFT JOIN goods g ON og.goods_id = g.goods_id
-                      LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
-                      LEFT JOIN course_business cb ON g.business_id = cb.id
-             WHERE 1=1
+        UNION ALL
+        SELECT 	DISTINCT
+        g.business_id,
+        cb.business_name,
+        g.project_id,
+        cpt.project_name,
+        g.education_type_id,
+        cet.education_name
+        FROM `order` o
+        LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+        LEFT JOIN goods g ON og.goods_id = g.goods_id
+        LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
+        LEFT JOIN course_business cb ON g.business_id = cb.id
+        LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
+        WHERE 1=1
         <if test="userId != null and userId != ''">
             and o.user_id = #{userId}
         </if>
-                 ) a
-        GROUP BY a.business_id,a.business_name,a.project_id,a.project_name
+        ) a
+        GROUP BY a.business_id,a.business_name,a.project_id,a.project_name,a.education_type_id,a.education_name
         HAVING COUNT(a.project_id)=2
     </select>
     <select id="listMockLive" parameterType="com.zhongzheng.modules.mock.bo.MockApplyQueryBo" resultMap="MockApplyVoResult">