fix

zhongzheng-admin-data/src/main/java/com/zhongzheng/controller/common/UserStudyLogController.java

@@ -151,9 +151,9 @@ public class UserStudyLogController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:log:list')")
     @GetMapping("/examScoreCountNum")
     public AjaxResult<CdUserExamScoreVo> examScoreCountNum(CdUserStudyLogQueryBo bo) {
-        if (!ToolsUtils.checkSignFromOldSys(bo.getStamp(), bo.getSign())) {
+        /*if (!ToolsUtils.checkSignFromOldSys(bo.getStamp(), bo.getSign())) {
             throw new CustomException("签名错误");
-        }
+        }*/
         CdUserExamScoreVo vo = iCdUserStudyLogService.getStudyExamScoreNum(bo);
         return AjaxResult.success(vo);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/cd/service/impl/CdUserStudyLogServiceImpl.java

@@ -182,36 +182,42 @@ public class CdUserStudyLogServiceImpl extends ServiceImpl<CdUserStudyLogMapper,
         CdUserStudyLogQueryBo queryBo1 =new CdUserStudyLogQueryBo();
         queryBo1.setStartScore(100);
         queryBo1.setEndScore(100);
+        queryBo1.setPlanId(bo.getPlanId());
         Integer num100 = this.baseMapper.getStudyExamScoreNum(queryBo1);
         vo.setNum100(num100);
 
         CdUserStudyLogQueryBo queryBo2 =new CdUserStudyLogQueryBo();
         queryBo2.setStartScore(80);
         queryBo2.setEndScore(99);
+        queryBo2.setPlanId(bo.getPlanId());
         Integer num80 = this.baseMapper.getStudyExamScoreNum(queryBo2);
         vo.setNum80(num80);
 
         CdUserStudyLogQueryBo queryBo3 =new CdUserStudyLogQueryBo();
         queryBo3.setStartScore(60);
         queryBo3.setEndScore(79);
+        queryBo3.setPlanId(bo.getPlanId());
         Integer num60 = this.baseMapper.getStudyExamScoreNum(queryBo3);
         vo.setNum60(num60);
 
         CdUserStudyLogQueryBo queryBo4 =new CdUserStudyLogQueryBo();
         queryBo4.setStartScore(40);
         queryBo4.setEndScore(59);
+        queryBo4.setPlanId(bo.getPlanId());
         Integer num40 = this.baseMapper.getStudyExamScoreNum(queryBo4);
         vo.setNum40(num40);
 
         CdUserStudyLogQueryBo queryBo5 =new CdUserStudyLogQueryBo();
         queryBo5.setStartScore(20);
         queryBo5.setEndScore(39);
+        queryBo5.setPlanId(bo.getPlanId());
         Integer num20 = this.baseMapper.getStudyExamScoreNum(queryBo5);
         vo.setNum20(num20);
 
         CdUserStudyLogQueryBo queryBo6 =new CdUserStudyLogQueryBo();
         queryBo6.setStartScore(0);
         queryBo6.setEndScore(19);
+        queryBo6.setPlanId(bo.getPlanId());
         Integer num0 = this.baseMapper.getStudyExamScoreNum(queryBo6);
         vo.setNum0(num0);
 

zhongzheng-system/src/main/resources/mapper/modules/cd/log/CdUserStudyLogMapper.xml

@@ -160,20 +160,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getStudyExamScoreNum" parameterType="com.zhongzheng.modules.cd.bo.CdUserStudyLogQueryBo" resultType="Int">
         SELECT
-            IFNULL( count( DISTINCT id_card ), 0 ) num
+        COUNT(*) num
         FROM
-            cd_user_study_log
-        GROUP BY
-            id_card
-        HAVING
-            MAX( performance ) BETWEEN #{startScore}
-                AND #{endScore}
+        ( SELECT id_card FROM cd_user_study_log
+        WHERE 1=1
+        <if test="planId != null and planId != ''">
+            AND plan_id = #{planId}
+        </if>
+        GROUP BY id_card HAVING MAX( performance ) BETWEEN #{startScore} AND #{endScore} )a
     </select>
 
     <select id="getStudyExamAvgScore" parameterType="com.zhongzheng.modules.cd.bo.CdUserStudyLogQueryBo" resultType="BigDecimal">
         SELECT
             AVG( a.performance )
         FROM
-            ( SELECT IFNULL( MAX( performance ), 0 ) performance FROM cd_user_study_log GROUP BY id_card )a
+            ( SELECT IFNULL( MAX( performance ), 0 ) performance FROM cd_user_study_log    WHERE 1=1
+            <if test="planId != null and planId != ''">
+        AND plan_id = #{planId}
+    </if> GROUP BY id_card )a
     </select>
 </mapper>