submit

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

@@ -938,7 +938,6 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
         return tableDataInfo;
     }
 
-
     @Override
     public List<GoodsUserVo> goodsStudyProgressList(CourseQueryBo bo) {
         List<GoodsUserVo> goodsUserVos = baseMapper.goodsStudyProgressList(bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -6230,7 +6230,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             if (bo.getStatus() == 1 && order.getOrderBase() == 1 && ObjectUtils.isNotNull(order.getInputOrderSn())) {
                 handleRefundOrder(list.stream().map(x -> BeanUtil.toBean(x, TopOldOrderRefundVo.class)).collect(Collectors.toList()), order.getInputOrderSn(), order.getTenantId().toString());
             }
-            checkInform(order.getOrderSn(), list.get(0).getType(), "", 1, 1, bo.getStatus() == 1 ? "已支付" : "支付失败");
+            checkInform(order.getOrderSn(), list.get(0).getType(), "", bo.getStatus(), 1, bo.getStatus() == 1 ? "已支付" : "支付失败");
             return true;
         } else if (bankPay.getType() == 1) {
             if (Validator.isEmpty(bankPay.getDivideLogId())) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/OldCourseChpaterExam.java

@@ -0,0 +1,46 @@
+package com.zhongzheng.modules.user.bo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author yangdamao
+ * @date 2024年04月18日 14:19
+ */
+@Data
+public class OldCourseChpaterExam implements Serializable {
+
+    /// <summary>
+    /// 章节ID
+    /// </summary>
+    private Integer ChpaterId;
+
+    /// <summary>
+    /// 考试得分
+    /// </summary>
+
+    private BigDecimal ExamScore;
+    /// <summary>
+    /// 审核时间
+    /// </summary>
+
+    private Long AuditTime;
+    /// <summary>
+    /// 考试开始时间
+    /// </summary>
+
+    private Long ExamBeginTime;
+    /// <summary>
+    /// 考试结束时间
+    /// </summary>
+
+    private Long ExamEndTime;
+    /// <summary>
+    /// 考试拍照
+    /// </summary>
+
+    private List<OldUserRecordImage> ImageList;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/OldUserInfo.java

@@ -0,0 +1,186 @@
+package com.zhongzheng.modules.user.bo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author yangdamao
+ * @date 2024年04月18日 14:10
+ */
+@Data
+public class OldUserInfo implements Serializable {
+
+    /// <summary>
+    /// 姓名
+    /// </summary>
+    private String userName;
+    /// <summary>
+    /// 身份证号
+    /// </summary>
+    private String idnum;
+
+    /// <summary>
+    /// 电话
+    /// </summary>
+    private String mobie;
+
+    /// <summary>
+    /// 性别，男 女
+    /// </summary>
+    private String sex;
+    /// <summary>
+    /// 公司名称
+    /// </summary>
+    private String companyName;
+
+    /// <summary>
+    /// 学历
+    /// </summary>
+    private String education;
+
+
+    /// <summary>
+    /// 工作年限
+    /// </summary>
+    private String workYears;
+
+
+    /// <summary>
+    /// 个人相片
+    /// </summary>
+    private String imageSrc;
+
+    /// <summary>
+    /// 身份证正面
+    /// </summary>
+    private String idcardPhotoSrc;
+
+
+    /// <summary>
+    /// 身份证反面
+    /// </summary>
+    private String idcardPhotoSrc2;
+
+
+    /// <summary>
+    /// 5 二建继续教育，6职称继续教育 ，10七大员继续教育，17 七大员考前培训
+    /// </summary>
+    private Integer platformId;
+
+    /// <summary>
+    /// 1继续教育，2考前培训
+    /// </summary>
+    private Integer parentPlatformId;
+
+    /// <summary>
+    /// 业务类型
+    /// </summary>
+    private String businessName;
+
+    /// <summary>
+    /// 岗位
+    /// </summary>
+
+    private String majorName;
+
+
+    /// <summary>
+    /// 毕业学校
+    /// </summary>
+
+    private String school;
+
+    /// <summary>
+    /// 毕业专业
+    /// </summary>
+    private String schoolMajor;
+
+
+    /// <summary>
+    /// 毕业时间
+    /// </summary>
+    private Long graduationTime;
+
+    /// <summary>
+    /// 单位联系人
+    /// </summary>
+    private String contactPerson;
+
+    /// <summary>
+    /// 单位联系电话
+    /// </summary>
+    private String contactMobile;
+
+    /// <summary>
+    /// 学习帐号ID
+    /// </summary>
+    private Integer userCourseCategoryId;
+
+    /// <summary>
+    /// 班级号，二建，七大员 二造
+    /// </summary>
+    private String classNo;
+
+    /// <summary>
+    /// 开通时间
+    /// </summary>
+    private Long openTime;
+
+    /// <summary>
+    /// 课程ID
+    /// </summary>
+    private Integer courseId;
+
+    /// <summary>
+    /// 机构ID
+    /// </summary>
+    private Integer orgId;
+
+    /// <summary>
+    /// 开始时间
+    /// </summary>
+    private Long beginTime;
+
+    /// <summary>
+    /// 完成时间
+    /// </summary>
+    private Long endTime;
+
+    /// <summary>
+    /// 总学时
+    /// </summary>
+    private Integer totalHours;
+
+    /// <summary>
+    /// 已学学时
+    /// </summary>
+    private Integer studyHours;
+
+    /// <summary>
+    /// 审核状态
+    /// </summary>
+    private Integer completeStatus;
+    /// <summary>
+    /// 审核时间
+    /// </summary>
+    private Long auditTime;
+
+    /// <summary>
+    /// 审核人
+    /// </summary>
+
+    private String auditor;
+
+    /// <summary>
+    /// 学员记录
+    /// </summary>
+
+    private List<OldUserStudyData> userStudyData;
+    /// <summary>
+    /// 考试记录
+    /// </summary>
+
+    private List<OldCourseChpaterExam> courseChpaterExam;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/OldUserRecordImage.java

@@ -0,0 +1,46 @@
+package com.zhongzheng.modules.user.bo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author yangdamao
+ * @date 2024年04月18日 14:17
+ */
+@Data
+public class OldUserRecordImage implements Serializable {
+
+    /// <summary>
+    /// 学时帐号ID
+    /// </summary>
+    private Integer userCourseCategoryId;
+    /// <summary>
+    /// 视频ID
+    /// </summary>
+    private Integer videoId;
+    /// <summary>
+    /// 匹配度
+    /// </summary>
+
+    private BigDecimal matchData;
+
+    /// <summary>
+    /// 拍照类型 4视频拍照，5考试拍照
+    /// </summary>
+    private BigDecimal type;
+    /// <summary>
+    /// 章节Id 
+    /// </summary>
+    private Integer chpaterId;
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+
+    private Long createTime;
+    /// <summary>
+    /// 拍照地址
+    /// </summary>
+    private String  imageSrc;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/OldUserStudyData.java

@@ -0,0 +1,62 @@
+package com.zhongzheng.modules.user.bo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author yangdamao
+ * @date 2024年04月18日 14:15
+ */
+@Data
+public class OldUserStudyData implements Serializable {
+
+    /// <summary>
+    /// 记录Id  自增Id 
+    /// </summary>
+    private Integer userStudyRecordId;
+    /// <summary>
+    /// 在线学习时间
+    /// </summary>
+    private Long studyTime;
+    /// <summary>
+    /// 开始时间
+    /// </summary>
+    private Long beginTime;
+    /// <summary>
+    /// 视频完成时间
+    /// </summary>
+
+    private Long endTime;
+
+    /// <summary>
+    /// 是否完成
+    /// </summary>
+    private Integer isEnd;
+
+
+    /// <summary>
+    /// 视频ID
+    /// </summary>
+    private Integer videoId;
+
+
+    /// <summary>
+    /// 章节ID
+    /// </summary>
+    private Integer chpaterId;
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    private Long createTime;
+    /// <summary>
+    /// 学习拍照
+    /// </summary>
+
+    private List<OldUserRecordImage> imageList;
+
+
+}