fix

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

@@ -114,4 +114,13 @@ public class ClassGradeController extends BaseController {
         bo.setUserId(loginUser.getUser().getUserId());
         return AjaxResult.success(iClassGradeUserService.checkFinishRequiredCourse(bo));
     }
+
+    @ApiOperation("检查是否有二建班级10天过期")
+    @PreAuthorize("@ss.hasPermi('grade:user:list')")
+    @GetMapping("/checkTenClassGradeUser")
+    public AjaxResult<List<ClassGradeUserGoodsVo>> checkTenClassGradeUser(ClassGradeUserQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return AjaxResult.success(iClassGradeUserService.checkTenClassGradeUser(bo));
+    }
 }

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

@@ -76,6 +76,8 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
 
     List<ClassGradeUserGoodsVo> sendTenClassGradeUser();
 
+    List<ClassGradeUserGoodsVo> checkTenClassGradeUser(@Param("userId") Long userId);
+
     List<ClassGradeUserGoodsVo> sendFiveClassGradeUser();
 
     Long selectUserCount(User bo);

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

@@ -127,6 +127,9 @@ public interface IClassGradeUserService extends IService<ClassGradeUser> {
 
 	List<ClassGradeUserGoodsVo> sendTenClassGradeUser();
 
+
+	List<ClassGradeUserGoodsVo> checkTenClassGradeUser(ClassGradeUserQueryBo bo);
+
 	List<ClassGradeUserGoodsVo> sendFiveClassGradeUser();
 
 	Long selectList(User bo);

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

@@ -77,6 +77,7 @@ import com.zhongzheng.modules.user.mapper.UserStudyRecordPhotoMapper;
 import com.zhongzheng.modules.user.service.*;
 import com.zhongzheng.modules.user.vo.*;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -3640,6 +3641,19 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         return newList;
     }
 
+    @Override
+    public List<ClassGradeUserGoodsVo> checkTenClassGradeUser(ClassGradeUserQueryBo bo) {
+        List<ClassGradeUserGoodsVo> list = baseMapper.checkTenClassGradeUser(bo.getUserId());
+        List<ClassGradeUserGoodsVo> list1 = new ArrayList<>();
+        for(ClassGradeUserGoodsVo vo : list){
+            String businessName = iGoodsService.getGoodsBusinessName(vo.getGoodsId());
+            if (businessName.contains("继续教育二级建造师") ){
+                list1.add(vo);
+            }
+        }
+        return list1;
+    }
+
     @Override
     public List<ClassGradeUserGoodsVo> sendFiveClassGradeUser() {
         List<ClassGradeUserGoodsVo> userList = baseMapper.sendFiveClassGradeUser();

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

@@ -1678,6 +1678,23 @@
         AND unix_timestamp(now()) BETWEEN cg.class_end_time-864000 and cg.class_end_time-777600
     </select>
 
+    <select id="checkTenClassGradeUser" parameterType="map" resultMap="ClassGradeUserGoodsVoResult">
+
+        SELECT
+            cgu.user_id,
+            cgu.order_goods_id,
+            cg.class_end_time,
+            og.goods_id
+        FROM
+            class_grade_user cgu
+                LEFT JOIN class_grade cg on  cgu.grade_id = cg.grade_id
+                LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
+        where 1=1
+          and cgu.status = 1
+          and cgu.user_id = #{userId}
+          AND unix_timestamp(now()) BETWEEN cg.class_end_time-864000 and cg.class_end_time-777600
+    </select>
+
 
     <select id="sendFiveClassGradeUser"  resultMap="ClassGradeUserGoodsVoResult">