fix

zhongzheng-api/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -104,4 +104,13 @@ public class ClassGradeController extends BaseController {
         bo.setUserId(loginUser.getUser().getUserId());
         return AjaxResult.success(iUserPeriodService.checkGoodsStudy(bo));
     }
+
+    @ApiOperation("检查二建二造用户是否学完必修")
+    @PreAuthorize("@ss.hasPermi('grade:user:list')")
+    @GetMapping("/checkFinishRequiredCourse")
+    public AjaxResult<Long> checkFinishRequiredCourse(ClassGradeUserQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return AjaxResult.success(iClassGradeUserService.checkFinishRequiredCourse(bo));
+    }
 }

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

@@ -82,4 +82,6 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
     List<ClassGradeUserGoodsVo> selectGoodsGradeList(Long goodsId);
 
     List<ClassGradeUserVo> queryCountList(@Param("projectId")Integer projectId, @Param("businessId")Integer businessId, @Param("all") Integer all);
+
+    Long checkFinishRequiredCourse(ClassGradeUserQueryBo bo);
 }

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

@@ -125,4 +125,6 @@ public interface IClassGradeUserService extends IService<ClassGradeUser> {
 
 	List<ClassGradeUserGoodsVo> selectGoodsGradeList(Long goodsId);
 
+	Long checkFinishRequiredCourse(ClassGradeUserQueryBo bo);
+
 }

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

@@ -2127,6 +2127,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         return baseMapper.selectGoodsGradeList(goodsId);
     }
 
+    @Override
+    public Long checkFinishRequiredCourse(ClassGradeUserQueryBo bo) {
+        return baseMapper.checkFinishRequiredCourse(bo);
+    }
+
 
     /**
      * 实体类转化成视图对象

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -896,4 +896,6 @@
             (SELECT COUNT(*) num FROM user_study_record WHERE user_id = #{userId} AND order_goods_id = #{orderGoodsId} GROUP BY course_id,module_id,chapter_id,section_id UNION ALL
              SELECT COUNT(*) num FROM user_bank_record WHERE user_id = #{userId} AND order_goods_id = #{orderGoodsId} AND type != 2 GROUP BY course_id,module_id,chapter_id,exam_id) a
     </select>
+
+
 </mapper>

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

@@ -1368,5 +1368,18 @@
         </if>
     </select>
 
-
+    <select id="checkFinishRequiredCourse" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultType="java.lang.Long">
+        SELECT
+            count(*)
+        FROM
+            class_grade_user cgu
+                LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
+                LEFT JOIN goods g on og.goods_id = g.goods_id
+                LEFT JOIN major m on g.major_id = m.id
+        WHERE
+            cgu.user_id = #{userId}
+          AND cgu.period_status = 1
+          AND m.category_name = '必修'
+          and g.business_id = #{businessId}
+    </select>
 </mapper>