fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -740,7 +740,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
                     goodsUserVo.setErJianErZao(true);
                 }else if (goodsUserVo.getEducationName().equals("考前培训") && goodsUserVo.getProjectName().equals("施工现场专业人员")){
                     int count = iUserProfileService.count(new LambdaQueryWrapper<UserProfile>()
-                            .ne(UserProfile::getStatus,-1)
+                            .notIn(UserProfile::getStatus, Arrays.asList(3, -1))
                             .eq(UserProfile::getUserId, goodsUserVo.getUserId())
                             .eq(UserProfile::getOrderGoodsId, goodsUserVo.getOrderGoodsId())
                             .eq(UserProfile::getCurrentStatus, 1)

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -594,6 +594,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     public List<OrderGoodsVo> listUserVideoLive(GoodsQueryBo bo) {
         List<OrderGoodsVo> list = this.baseMapper.listUserVideoLive(bo);
         for(OrderGoodsVo goodsVo : list){
+            if(goodsVo.getOrderGoodsId().longValue()==6311L){
+                System.out.println(goodsVo.getOrderGoodsId());
+            }
             String fullName = goodsVo.getEducationName()+goodsVo.getBusinessName()+goodsVo.getProjectName();
             goodsVo.setErJianErZao(false);
             if(Validator.isNotEmpty(fullName)){

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderGoodsVo.java

@@ -375,4 +375,11 @@ public class OrderGoodsVo {
 
 	@ApiModelProperty("寄件标签：1是 0否")
 	private Integer mailSign;
+
+	@ApiModelProperty("资料审核状态  1通过 3不通过 2待审")
+	private Long profileStatus;
+
+
+	@ApiModelProperty("学员资料 变更状态 2变更 1否")
+	private Integer profileChangeStatus;
 }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -120,6 +120,8 @@
         <result property="sevenClassCopy" column="seven_class_copy"/>
         <result property="studyStatus" column="study_status"/>
         <result property="mailSign" column="mail_sign"/>
+        <result property="profileStatus" column="profile_status"/>
+        <result property="profileChangeStatus" column="profile_change_status"/>
     </resultMap>
 
     <select id="selectListBybo" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo"
@@ -501,6 +503,8 @@
         us.apply_site_exam_time as sub_apply_site_exam_time,
         (SELECT COUNT(1) FROM goods_course gc where gc.goods_id = g.goods_id) as course_num,
         og.study_count as user_study_count,
+        (SELECT `status` from user_profile where user_id = o.user_id and goods_id = g.goods_id and current_status = 1 and type_status = 1 and order_goods_id = og.order_goods_id limit 1 ) as profile_status,
+        (SELECT change_status from user_profile where user_id = o.user_id and goods_id = g.goods_id and current_status = 1 and type_status = 1 and order_goods_id = og.order_goods_id limit 1 ) as profile_change_status,
         (SELECT count(*) from user_study_record usr where usr.user_id = o.user_id and usr.order_goods_id = og.order_goods_id) as study_status
         FROM
         order_goods og