fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassStudentController.java

@@ -194,8 +194,8 @@ public class ClassStudentController extends BaseController {
     @ApiOperation("更新用户学时状态")
     @PreAuthorize("@ss.hasPermi('app:user:edit')")
     @PostMapping("/updateUserPeriodStatus")
-    public AjaxResult<Void> updateUserPeriodStatus(@RequestBody ClassGradeUserQueryBo  bo) {
-        return toAjax(iClassGradeUserService.updateUserPeriodStatus(bo));
+    public AjaxResult updateUserPeriodStatus(@RequestBody ClassGradeUserQueryBo  bo) {
+        return AjaxResult.success(iClassGradeUserService.updateUserPeriodStatus(bo));
     }
 
     /**

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

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password:  zhongzheng2021
             # 从库数据源

zhongzheng-api/src/main/java/com/zhongzheng/controller/course/CourseController.java

@@ -84,7 +84,6 @@ public class CourseController extends BaseController {
     @ApiOperation("查询用户商品重修状态")
     @GetMapping("/goodsRebuildStatus")
     public AjaxResult<Long> goodsRebuildStatus(CourseQueryBo bo) {
-        startPage();
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         return AjaxResult.success(iCourseService.goodsRebuildStatus(bo));

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

@@ -296,13 +296,14 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         ClassGradeUserQueryBo queryBo = new ClassGradeUserQueryBo();
         queryBo.setGradeId(bo.getGradeId());
         queryBo.setGoodsId(bo.getGoodsId());
+        queryBo.setUserId(bo.getUserId());
         ClassPeriodStudentVo classPeriodStudentVo = baseMapper.userPeriodStatus(queryBo);
         Long secLong = 0L;
         Long studyLong = 0L;
 
         SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
         subjectStudyRecordQueryBo.setGoodsId(classPeriodStudentVo.getGoodsId());
-        subjectStudyRecordQueryBo.setUserId(classPeriodStudentVo.getUserId());
+        subjectStudyRecordQueryBo.setUserId(bo.getUserId());
         subjectStudyRecordQueryBo.setGradeId(bo.getGradeId());
         List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
         for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
@@ -320,33 +321,55 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         //总的审核状态按照策划规则
         ClassGradeUserQueryBo classGradeUserQueryBo = new ClassGradeUserQueryBo();
         classGradeUserQueryBo.setGradeId(bo.getGradeId());
-        classGradeUserQueryBo.setUserId(classPeriodStudentVo.getUserId());
+        classGradeUserQueryBo.setUserId(bo.getUserId());
         classGradeUserQueryBo.setGoodsId(classPeriodStudentVo.getGoodsId());
+        System.out.println(classGradeUserQueryBo);
         List<ClassPeriodUserVo> classPeriodUserVos1 = baseMapper.listPeriod(classGradeUserQueryBo);
+        System.out.println(classPeriodUserVos1);
+        System.out.println(classPeriodUserVos1.size()+"我的数量");
         ClassPeriodUserVo classPeriodUserVos = classPeriodUserVos1.get(0);
         classPeriodUserVos.setPending(classPeriodStudentVo.getSecAllNum()-classPeriodUserVos.getPass()-classPeriodUserVos.getCheat());
         classPeriodUserVos.setExamPending(classPeriodUserVos.getExamNum()-classPeriodUserVos.getExamPass()-classPeriodUserVos.getExamCheat());
         //當前班級學員審核狀態 -1不可审核 0待審  1未通过 2通过
         Integer gradePeriodStatus = 0; //班级里的审核状态字段，保持一致 0 未通过 1通过 2待审核 -1 不可审核
+        System.out.println(classPeriodStudentVo.getSecAllNum());
+        System.out.println(classPeriodStudentVo.getStuAllNum());
+        System.out.println(classPeriodUserVos.getExamPending());
+        System.out.println(classPeriodUserVos.getPending());
+        System.out.println(classPeriodUserVos.getCheat());
+        System.out.println(classPeriodUserVos.getExamCheat());
+        System.out.println(classPeriodStudentVo.getExamNum());
+        System.out.println(classPeriodStudentVo.getRecordNum());
         if(Validator.isEmpty(classPeriodStudentVo.getSecAllNum())||classPeriodStudentVo.getSecAllNum()==0){
             //空课程
             classPeriodStudentVo.setAllStatus(-1);
             gradePeriodStatus = -1;
+            System.out.println("CC");
         }else{
+            if(classPeriodStudentVo.getStuAllNum().equals(classPeriodStudentVo.getSecAllNum())){
+                System.out.println("CCS");
+            }
+            if(classPeriodStudentVo.getExamNum().equals(classPeriodStudentVo.getRecordNum())){
+                System.out.println("CCSVVV");
+            }
             if (classPeriodStudentVo.getStuAllNum().equals(classPeriodStudentVo.getSecAllNum()) && classPeriodStudentVo.getExamNum().equals(classPeriodStudentVo.getRecordNum())){
                 if (classPeriodUserVos.getPending() != 0 || classPeriodUserVos.getExamPending() != 0){
                     classPeriodStudentVo.setAllStatus(0);
                     gradePeriodStatus = 2;
+                    System.out.println("CCD");
                 }else if (classPeriodUserVos.getCheat() != 0 || classPeriodUserVos.getExamCheat() != 0){
                     classPeriodStudentVo.setAllStatus(1);
                     gradePeriodStatus = 0;
+                    System.out.println("CCDV");
                 }else {
                     classPeriodStudentVo.setAllStatus(2);
                     gradePeriodStatus = 1;
+                    System.out.println("CCDVV");
                 }
             }else {
                 classPeriodStudentVo.setAllStatus(-1);
                 gradePeriodStatus = -1;
+                System.out.println("SSS");
             }
         }
         LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
@@ -371,6 +394,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 }
             }
         }
+
+        System.out.println(gradePeriodStatus);
+        System.out.println(classPeriodStudentVo.getAllStatus());
         classGradeUser1.setUpdateTime(DateUtils.getNowTime());
         iClassGradeUserService.update(classGradeUser1, classGradeUser);
         return gradePeriodStatus;