代码合并问题解决

performance-web/src/main/java/com/clx/performance/mapper/IntegraRecordMapper.java

@@ -42,12 +42,6 @@ public interface IntegraRecordMapper extends BaseMapper<IntegralRecord> {
                                         @Param("beginTime")String beginTime,
                                         @Param("endTime")String endTime);
 
-    @Select("<script>select sum(integral) from integral_record where " +
-            " type in <foreach collection='list' item='item' open='(' separator=',' close=')'>#{item}</foreach> " +
-            " and statistics_id = #{statisticsId}" +
-            "</script>")
-    Integer sumByStatisticsIdAndTypes(@Param("statisticsId") Integer statisticsId, @Param("list") List<Integer> typeList);
-
     @Select("select count(1) from integral_record where statistics_id = #{statisticsId} and type = #{type} and create_time >= #{beginTime} and create_time < #{endTime}")
     Integer countByStatisticsIdAndTypeAndTime(@Param("statisticsId") Integer statisticsId,
                                         @Param("type") Integer type,