fix

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

@@ -1733,6 +1733,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             exportVo.setStatus(vo.getReportStatus());
             exportVo.setScore(vo.getPerformance());
             exportVo.setFromPlat(vo.getFromPlat());
+            exportVo.setScore(vo.getPerformance());
+            exportVo.setRightRate();
             studyList.add(exportVo);
         }
         userPeriodExportVo.setRecordList(studyList);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderQueryBo.java

@@ -172,4 +172,7 @@ public class TopOldOrderQueryBo extends BaseEntity {
 
 	@ApiModelProperty("学员审核状态")
 	private Integer studentCheckStatus;
+
+	@ApiModelProperty("重写审核状态：1待审核 2审核中")
+	private Integer reCheckStatus;
 }

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

@@ -6687,6 +6687,21 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if (Validator.isEmpty(bo.getTotalType())) {
             throw new CustomException("参数缺少");
         }
+        if(Validator.isNotEmpty(bo.getPayStatus())&&bo.getPayStatus().size()>0){
+            List<Integer> payStatus = new ArrayList<>();
+            for(Integer status : bo.getPayStatus()){
+                if(status==2){
+                    bo.setReCheckStatus(1);
+                }
+                else if(status==5){
+                    bo.setReCheckStatus(2);
+                }
+                else{
+                    payStatus.add(status);
+                }
+            }
+            bo.setPayStatus(payStatus);
+        }
         if(Validator.isNotEmpty(bo.getOverPayDay())&&bo.getOverPayDay()>0){
             bo.setNotPayStatus(1);
             if(bo.getOverPayDay()==1){

zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideLogMapper.xml

@@ -264,6 +264,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="tenantId != null and tenantId != ''">
             AND dl.tenant_id = #{tenantId}
         </if>
+        <if test="reCheckStatus == 1">
+            AND (SELECT
+            count(*)
+            FROM
+            top_divide_log bdl
+            LEFT JOIN top_divide_order btdo ON bdl.id = btdo.divide_log_id
+            LEFT JOIN top_old_order_check_log bcl ON btdo.order_sn = bcl.order_sn
+            WHERE
+            bcl.check_from = 2
+            AND bcl.check_status = 0
+            AND bcl.check_sign = 1
+            <if test="roleIds != null and roleIds.size()!=0">
+                AND bcl.role_id in
+                <foreach collection="roleIds" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            AND bdl.id = dl.id)>0
+        </if>
+        <if test="reCheckStatus == 2">
+            AND (SELECT
+            count(*)
+            FROM
+            top_divide_log bdl
+            LEFT JOIN top_divide_order btdo ON bdl.id = btdo.divide_log_id
+            LEFT JOIN top_old_order_check_log bcl ON btdo.order_sn = bcl.order_sn
+            WHERE
+            bcl.check_from = 2
+            AND bcl.check_status = 0
+            AND bcl.check_sign = 1
+            <if test="roleIds != null and roleIds.size()!=0">
+                AND bcl.role_id not in
+                <foreach collection="roleIds" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            AND bdl.id = dl.id)>0
+        </if>
         <if test="payStatus != null and payStatus.size()!=0">
             AND dl.pay_status in
             <foreach collection="payStatus" item="item" index="index" open="(" close=")" separator=",">