diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java index d46973e..fec9a31 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java @@ -88,7 +88,7 @@ public class DataVRightsComfortController { if(tortNames.stream().noneMatch(s -> s.contains(","))){ result.setHitPersonNumber(initialListSize ); }else{ - result.setHitPersonNumber(initialListSize - nums + hitPersonNumber); + result.setHitPersonNumber(initialListSize - hitPersonNumber +nums); } Map> collect = list.stream() @@ -211,7 +211,7 @@ public class DataVRightsComfortController { if(tortNames.stream().noneMatch(s -> s.contains(","))){ re.setHitPersonNumber(initialListSize ); }else{ - re.setHitPersonNumber(initialListSize - nums + hitPersonNumber); + re.setHitPersonNumber(initialListSize + nums - hitPersonNumber); } //抚慰金额 CompletableFutureUtil.runSyncObject(() -> { diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java index f9d36c0..4d742fe 100644 --- a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java @@ -66,7 +66,7 @@ public interface RpcApplyMapper extends BaseMapper { "Incident_link_name AS `name`, " + "count(*) AS `value` " + "FROM rpc_apply ra " + - "WHERE ra.crt_time BETWEEN #{beginTime} AND #{endTime} " + + "WHERE ra.crt_time BETWEEN #{beginTime} AND #{endTime} and ra.type = 1 " + "GROUP BY Incident_link_name ") List getIncidentLink(Date beginTime, Date endTime);