fix

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

@@ -354,7 +354,11 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             }
 
             //商品同步新机构时间
+<<<<<<< HEAD
             /*List<SysGoodsCopyRecord> copyRecords = iSysGoodsCopyRecordService.getGoodsCopy(goods.getGoodsId(),GoodsCopyEnum.GOODS.getType());
+=======
+           /* List<SysGoodsCopyRecord> copyRecords = iSysGoodsCopyRecordService.getGoodsCopy(goods.getGoodsId(),GoodsCopyEnum.GOODS.getType());
+>>>>>>> dev
             if (CollectionUtils.isNotEmpty(copyRecords)){
                 Map<Long, List<SysGoodsCopyRecord>> map = copyRecords.stream().collect(Collectors.groupingBy(SysGoodsCopyRecord::getTenantId));
                 List<String> msg = new ArrayList<>();

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

@@ -575,6 +575,16 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         studyRec.setCourseBuyTime(DateUtils.timestampToDateFormat(orderGoods.getCreateTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
         studyRec.setClassNo(classGrade.getOfficialName());
         studyRec.setOrderGoodsId(orderGoods.getOrderGoodsId());
+        Long bmrq = 0L;
+        if(classGrade.getClassStartTime().longValue()<orderGoods.getCreateTime().longValue()){
+            bmrq = orderGoods.getCreateTime();
+        }else{
+            bmrq = classGrade.getClassStartTime();
+        }
+        studyRec.setToRegCenterTime(DateUtils.timestampToDate(bmrq));
+        Long studyStartTime = null;
+        Long studyEndTime = null;
+
         List<SyncUserChapterList> ChapterList = new ArrayList<>();
         GoodsCourseQueryBo goodsCourseQueryBo = new GoodsCourseQueryBo();
         goodsCourseQueryBo.setGoodsId(goodsVo.getGoodsId());
@@ -585,11 +595,12 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                 CourseMenuQueryBo menuQueryBo = new CourseMenuQueryBo();
                 menuQueryBo.setCourseId(courseVo.getCourseId());
                 List<CourseMenuVo> courseMenuVoList = iCourseMenuService.selectList(menuQueryBo);
-                courseMenuVoList.forEach(courseMenuVo -> {
+                for(CourseMenuVo courseMenuVo:courseMenuVoList){
                     if(courseMenuVo.getType()==1){
                         //获取章信息
                         List<CourseModuleChapterVo> courseModuleChapterVoList = iCourseModuleChapterService.getListById(courseMenuVo.getMenuId());
-                        courseModuleChapterVoList.forEach(courseModuleChapterVo -> {
+
+                        for(CourseModuleChapterVo courseModuleChapterVo:courseModuleChapterVoList){
                             SyncUserChapterList syncUserChapterItem = new SyncUserChapterList();
                             syncUserChapterItem.setChapterId(courseModuleChapterVo.getChapterId());
                             syncUserChapterItem.setChapterName(courseModuleChapterVo.getName());
@@ -644,6 +655,9 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                                     List<UserStudyRecordPhoto> videoPhoto2 = userStudyRecordPhotoService.list(lqw);
                                     syncUserStudyRec.setCreateTime(DateUtils.timestampToDateFormat(userPeriodStatusVo.getRecordStartTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
                                     syncUserStudyRec.setEndTime(DateUtils.timestampToDateFormat(userPeriodStatusVo.getRecordEndTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+                                    if(Validator.isEmpty(studyEndTime)||(studyEndTime.longValue()<userPeriodStatusVo.getRecordEndTime().longValue())){
+                                        studyEndTime = userPeriodStatusVo.getRecordEndTime();
+                                    }
                                     syncUserStudyRec.setStudyIP(userPeriodStatusVo.getIp());
                                     List<SyncUserImageRc> ImgList = new ArrayList<>();
                                     for (UserStudyRecordPhoto videoPhoto : videoPhoto2) {
@@ -652,18 +666,52 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                                         imageRc.setCreateTime(DateUtils.timestampToDateFormat(videoPhoto.getCreateTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
                                         imageRc.setMatchData(Validator.isNotEmpty(videoPhoto.getSimilarity())?videoPhoto.getSimilarity().toString():null);
                                         ImgList.add(imageRc);
+                                        syncUserStudyRec.setCreateTime(DateUtils.timestampToDateFormat(videoPhoto2.get(0).getCreateTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+                                        if(Validator.isEmpty(studyStartTime)||(studyStartTime.longValue()>videoPhoto2.get(0).getCreateTime().longValue())){
+                                            studyStartTime = videoPhoto2.get(0).getCreateTime();
+                                        }
                                     }
                                     syncUserStudyRec.setImgList(ImgList);
+                                    //有重修
+                                    if(userPeriodStatusVos2.size()>2){
+                                        List<SyncUserStudyRec> ReStudyList = new ArrayList<>();
+                                        for(int i=0;i<(userPeriodStatusVos2.size()-1);i++){
+                                            SyncUserStudyRec rec = new SyncUserStudyRec();
+                                            UserPeriodStatusVo reVo = userPeriodStatusVos2.get(i);
+                                            rec.setVideoId(classPeriodSectionVo.getId());
+                                            rec.setVideoKey(classPeriodSectionVo.getRecordingUrl());
+                                            rec.setCreateTime(DateUtils.timestampToDateFormat(reVo.getRecordStartTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+                                            rec.setEndTime(DateUtils.timestampToDateFormat(reVo.getRecordEndTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+                                            rec.setStudyIP(reVo.getIp());
+                                            LambdaQueryWrapper<UserStudyRecordPhoto> relqw = Wrappers.lambdaQuery();
+                                            relqw.eq(UserStudyRecordPhoto::getPeriodId, reVo.getId());
+                                            List<UserStudyRecordPhoto> reVideoPhoto2 = userStudyRecordPhotoService.list(relqw);
+                                            List<SyncUserImageRc> reImgList = new ArrayList<>();
+                                            for (UserStudyRecordPhoto videoPhoto : reVideoPhoto2) {
+                                                SyncUserImageRc imageRc = new SyncUserImageRc();
+                                                imageRc.setImgSrc(ossHost+"/"+videoPhoto.getPhoto());
+                                                imageRc.setCreateTime(DateUtils.timestampToDateFormat(videoPhoto.getCreateTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+                                                imageRc.setMatchData(Validator.isNotEmpty(videoPhoto.getSimilarity())?videoPhoto.getSimilarity().toString():null);
+                                                reImgList.add(imageRc);
+                                                rec.setCreateTime(DateUtils.timestampToDateFormat(videoPhoto2.get(0).getCreateTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+
+                                            }
+                                            rec.setImgList(ImgList);
+                                            ReStudyList.add(rec);
+                                        }
+                                        syncUserStudyRec.setReStudyList(ReStudyList);
+                                    }
                                 }
                                 RecList.add(syncUserStudyRec);
                             }
                             syncUserChapterItem.setRecList(RecList);
                             ChapterList.add(syncUserChapterItem);
-                        });
-
+                        };
                     }
-                });
+                };
             }
+            studyRec.setBeginTime(DateUtils.timestampToDateFormat(studyStartTime));
+            studyRec.setEndTime(DateUtils.timestampToDateFormat(studyEndTime));
             studyRec.setChapterList(ChapterList);
         }
         //七大员

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

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.grade.vo;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.user.vo.UserUpdateVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -148,7 +149,7 @@ public class ClassStudentExportVo implements Serializable {
 		vo.setPeriodStatusStr(studentVo.getPeriodStatus() == 0 ? "未通过":studentVo.getPeriodStatus() == 1?"通过":"待审核");
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		if (ObjectUtil.isNotNull(studentVo.getServiceStartTime()) && ObjectUtil.isNotNull(studentVo.getServiceEndTime())){
-			vo.setServiceDateStr(sdf.format(new Date(studentVo.getServiceStartTime()))+"至"+sdf.format(new Date(studentVo.getServiceEndTime())));
+			vo.setServiceDateStr(DateUtils.timestampToDate(studentVo.getServiceStartTime())+"至"+DateUtils.timestampToDate(studentVo.getServiceEndTime()));
 		}
 		if (ObjectUtil.isNotNull(studentVo.getClassStartTime()) && ObjectUtil.isNotNull(studentVo.getClassEndTime())){
 			vo.setClassDateStr(sdf.format(new Date(studentVo.getClassStartTime()))+"至"+sdf.format(new Date(studentVo.getClassEndTime())));

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

@@ -28,6 +28,12 @@ public class SyncUserCourseStudyRec {
 
     private String CourseBuyTime;
 
+    private String ToRegCenterTime;
+
+    private String BeginTime;
+
+    private String EndTime;
+
     private String ClassNo;
 
     private Long orderGoodsId;
@@ -40,6 +46,7 @@ public class SyncUserCourseStudyRec {
 
     private String TenantId;
 
+
     private List<SyncUserChapterList> ChapterList;
 
 }

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

@@ -18,5 +18,7 @@ public class SyncUserStudyRec {
 
     private String StudyIP;
 
+    private List<SyncUserStudyRec> ReStudyList;
+
     private List<SyncUserImageRc> ImgList;
 }

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

@@ -327,6 +327,7 @@ public class SysWebServiceImpl implements ISysWebService {
         jsonObject24.put("hostH5","https://"+bo.getHostH5());
         jsonObject24.put("hostPc","https://"+bo.getHostPc());
         jsonObject24.put("smallQrCodeShow",false);
+        jsonObject24.put("mobileImage","");
         config24.setConfigKey("home.mobile");
         config24.setConfigValue(jsonObject24.toJSONString());
         config24.setConfigType("N");