소스 검색

fix 学习账号标记

tanzh 3 년 전
부모
커밋
192a5b608c

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeQueryBo.java

@@ -132,7 +132,7 @@ public class ClassGradeQueryBo extends BaseEntity {
 	/**
 	 * 有接口标识(0无配置 1有接口 2无接口)
 	 */
-	@ApiModelProperty("有接口标识")
+	@ApiModelProperty("有接口标识(0无配置 1有接口 2无接口)")
 	private Integer hasInterface;
 
 	@ApiModelProperty("商品id数组")

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

@@ -1656,6 +1656,14 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         int noFinishNum = 0;
         if (!CollectionUtils.isEmpty(set)) {
             for (Long businessId : set) {
+                notConfiguredNum = 0;
+                interfaceNum = 0;
+                noInterfaceNum = 0;
+                openNum = 0;
+                noOpenNum = 0;
+                failNum = 0;
+                finishNum = 0;
+                noFinishNum = 0;
                 StudyAccountStatusVo vo = new StudyAccountStatusVo();
                 List<ClassGradeVo> classGradeList = iClassGradeService.selectByBusinessId(businessId);
                 vo.setBusinessId(businessId);
@@ -1680,14 +1688,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     vo.setEducationTypeId(courseEducationType.getId());
                 }
                 for (ClassGradeVo classGrade : classGradeList) {
-                    notConfiguredNum = 0;
-                    interfaceNum = 0;
-                    noInterfaceNum = 0;
-                    openNum = 0;
-                    noOpenNum = 0;
-                    failNum = 0;
-                    finishNum = 0;
-                    noFinishNum = 0;
                     LambdaQueryWrapper<ClassGradeUser> lq = Wrappers.lambdaQuery();
                     lq.eq(ClassGradeUser::getGradeId, classGrade.getGradeId());
                     List<ClassGradeUser> classGradeUsers = iClassGradeUserService.list(lq);

+ 6 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/impl/MockApplyServiceImpl.java

@@ -192,6 +192,12 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(MockApplyEditBo bo) {
         MockApply update = BeanUtil.toBean(bo, MockApply.class);
+        LambdaQueryWrapper<UserMockSubscribe> lqw = Wrappers.lambdaQuery();
+        lqw.eq(UserMockSubscribe::getApplyId, bo.getApplyId());
+        List<UserMockSubscribe> userMockSubscribeList = iUserMockSubscribeService.list(lqw);
+        if (userMockSubscribeList != null && userMockSubscribeList.size() > 0) {
+            throw new CustomException("已有预约数据,不允许修改");
+        }
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         this.updateById(update);