add 二建人数限制

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -183,9 +183,9 @@ public class CommonController
     public AjaxResult<Void> testList()
     {
         UserPeriodEditBo queryBo = new UserPeriodEditBo();
-        queryBo.setGoodsId(975L);
-        queryBo.setGradeId(862L);
-        queryBo.setUserId(114L);
+        queryBo.setGoodsId(1059L);
+        queryBo.setGradeId(941L);
+        queryBo.setUserId(257L);
         iUserPeriodService.syncStudyLogToOld(queryBo);
         return AjaxResult.success();
     }

zhongzheng-admin/src/main/resources/application.yml

@@ -301,3 +301,4 @@ aliyun:
     signCommitmentRemind: SMS_250390195  #签署承诺书提醒
     todayExamNotRecordWarn: SMS_257713140  #学员打卡提醒（每日一练）
     todayExamNotRecordTeachWarn: SMS_257702971  #学员打卡教务提醒（每日一练）
+    noFinishExamNoteCode: SMS_262460267  #未做完试卷通知

zhongzheng-api/src/main/resources/application.yml

@@ -296,3 +296,4 @@ aliyun:
     signCommitmentRemind: SMS_250390195  #签署承诺书提醒
     todayExamNotRecordWarn: SMS_257713140  #学员打卡提醒（每日一练）
     todayExamNotRecordTeachWarn: SMS_257702971  #学员打卡教务提醒（每日一练）
+    noFinishExamNoteCode: SMS_262460267  #未做完试卷通知

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

@@ -508,25 +508,29 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         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"));
         CourseBusiness business = iCourseBusinessService.getOne(new LambdaQueryWrapper<CourseBusiness>().eq(CourseBusiness::getStatus, 1).eq(CourseBusiness::getProjectId,projectType.getId()).eq(CourseBusiness::getBusinessName,"二级").last("limit 1"));
-        CourseBusiness business7 = iCourseBusinessService.getOne(new LambdaQueryWrapper<CourseBusiness>().eq(CourseBusiness::getStatus, 1).eq(CourseBusiness::getBusinessName,"七大员新考").last("limit 1"));
+        boolean hasSeven = false;
         GoodsVo goodsVo = iGoodsService.selectDetail(bo.getGoodsId());
-
+        SyncUserCourseStudyRec studyRec = new SyncUserCourseStudyRec();
         if(goodsVo.getBusinessId().longValue()!=business.getId().longValue()){
-            if(Validator.isEmpty(business7)||(Validator.isNotEmpty(business7)&&goodsVo.getBusinessId().longValue()!=business7.getId().longValue())){
+            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()))){
+
                 return null;
             }
+            if(Validator.isNotEmpty(business7)&&"七大员".equals(business7.getBusinessName())){
+                hasSeven = true;
+                studyRec.setCourseType(17);
+            }
         }
         UserVo userVo = iUserService.queryById(bo.getUserId());
         ClassGradeUser gradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>().eq(ClassGradeUser::getUserId,bo.getUserId()).eq(ClassGradeUser::getGradeId,bo.getGradeId()).last("limit 1"));
         OrderGoods orderGoods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderGoodsId,gradeUser.getOrderGoodsId()).last("limit 1"));
         ClassGrade classGrade = iClassGradeService.getOne(new LambdaQueryWrapper<ClassGrade>().eq(ClassGrade::getGradeId,gradeUser.getGradeId()).last("limit 1"));
-        SyncUserCourseStudyRec studyRec = new SyncUserCourseStudyRec();
+
         if(goodsVo.getBusinessId().longValue()==business.getId().longValue()){
             studyRec.setCourseType(5);
         }
-        if(Validator.isNotEmpty(business7)&&goodsVo.getBusinessId().longValue()==business7.getId().longValue()){
-            studyRec.setCourseType(17);
-        }
+
         String TenantId = ServletUtils.getRequest().getHeader("TenantId");
         studyRec.setTenantId(TenantId);
         studyRec.setCourseName(goodsVo.getGoodsName());
@@ -634,7 +638,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             studyRec.setChapterList(ChapterList);
         }
         //七大员
-        if(Validator.isNotEmpty(business7)&&goodsVo.getBusinessId().longValue()==business7.getId().longValue()){
+        if(hasSeven){
             for(CourseVo courseVo : courseVoList){
                 CourseMenuQueryBo menuQueryBo = new CourseMenuQueryBo();
                 menuQueryBo.setCourseId(courseVo.getCourseId());
@@ -726,6 +730,8 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             studyRec.setChapterList(ChapterList);
         }
         //学习记录推送到旧系统
+        System.out.println(123);
+        System.out.println(studyRec);
         Map<String, String> params = new HashMap<>();
         Long nowTime = DateUtils.getNowTime();
         String sign = ToolsUtils.EncoderByMd5(nowTime.toString()+"pubilc2022");

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

@@ -335,6 +335,9 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
     @Value("${aliyun.sms.todayExamNotRecordTeachWarn}")
     private String todayExamNotRecordTeachWarn;
 
+    @Value("${aliyun.sms.noFinishExamNoteCode}")
+    private String noFinishExamNoteCode;
+
     @Autowired
     private RedisCache redisCache;
 
@@ -2862,10 +2865,10 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
     public void noFinishExamToStudentThree(UserQueryBo bo) {
         //3天要结束
         Calendar cal1 = new GregorianCalendar();
-        cal1.add(Calendar.DATE, -4);
+        cal1.add(Calendar.DATE, 3);
         Long startTime = cal1.getTimeInMillis() / 1000;
         Calendar cal2 = new GregorianCalendar();
-        cal2.add(Calendar.DATE, -3);
+        cal2.add(Calendar.DATE, 4);
         Long endTime = cal2.getTimeInMillis() / 1000;
         ClassGradeQueryBo queryBo = new ClassGradeQueryBo();
         queryBo.setStartTime(startTime);
@@ -2875,6 +2878,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         for(ClassGradeVo gradeVo : gradeVoList){
             List<ClassGradeVo> userList = iCourseService.gradeIdUserSelect(gradeVo.getGoodsId(),gradeVo.getGradeId());
             for(ClassGradeVo user : userList){
+                System.out.println(user);
                 if(user.getExamNum().longValue()!=user.getRecordNum().longValue()){
                     Long diffV = user.getExamNum() - user.getRecordNum();
                     SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
@@ -2888,9 +2892,13 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                         secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
                         studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
                     }
+                    System.out.println(secLong);
+                    System.out.println(studyLong);
                     if(secLong.longValue()==studyLong.longValue()){
                         GoodsVo goods = iGoodsService.queryById(gradeVo.getGoodsId());
+                        System.out.println(goods);
                         if (!CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness()) && !CollectionUtils.isEmpty(informRemindVo.getInformRemindBusiness().stream().filter(informRemindBusinessVo -> informRemindBusinessVo.getBusinessId().equals(goods.getBusinessId())).collect(Collectors.toList()))) {
+                            System.out.println(232323);
                             UserVo userVo = iUserService.queryById(user.getUserId());
                             if (informRemindVo.getWayStatus().equals(1))  {
                                 InformUserAddBo informUserAddBo = new InformUserAddBo();
@@ -2923,11 +2931,11 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                                 informUserAddBo.setGoodsId(gradeVo.getGoodsId());
                                 informUserAddBo.setText("您学习的《"+goods.getGoodsName()+"》课程，还有"+diffV+"套试卷没有考试完成，请尽快完成考试！");
                                 Map<String, Object> param = new HashMap<>();
-                                param.put("goodsName", goods.getGoodsName());
-                                param.put("day", "30");
-                               /* if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), buyNotStudyStudentRemind))) {
+                                param.put("goods", goods.getGoodsName());
+                                param.put("num", diffV);
+                                if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), noFinishExamNoteCode))) {
                                     iInformUserService.insertByAddBo(informUserAddBo);
-                                }*/
+                                }
                             }
                             if (informRemindVo.getGzhTpStatus().equals(1)) {
                                 InformUserAddBo informUserAddBo = new InformUserAddBo();
@@ -2965,10 +2973,10 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
     public void noFinishExamToStudentFive(UserQueryBo bo) {
         //5天要结束
         Calendar cal1 = new GregorianCalendar();
-        cal1.add(Calendar.DATE, -6);
+        cal1.add(Calendar.DATE, 5);
         Long startTime = cal1.getTimeInMillis() / 1000;
         Calendar cal2 = new GregorianCalendar();
-        cal2.add(Calendar.DATE, -5);
+        cal2.add(Calendar.DATE, 6);
         Long endTime = cal2.getTimeInMillis() / 1000;
         ClassGradeQueryBo queryBo = new ClassGradeQueryBo();
         queryBo.setStartTime(startTime);
@@ -3026,11 +3034,11 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                                 informUserAddBo.setGoodsId(gradeVo.getGoodsId());
                                 informUserAddBo.setText("您学习的《"+goods.getGoodsName()+"》课程，还有"+diffV+"套试卷没有考试完成，请尽快完成考试！");
                                 Map<String, Object> param = new HashMap<>();
-                                param.put("goodsName", goods.getGoodsName());
-                                param.put("day", "30");
-                               /* if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), buyNotStudyStudentRemind))) {
+                                param.put("goods", goods.getGoodsName());
+                                param.put("num", diffV);
+                                if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), noFinishExamNoteCode))) {
                                     iInformUserService.insertByAddBo(informUserAddBo);
-                                }*/
+                                }
                             }
                             if (informRemindVo.getGzhTpStatus().equals(1)) {
                                 InformUserAddBo informUserAddBo = new InformUserAddBo();
@@ -3068,10 +3076,10 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
     public void noFinishExamToStudentSeven(UserQueryBo bo) {
         //7天要结束
         Calendar cal1 = new GregorianCalendar();
-        cal1.add(Calendar.DATE, -8);
+        cal1.add(Calendar.DATE, 7);
         Long startTime = cal1.getTimeInMillis() / 1000;
         Calendar cal2 = new GregorianCalendar();
-        cal2.add(Calendar.DATE, -7);
+        cal2.add(Calendar.DATE, 8);
         Long endTime = cal2.getTimeInMillis() / 1000;
         ClassGradeQueryBo queryBo = new ClassGradeQueryBo();
         queryBo.setStartTime(startTime);
@@ -3129,11 +3137,11 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                                 informUserAddBo.setGoodsId(gradeVo.getGoodsId());
                                 informUserAddBo.setText("您学习的《"+goods.getGoodsName()+"》课程，还有"+diffV+"套试卷没有考试完成，请尽快完成考试！");
                                 Map<String, Object> param = new HashMap<>();
-                                param.put("goodsName", goods.getGoodsName());
-                                param.put("day", "30");
-                               /* if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), buyNotStudyStudentRemind))) {
+                                param.put("goods", goods.getGoodsName());
+                                param.put("num", diffV);
+                                if (Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), noFinishExamNoteCode))) {
                                     iInformUserService.insertByAddBo(informUserAddBo);
-                                }*/
+                                }
                             }
                             if (informRemindVo.getGzhTpStatus().equals(1)) {
                                 InformUserAddBo informUserAddBo = new InformUserAddBo();