diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java index 436e67133..c45889b22 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java @@ -16,6 +16,9 @@ public class IndicatorsVO extends IndicatorsEntity { private String classifyName; private Long parentClassifyId; + + private Integer bonusPoin; + private Integer deductionPoints; private String parentClassifyName; private List pictures = new ArrayList<>(); diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java index 383071f81..ba373a07e 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java @@ -33,5 +33,5 @@ public interface IndicatorsMapper extends BaseMapper { * @param params * @return */ - Page selectBeMyApiIndicators(IPage page, Map params); + Page selectBeMyApiIndicators(IPage page,@Param("params") Map params); } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml index e643c43b7..2e4d545e3 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml @@ -62,20 +62,20 @@ SELECT si.*, sc.NAME AS classifyName, - t.加分, - t.扣分 + t.bonusPoin, + t.deductionPoints FROM sup_indicators AS si LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id LEFT JOIN (SELECT - sum( CASE WHEN point < 0 THEN point ELSE 0 END ) AS 扣分, - sum( CASE WHEN point > 0 THEN point ELSE 0 END ) AS 加分, + sum( CASE WHEN point < 0 THEN point ELSE 0 END ) AS deductionPoints, + sum( CASE WHEN point > 0 THEN point ELSE 0 END ) AS bonusPoin, id AS id, assess_dept AS assess_dept FROM sup_indicators WHERE - assess_dept = #{deptId} AND DATE_FORMAT( create_time,'%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) AS t ON t.id = si.id - WHERE si.assess_dept = #{deptId} + assess_dept = #{params.deptId} AND DATE_FORMAT( create_time,'%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )) AS t ON t.id = si.id + WHERE si.assess_dept = #{params.deptId} AND date_format(si.create_time,'%y%m%d%') >= date_format(#{params.startTime},'%y%m%d%')