fix

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

@@ -354,11 +354,7 @@ 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/IUserPeriodService.java

@@ -68,5 +68,5 @@ public interface IUserPeriodService extends IService<UserPeriod> {
 
 	Long todayStudySectionNum(UserPeriodQueryBo bo);
 
-	SyncUserCourseStudyRec syncStudyLogToOld(UserPeriodEditBo bo);
+	boolean syncStudyLogToOld(UserPeriodEditBo bo);
 }

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

@@ -442,17 +442,18 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                 objectLambdaUpdateWrapper.set(ClassGradeUser::getFinishStatus, 1);
             }
         }
-        iClassGradeUserService.update(null, objectLambdaUpdateWrapper);
-        ClassGradeUserQueryBo classGradeUserQueryBo = new ClassGradeUserQueryBo();
-        classGradeUserQueryBo.setUserId(bo.getUserId());
-        classGradeUserQueryBo.setGradeId(bo.getGradeId());
-        classGradeUserQueryBo.setGoodsId(bo.getGoodsId());
-        periodPass(classGradeUserQueryBo);
-        //发送消息
-        bo.setStatus(1);
-        sendPeriodSMS(bo);
-        sendPeriodSevenSMS(bo);
-        syncStudyLogToOld(bo);
+        if(syncStudyLogToOld(bo)){
+            iClassGradeUserService.update(null, objectLambdaUpdateWrapper);
+            ClassGradeUserQueryBo classGradeUserQueryBo = new ClassGradeUserQueryBo();
+            classGradeUserQueryBo.setUserId(bo.getUserId());
+            classGradeUserQueryBo.setGradeId(bo.getGradeId());
+            classGradeUserQueryBo.setGoodsId(bo.getGoodsId());
+            periodPass(classGradeUserQueryBo);
+            //发送消息
+            bo.setStatus(1);
+            sendPeriodSMS(bo);
+            sendPeriodSevenSMS(bo);
+        }
         return true;
     }
 
@@ -517,7 +518,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     }
 
     @Override
-    public SyncUserCourseStudyRec syncStudyLogToOld(UserPeriodEditBo bo) {
+    public boolean syncStudyLogToOld(UserPeriodEditBo bo) {
         //企业ID
         String tenant = ServletUtils.getRequest().getHeader("TenantId");
         SysOldOrg org = sysOldOrgService.list(new LambdaQueryWrapper<SysOldOrg>()
@@ -525,7 +526,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                 .last("limit 1")).stream().findFirst().orElse(null);
         if (org.getShareClass() == 0){
             //有职能的机构学时不推送旧系统
-            return null;
+            return true;
         }
         CourseEducationType educationType = iCourseEducationTypeService.getOne(new LambdaQueryWrapper<CourseEducationType>().eq(CourseEducationType::getStatus, 1).eq(CourseEducationType::getEducationName,"继续教育").last("limit 1"));
         CourseProjectType projectType = iCourseProjectTypeService.getOne(new LambdaQueryWrapper<CourseProjectType>().eq(CourseProjectType::getStatus, 1).eq(CourseProjectType::getEducationId,educationType.getId()).eq(CourseProjectType::getProjectName,"建造师").last("limit 1"));
@@ -540,7 +541,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             CourseBusiness business7 = iCourseBusinessService.getOne(new LambdaQueryWrapper<CourseBusiness>().eq(CourseBusiness::getStatus, 1).eq(CourseBusiness::getId,goodsVo.getBusinessId()).last("limit 1"));
             if(Validator.isEmpty(business7)||(Validator.isNotEmpty(business7)&&!"七大员".equals(business7.getBusinessName()))){
                 if(!"继续教育二级造价师".equals(fullName)){
-                    return null;
+                    return true;
                 }
             }
             if(Validator.isNotEmpty(business7)&&"七大员".equals(business7.getBusinessName())){
@@ -576,10 +577,14 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         studyRec.setClassNo(classGrade.getOfficialName());
         studyRec.setOrderGoodsId(orderGoods.getOrderGoodsId());
         Long bmrq = 0L;
-        if(classGrade.getClassStartTime().longValue()<orderGoods.getCreateTime().longValue()){
-            bmrq = orderGoods.getCreateTime();
+        if(Validator.isNotEmpty(classGrade.getClassStartTime())){
+            if(classGrade.getClassStartTime().longValue()<orderGoods.getCreateTime().longValue()){
+                bmrq = orderGoods.getCreateTime();
+            }else{
+                bmrq = classGrade.getClassStartTime();
+            }
         }else{
-            bmrq = classGrade.getClassStartTime();
+            bmrq = orderGoods.getCreateTime();
         }
         studyRec.setToRegCenterTime(DateUtils.timestampToDate(bmrq));
         Long studyStartTime = null;
@@ -673,7 +678,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                                     }
                                     syncUserStudyRec.setImgList(ImgList);
                                     //有重修
-                                    if(userPeriodStatusVos2.size()>2){
+                                    if(userPeriodStatusVos2.size()>1){
                                         List<SyncUserStudyRec> ReStudyList = new ArrayList<>();
                                         for(int i=0;i<(userPeriodStatusVos2.size()-1);i++){
                                             SyncUserStudyRec rec = new SyncUserStudyRec();
@@ -693,10 +698,10 @@ 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);
                                                 reImgList.add(imageRc);
-                                                rec.setCreateTime(DateUtils.timestampToDateFormat(videoPhoto2.get(0).getCreateTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
+                                                rec.setCreateTime(DateUtils.timestampToDateFormat(reVideoPhoto2.get(0).getCreateTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
 
                                             }
-                                            rec.setImgList(ImgList);
+                                            rec.setImgList(reImgList);
                                             ReStudyList.add(rec);
                                         }
                                         syncUserStudyRec.setReStudyList(ReStudyList);
@@ -839,7 +844,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             throw new CustomException("同步请求错误"+e.getMessage());
         }
         iClassGradeUserService.update(null, objectLambdaUpdateWrapper);
-        return studyRec;
+        return true;
     }
 
     /**