fix 工作台学习账号标记

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/ConsoleQueryBo.java

@@ -34,6 +34,10 @@ public class ConsoleQueryBo extends BaseEntity {
 	@ApiModelProperty("业务层次id")
 	private Long businessId;
 
+	/** 项目id */
+	@ApiModelProperty("项目id")
+	private Integer projectId;
+
 	/** 用户ID */
 	@ApiModelProperty("用户ID")
 	private Long userId;

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

@@ -3,11 +3,14 @@ package com.zhongzheng.modules.base.service.impl;
 
 import cn.hutool.core.lang.Validator;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.base.service.IConsoleService;
 import com.zhongzheng.modules.base.service.IUserProfileService;
+import com.zhongzheng.modules.goods.domain.Goods;
+import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.grade.service.IClassGradeService;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
@@ -32,6 +35,9 @@ public class ConsoleServiceImpl implements IConsoleService {
     @Autowired
     private IOrderService iOrderService;
 
+    @Autowired
+    private IGoodsService iGoodsService;
+
     @Autowired
     private IOrderInputService iOrderInputService;
 
@@ -203,7 +209,13 @@ public class ConsoleServiceImpl implements IConsoleService {
         map.put("noInterfNum",noInterfNum);
 
         ConsoleQueryBo bo2 = new ConsoleQueryBo();
-        bo2.setBusinessId(bo.getBusinessId());
+        LambdaQueryWrapper<Goods> lqw = Wrappers.lambdaQuery();
+        lqw.eq(Goods::getBusinessId,bo.getBusinessId());
+        lqw.isNotNull(Goods::getProjectId);
+        List<Goods> goodsList = iGoodsService.list(lqw);
+        if (goodsList != null && goodsList.size() > 0) {
+            bo2.setProjectId(goodsList.get(0).getProjectId());
+        }
         bo2.setLearnStatus(0);
         Integer noOpenNum = iClassGradeService.getConsoleGradeUserAccountNum(bo2);
         bo2.setLearnStatus(1);

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

@@ -665,16 +665,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         class_grade_user cgu  LEFT JOIN class_grade_goods cgg ON cgu.grade_id = cgg.grade_id
         LEFT JOIN goods g ON cgg.goods_id = g.goods_id
+        LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
         WHERE
-        1 = 1
+        cgu.`status` = 1
+        AND (cg.interface_account_id is not null or cg.no_interface_account_id is not null)
         <if test="learnStatus != null">
             AND cgu.learn_status = #{learnStatus}
         </if>
         <if test="finishStatus != null">
             AND cgu.finish_status = #{finishStatus}
         </if>
-        <if test="businessId != null">
-            AND g.business_id = #{businessId}
+        <if test="projectId != null">
+            AND g.project_id = #{projectId}
         </if>
         <if test="startTime != null">
             AND cgu.create_time >= #{startTime}

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

@@ -51,10 +51,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course_section cs ON mms.section_id = cs.section_id ) a
         WHERE 1=1
         <if test="startTime != null and startTime != ''">
-            AND a..live_start_time &gt; #{startTime}
+            AND a.live_start_time &gt; #{startTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            AND a..live_end_time &lt; #{endTime}
+            AND a.live_end_time &lt; #{endTime}
         </if>
         <if test="applyName != null and applyName != ''">
             AND a.apply_name = #{applyName}