fit 学习账号标记

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

@@ -25,7 +25,9 @@ import com.zhongzheng.modules.base.domain.UserProfile;
 import com.zhongzheng.modules.base.service.IUserProfileService;
 import com.zhongzheng.modules.course.domain.CourseBusiness;
 import com.zhongzheng.modules.course.domain.CourseMenuExam;
+import com.zhongzheng.modules.course.domain.CourseProjectType;
 import com.zhongzheng.modules.course.service.ICourseBusinessService;
+import com.zhongzheng.modules.course.service.ICourseProjectTypeService;
 import com.zhongzheng.modules.course.vo.CourseBusinessVo;
 import com.zhongzheng.modules.course.vo.CourseChapterVo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
@@ -133,6 +135,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     @Autowired
     private ICourseBusinessService iCourseBusinessService;
 
+    @Autowired
+    private ICourseProjectTypeService iCourseProjectTypeService;
+
     @Value("${aliyun.oss.endpoint}")
     private String ALIYUN_OSS_ENDPOINT;
 
@@ -1642,8 +1647,19 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 StudyAccountStatusVo vo = new StudyAccountStatusVo();
                 List<ClassGradeVo> classGradeList = iClassGradeService.selectByBusinessId(businessId);
                 vo.setBusinessId(businessId);
-                CourseBusinessVo courseBusinessVo = iCourseBusinessService.queryById(businessId);
-                vo.setBusinessName(courseBusinessVo.getBusinessName());
+                LambdaQueryWrapper<CourseBusiness> lqw2 = Wrappers.lambdaQuery();
+                lqw2.eq(CourseBusiness::getId, businessId);
+                CourseBusiness courseBusiness = iCourseBusinessService.getOne(lqw2);
+                vo.setBusinessName(courseBusiness.getBusinessName());
+                lqw.clear();
+                lqw.eq(Goods::getBusinessId, businessId);
+                Goods goods = iGoodsService.list(lqw).get(0);
+                LambdaQueryWrapper<CourseProjectType> lqw3 = Wrappers.lambdaQuery();
+                lqw3.eq(CourseProjectType::getId, goods.getProjectId());
+                List<CourseProjectType> courseProjectTypeList = iCourseProjectTypeService.list(lqw3);
+                if (Validator.isNotEmpty(courseProjectTypeList)) {
+                    vo.setProjectName(courseProjectTypeList.get(0).getProjectName());
+                }
                 for (ClassGradeVo classGrade : classGradeList) {
                     LambdaQueryWrapper<ClassGradeUser> lq = Wrappers.lambdaQuery();
                     lq.eq(ClassGradeUser::getGradeId, classGrade.getGradeId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/StudyAccountStatusVo.java

@@ -29,6 +29,10 @@ public class StudyAccountStatusVo {
 	@Excel(name = "业务层次名称")
 	@ApiModelProperty("业务层次名称")
 	private String businessName;
+	/** 项目类型名称 */
+	@Excel(name = "项目类型名称")
+	@ApiModelProperty("项目类型名称")
+	private String projectName;
 	/** 未配置班级数量 */
 	@Excel(name = "未配置班级数量")
 	@ApiModelProperty("未配置班级数量")