diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java index 9b889b9..1edd16e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java @@ -46,4 +46,6 @@ public interface SysEvaluationRecordMapper extends BaseMapperPlus selectFactorNum(@Param("batchNo") Long batchNo, @Param("scaleId") Long scaleId); List selectFactorWarnNum(@Param("batchNo") Long batchNo, @Param("scaleId") Long scaleId,@Param("list")List warnList); + int selectUndoneNumByBatchNoAndUserId(@Param("batchNo") Long batchNo,@Param("userId") Long userId); + } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java index b0c197d..3652759 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java @@ -37,4 +37,5 @@ public interface SysScalePublishMapper extends BaseMapperPlus used = warnMapper.selectUseConfig(); if (used.contains(riskLevel)) { SysWarnRecord wre = new SysWarnRecord(); - wre.setBatchNo(scalePublishVo.getBatchNo()); + wre.setBatchNo(batchNo); wre.setUserId(loginUser.getUserId()); wre.setDeptId(loginUser.getDeptId()); wre.setWarnTime(new Date()); wre.setSituation(riskLevel); warnRecordService.insertByBo(wre); } + //不允许查看考核结果 if (!allowQueryResult) { return null; diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml index 48f478c..a461ecd 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml @@ -110,4 +110,12 @@ where sf.scale_id = #{scaleId} group by sf.factor_id + + diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml index d0c7526..a45841e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml @@ -89,4 +89,10 @@ select count(*) from sys_scale_publish + +