Merge branch 'dev' into pre-production

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml

@@ -90,7 +90,7 @@
         sum(case  when point < 0 then point else 0 end) as deductionPoints ,
         sum(case  when point > 0 then point else 0 end) as bonusPoins
         from sup_indicators
-        where assess_dept = #{params.deptId}
+        where assess_dept = #{params.deptId} AND is_deleted = 0
         and DATE_FORMAT(create_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
         ]]>
     </select>

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

@@ -374,6 +374,9 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 	@Override
 	public R myApiIndicatorsDetail(Long id,Long classifyId) {
 		IndicatorsEntity indicatorsEntity = iIndicatorsService.getById(id);
+		if (2 == indicatorsEntity.getIndicatorsStatus()){
+			return R.fail("已确认考核无法进行修改");
+		}
 		//查询是否存在有附件
 		List<IndicatorsAnnexEntity> list = indicatorsAnnexService.list(Wrappers.<IndicatorsAnnexEntity>query().lambda().eq(IndicatorsAnnexEntity::getIndicatorsId, id));
 		IndicatorsVO indicatorsVO = IndicatorsWrapper.build().entityVO(indicatorsEntity);