Merge branch 'dev' into pre-production

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/BeIndicatorsVO.java

@@ -13,9 +13,11 @@ import java.util.List;
 public class BeIndicatorsVO  {
 	private static final long serialVersionUID = 1L;
 
-
+//加分
-	private Integer bonusPoin;
+	private Integer bonusPoins;
-
+	//总分
+	private Integer totalPoints;
+//扣分
 	private Integer deductionPoints;
 
 	private List<IndicatorsVO> indicatorsVOS;

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

@@ -41,5 +41,5 @@ public interface IndicatorsMapper extends BaseMapper<IndicatorsEntity> {
 	 * @param params
 	 * @return
 	 */
-	BeIndicatorsVO selectMyPoints(Map<String, Object> params);
+	BeIndicatorsVO selectMyPoints(@Param("params")Map<String, Object> params);
 }

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

@@ -72,7 +72,7 @@
         GROUP BY si.classify_id
     </select>
     <select id="selectMyPoints" resultType="com.logpm.supervise.vo.api.BeIndicatorsVO">
-        select sum(case  when point < 0 then point else 0 end) as deductionPoints , sum(case  when point > 0 then point else 0 end) as bonusPoin from sup_indicators where assess_dept = #{deptId} and DATE_FORMAT(create_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+        select 0 As totalPoints， 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 = #{deptId} and DATE_FORMAT(create_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
     </select>
 
 </mapper>