submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -194,4 +194,6 @@ private static final long serialVersionUID=1L;
     private String makeGoodsIds;
     /** 录单标签：0正常 1隐藏 */
     private Integer inputSign;
+    /** 课时标识：1 显示 0不显示 */
+    private Integer hoursSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -134,6 +134,9 @@ public class GoodsVo {
 	@ApiModelProperty("学时")
 	private BigDecimal classHours;
 
+	@ApiModelProperty("学时")
+	private BigDecimal classHoursStr;
+
 	@Excel(name = "公共学时")
 	@ApiModelProperty("公共学时")
 	private BigDecimal publicClassHours;
@@ -422,4 +425,6 @@ public class GoodsVo {
 	@ApiModelProperty("学习提示标签：1开启 0关闭")
 	private Integer reminderSign;
 
+	/** 课时标识：1 显示 0不显示 */
+	private Integer hoursSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysTenant.java

@@ -133,4 +133,6 @@ private static final long serialVersionUID=1L;
     private Integer telSign;
     /** 活体检测标签：1开启 0关闭*/
     private Integer detectLiveSign;
+    /** 是否检测快进标识：1开启 0关闭*/
+    private Integer fastForwardSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -58,6 +58,8 @@ import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.polyv.bo.PolyvLiveQueryBo;
 import com.zhongzheng.modules.polyv.service.IPolyvLiveService;
 import com.zhongzheng.modules.system.domain.SysOldOrg;
+import com.zhongzheng.modules.system.domain.SysTenant;
+import com.zhongzheng.modules.system.service.ISysTenantService;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.*;
 import com.zhongzheng.modules.user.mapper.UserStudyRecordMapper;
@@ -177,6 +179,8 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
     @Autowired
     private IUserStudyVideoService iUserStudyVideoService;
 
+    @Autowired
+    private ISysTenantService iSysTenantService;
 
     @Value("${fileHost}")
     private String fileHost;
@@ -382,9 +386,12 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         if(Validator.isEmpty(gradeOgUser)){
             throw new CustomException("订单数据错误");
         }
-
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
         //校验是否有快进
-        checkFastForward(bo);
+        SysTenant tenant = iSysTenantService.getById(Long.valueOf(tenantId));
+        if (ObjectUtils.isNotNull(tenant) && tenant.getFastForwardSign() == 1){
+            checkFastForward(bo);
+        }
         /*GoodsVo goodsVo = iGoodsService.queryById(bo.getGoodsId());
         String fullName;
         CourseBusinessQueryBo queryBusinessBo = new CourseBusinessQueryBo();

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

@@ -107,6 +107,8 @@
         <result property="externalLinkStatus" column="external_link_status"/>
         <result property="sevenYear" column="seven_year"/>
         <result property="mailSign" column="mail_sign"/>
+        <result property="classHoursStr" column="classHoursStr"/>
+        <result property="hoursSign" column="hours_Sign"/>
 
         <result property="supplyName" column="supply_name"/>
         <result property="educationName" column="education_name"/>
@@ -198,6 +200,7 @@
     <select id="selectAllList" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo" resultMap="GoodsResultVo">
         SELECT
         g.*,
+        g.class_hours as classHoursStr,
         ps.supply_name,
         cet.education_name,
         cpt.project_name,