submit

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

@@ -2698,6 +2698,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         if(Validator.isEmpty(bo.getOrderGoodsId())){
             throw new CustomException("缺少OrderGoodsId");
         }
+        OrderGoods og = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderGoodsId, bo.getOrderGoodsId()));
         //查找最外层课程目录 模块 章 节
         List<ClassPeriodVo> classPeriodVos = baseMapper.listPeriodAudit(bo);
         classPeriodVos.addAll(baseMapper.listPeriodAuditSection(bo));
@@ -2748,7 +2749,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                                         classPeriodSectionVo.setStudyStartTime(photoList.get(0).getCreateTime());
                                     }
                                     if ((startTotalTime == 0L && Validator.isNotEmpty(classPeriodSectionVo.getStudyStartTime())) || (Validator.isNotEmpty(classPeriodSectionVo.getStudyStartTime()) && (startTotalTime.longValue() > classPeriodSectionVo.getStudyStartTime().longValue()))) {
-                                        startTotalTime = classPeriodSectionVo.getStudyStartTime();
+                                        if(og.getSevenClassCopy()==1||classPeriodChapterVo.getCommonSign()==0){
+                                            startTotalTime = classPeriodSectionVo.getStudyStartTime();
+                                        }
                                     }
                                     if ((endTotalTime == 0L && (Validator.isNotEmpty(classPeriodSectionVo.getStudyEndTime()))) || (Validator.isNotEmpty(classPeriodSectionVo.getStudyEndTime()) && endTotalTime.longValue() < classPeriodSectionVo.getStudyEndTime().longValue())) {
                                         endTotalTime = classPeriodSectionVo.getStudyEndTime();
@@ -2903,7 +2906,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                             classPeriodSectionVo.setStudyStartTime(photoList.get(0).getCreateTime());
                         }
                         if ((startTotalTime == 0L && Validator.isNotEmpty(classPeriodSectionVo.getStudyStartTime())) || (Validator.isNotEmpty(classPeriodSectionVo.getStudyStartTime()) && startTotalTime.longValue() > classPeriodSectionVo.getStudyStartTime().longValue())) {
-                            startTotalTime = classPeriodSectionVo.getStudyStartTime();
+                            if(og.getSevenClassCopy()==1||classPeriodVo.getCommonSign()==0){
+                                startTotalTime = classPeriodSectionVo.getStudyStartTime();
+                            }
                         }
                         if (endTotalTime == 0L || (Validator.isNotEmpty(classPeriodSectionVo.getStudyEndTime()) && endTotalTime.longValue() < classPeriodSectionVo.getStudyEndTime().longValue())) {
                             endTotalTime = classPeriodSectionVo.getStudyEndTime();

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsAddBo.java

@@ -96,6 +96,9 @@ public class OrderGoodsAddBo {
     /** 0 未学习 1学习中 2已学完  3已审核 4待重修 */
     @ApiModelProperty("0 未学习 1学习中 2已学完  3已审核 4待重修")
     private Integer sevenClassStatus;
+    /** 复制状态 1自学 2复制 */
+    @ApiModelProperty("复制状态 1自学 2复制")
+    private Integer sevenClassCopy;
     @ApiModelProperty("关联的订单商品ID")
     private Long relevanceId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsEditBo.java

@@ -113,4 +113,7 @@ public class OrderGoodsEditBo {
     /** 0 未学习 1学习中 2已学完  3已审核 4待重修 */
     @ApiModelProperty("0 未学习 1学习中 2已学完  3已审核 4待重修")
     private Integer sevenClassStatus;
+    /** 复制状态 1自学 2复制 */
+    @ApiModelProperty("复制状态 1自学 2复制")
+    private Integer sevenClassCopy;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderGoods.java

@@ -100,6 +100,8 @@ private static final long serialVersionUID=1L;
     private Integer sevenClassVersion;
     /** 0 未学习 1学习中 2已学完  3已审核 4待重修 */
     private Integer sevenClassStatus;
+    /** 复制状态 1自学 2复制 */
+    private Integer sevenClassCopy;
 
     private Long tenantId;
 }

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

@@ -368,4 +368,8 @@ public class OrderGoodsVo {
 	private String sevenYear;
 	@ApiModelProperty("七大员继教订单商品年份")
 	private String orderYear;
+	/** 复制状态 1自学 2复制 */
+	@Excel(name = "复制状态 1自学 2复制")
+	@ApiModelProperty("复制状态 1自学 2复制")
+	private Integer sevenClassCopy;
 }

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

@@ -1348,6 +1348,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         }
         newOrderGoods.setSevenClassVersion(oldOrderGoods.getSevenClassVersion());
         newOrderGoods.setSevenClassStatus(2);
+        newOrderGoods.setSevenClassCopy(2);
         newOrderGoods.setUpdateTime(DateUtils.getNowTime());
         iOrderGoodsService.updateById(newOrderGoods);
         redisCache.deleteObject(key);

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -529,6 +529,7 @@
         og.grade_id,
         og.service_start_time,
         og.service_end_time,
+        og.seven_year as order_year,
         cb.goods_learning_order,
         (SELECT cet.education_name FROM  course_education_type cet  where cet.id = g.education_type_id) as education_name,
         (SELECT cet.project_name FROM  course_project_type cet where cet.id = g.project_id) as project_name,

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

@@ -33,6 +33,7 @@
         <result property="sevenClassVersion" column="seven_class_version"/>
         <result property="sevenClassStatus" column="seven_class_status"/>
         <result property="sevenYear" column="seven_year"/>
+        <result property="sevenClassCopy" column="seven_class_copy"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderGoodsVo" id="OrderGoodsResultVo">
@@ -116,6 +117,7 @@
         <result property="sevenClassStatus" column="seven_class_status"/>
         <result property="sevenYear" column="seven_year"/>
         <result property="orderYear" column="order_year"/>
+        <result property="sevenClassCopy" column="seven_class_copy"/>
     </resultMap>
 
     <select id="selectListBybo" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo"
@@ -473,6 +475,7 @@
         og.service_start_time,
         og.service_end_time,
         og.order_goods_id,
+        og.seven_year as order_year,
         og.grade_id,
         (SELECT
         COUNT( m.id )