Browse Source

fix--抚慰屏幕民辅警受伤情况不对

master
buaixuexideshitongxue 3 weeks ago
parent
commit
1cb9ce3cce
  1. 2
      src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java
  2. 2
      src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java
  3. 2
      src/main/java/com/biutag/supervision/pojo/model/DataRightsComfortModel.java

2
src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java

@ -189,7 +189,7 @@ public class DataVRightsComfortController {
}), }),
CompletableFutureUtil.runSyncObject(() -> { CompletableFutureUtil.runSyncObject(() -> {
// 民辅警受伤情况 // 抚慰情况
List<PieItem> data = rpcApplyMapper.selectComfortPoliceInjurySituation(beginTime, finalEndTime); List<PieItem> data = rpcApplyMapper.selectComfortPoliceInjurySituation(beginTime, finalEndTime);
//获取字典中的民警类型 //获取字典中的民警类型

2
src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java

@ -333,7 +333,7 @@ public interface RpcApplyMapper extends BaseMapper<RpcApply> {
) )
List<PieItem> selectComfortPoliceInjurySituation(Date beginTime, Date endTime); List<PieItem> 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<PieItem> selectComfortInjuryCategory(Date beginTime, Date endTime); List<PieItem> selectComfortInjuryCategory(Date beginTime, Date endTime);

2
src/main/java/com/biutag/supervision/pojo/model/DataRightsComfortModel.java

@ -43,7 +43,7 @@ public class DataRightsComfortModel {
List<PieItem> punishmentSituation = new ArrayList<>(); List<PieItem> punishmentSituation = new ArrayList<>();
// 民辅警抚慰情况占比 // 民辅警抚慰情况占比
List<PieItem> comfortPoliceTypeProportion = new ArrayList<>(); List<PieItem> comfortPoliceTypeProportion = new ArrayList<>();
// 民辅警受伤情况 // 抚慰情况
List<PieItem> comfortPoliceInjurySituation = new ArrayList<>(); List<PieItem> comfortPoliceInjurySituation = new ArrayList<>();
// 民辅警受伤类别 // 民辅警受伤类别
List<PieItem> comfortInjuryCategory = new ArrayList<>(); List<PieItem> comfortInjuryCategory = new ArrayList<>();

Loading…
Cancel
Save