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 6699e69..78e67a1 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java @@ -189,7 +189,7 @@ public class DataVRightsComfortController { }), CompletableFutureUtil.runSyncObject(() -> { - // 民辅警受伤情况 + // 抚慰情况 List data = rpcApplyMapper.selectComfortPoliceInjurySituation(beginTime, finalEndTime); //获取字典中的民警类型 diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java index fce6b93..86a9cb5 100644 --- a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java @@ -333,7 +333,7 @@ public interface RpcApplyMapper extends BaseMapper { ) List selectComfortPoliceInjurySituation(Date beginTime, Date endTime); - @Select("select p.injury_severity_name name, count(r.rpc_id) value from rpc_apply r left join rpc_apply_person p on r.rpc_id = p.rpc_id where r.crt_time between #{beginTime} and #{endTime} and r.type = 2 and r.rpc_status='completed' GROUP BY p.injury_severity_name") + @Select("select p.injury_severity_name name, count(r.rpc_id) value from rpc_apply r left join rpc_apply_person p on r.rpc_id = p.rpc_id where r.apply_date between #{beginTime} and #{endTime} and r.type = 2 and r.rpc_status='completed' GROUP BY p.injury_severity_name") List selectComfortInjuryCategory(Date beginTime, Date endTime); diff --git a/src/main/java/com/biutag/supervision/pojo/model/DataRightsComfortModel.java b/src/main/java/com/biutag/supervision/pojo/model/DataRightsComfortModel.java index 5683f0e..d6e23d7 100644 --- a/src/main/java/com/biutag/supervision/pojo/model/DataRightsComfortModel.java +++ b/src/main/java/com/biutag/supervision/pojo/model/DataRightsComfortModel.java @@ -43,7 +43,7 @@ public class DataRightsComfortModel { List punishmentSituation = new ArrayList<>(); // 民辅警抚慰情况占比 List comfortPoliceTypeProportion = new ArrayList<>(); - // 民辅警受伤情况 + // 抚慰情况 List comfortPoliceInjurySituation = new ArrayList<>(); // 民辅警受伤类别 List comfortInjuryCategory = new ArrayList<>();