add 七大员

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

@@ -500,16 +500,27 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         CourseEducationType educationType = iCourseEducationTypeService.getOne(new LambdaQueryWrapper<CourseEducationType>().eq(CourseEducationType::getStatus, 1).eq(CourseEducationType::getEducationName,"继续教育").last("limit 1"));
         CourseProjectType projectType = iCourseProjectTypeService.getOne(new LambdaQueryWrapper<CourseProjectType>().eq(CourseProjectType::getStatus, 1).eq(CourseProjectType::getEducationId,educationType.getId()).eq(CourseProjectType::getProjectName,"建造师").last("limit 1"));
         CourseBusiness business = iCourseBusinessService.getOne(new LambdaQueryWrapper<CourseBusiness>().eq(CourseBusiness::getStatus, 1).eq(CourseBusiness::getProjectId,projectType.getId()).eq(CourseBusiness::getBusinessName,"二级").last("limit 1"));
+        CourseBusiness business7 = iCourseBusinessService.getOne(new LambdaQueryWrapper<CourseBusiness>().eq(CourseBusiness::getStatus, 1).eq(CourseBusiness::getProjectId,projectType.getId()).eq(CourseBusiness::getBusinessName,"七大员新考").last("limit 1"));
+        GoodsVo goodsVo = iGoodsService.selectDetail(bo.getGoodsId());
 
-        GoodsVo goodsVo = iGoodsService.queryById(bo.getGoodsId());
         if(goodsVo.getBusinessId().longValue()!=business.getId().longValue()){
-            return null;
+            if(Validator.isNotEmpty(business7.getId())&&goodsVo.getBusinessId().longValue()!=business7.getId().longValue()){
+                return null;
+            }
         }
         UserVo userVo = iUserService.queryById(bo.getUserId());
         ClassGradeUser gradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>().eq(ClassGradeUser::getUserId,bo.getUserId()).eq(ClassGradeUser::getGradeId,bo.getGradeId()).last("limit 1"));
         OrderGoods orderGoods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderGoodsId,gradeUser.getOrderGoodsId()).last("limit 1"));
         ClassGrade classGrade = iClassGradeService.getOne(new LambdaQueryWrapper<ClassGrade>().eq(ClassGrade::getGradeId,gradeUser.getGradeId()).last("limit 1"));
         SyncUserCourseStudyRec studyRec = new SyncUserCourseStudyRec();
+        if(goodsVo.getBusinessId().longValue()==business.getId().longValue()){
+            studyRec.setCourseType(5);
+        }
+        if(Validator.isNotEmpty(business7.getId())&&goodsVo.getBusinessId().longValue()==business.getId().longValue()){
+            studyRec.setCourseType(7);
+        }
+        studyRec.setCourseName(goodsVo.getGoodsName());
+        studyRec.setMajorName(goodsVo.getSubjectNames());
         studyRec.setName(userVo.getRealname());
         studyRec.setIdNum(userVo.getIdCard());
         studyRec.setMobile(userVo.getTelphone());

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

@@ -32,6 +32,12 @@ public class SyncUserCourseStudyRec {
 
     private Long orderGoodsId;
 
+    private Integer CourseType;
+
+    private String CourseName;
+
+    private String MajorName;
+
     private List<SyncUserChapterList> ChapterList;
 
 }

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

@@ -444,7 +444,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  course c
                      LEFT JOIN goods_course gc ON gc.course_id = c.course_id
              WHERE
-                 gc.goods_id = g.goods_id) as subject_num
+                 gc.goods_id = g.goods_id) as subject_num,
+            (SELECT GROUP_CONCAT(subject_name)  from course_subject where FIND_IN_SET(id,g.subject_ids)) subject_names
         FROM
             goods g
                 LEFT JOIN pay_supply ps ON g.supply_id = ps.supply_id