fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java

@@ -160,6 +160,11 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 	 */
 	@ApiModelProperty("业务层次id")
 	private Long businessId;
+	/**
+	 * 项目id
+	 */
+	@ApiModelProperty("项目id")
+	private Long projectId;
 	/**
 	 * 所属院校
 	 */

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

@@ -1677,6 +1677,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 List<CourseProjectType> courseProjectTypeList = iCourseProjectTypeService.list(lqw3);
                 if (Validator.isNotEmpty(courseProjectTypeList)) {
                     vo.setProjectName(courseProjectTypeList.get(0).getProjectName());
+                    vo.setProjectId(goods.getProjectId());
                 }
                 LambdaQueryWrapper<CourseEducationType> lqw4 = Wrappers.lambdaQuery();
                 lqw4.eq(Validator.isNotEmpty(goods.getEducationTypeId()), CourseEducationType::getId, goods.getEducationTypeId());

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;
+	/** 项目ID */
+	@Excel(name = "项目ID")
+	@ApiModelProperty("项目ID")
+	private Integer projectId;
 	/** 项目类型名称 */
 	@Excel(name = "项目类型名称")
 	@ApiModelProperty("项目类型名称")

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

@@ -463,6 +463,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="learnStatus != null">
             AND cgu.learn_status = #{learnStatus}
         </if>
+        <if test="projectId != null and projectId != ''">
+            AND g.project_id = #{projectId}
+        </if>
         <if test="businessId != null and businessId != ''">
             AND g.business_id = #{businessId}
         </if>

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

@@ -1214,8 +1214,6 @@
         LEFT JOIN goods g ON cgg.goods_id = g.goods_id
         WHERE
           cgu.`status` = 1
-          and g.`status` = 1
-          and cg.`status` = 1
           and g.project_id = #{projectId}
           and (cg.interface_account_id is not null or cg.no_interface_account_id is not null)
     </select>