Browse Source

fix: 1、维权大屏优化(受侵害人数);2、案件核查大屏(查实率)

master
pengwei 8 months ago
parent
commit
f0dd72aec1
  1. 4
      src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java
  2. 4
      src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java
  3. 18
      src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java

4
src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java

@ -135,7 +135,7 @@ public class DataVCaseVerifController {
long total =dataCaseVerifMapper.selectCount(new LambdaQueryWrapper<DataCaseVerif>().between(DataCaseVerif::getCreateTime,beginTime,endTime));
overview.setTotal((int) total);
// overview.setRate((double) ((overview.getConfirmed() / total * 100) ));
overview.setRate(NumberUtil.div((Number) overview.getConfirmed(),total * 100).doubleValue());
overview.setRate(NumberUtil.div((Number) (overview.getConfirmed() * 100),total ).doubleValue());
JSONObject res = new JSONObject().fluentPut("overview", overview);
return Result.success(res);
}
@ -159,7 +159,7 @@ public class DataVCaseVerifController {
long total =dataCaseVerifMapper.selectCount(new LambdaQueryWrapper<DataCaseVerif>().between(DataCaseVerif::getCreateTime,beginTime,finalEndTime));
s.setTotal((int) total);
s.setRate(NumberUtil.div((Number) s.getConfirmed(),total * 100).doubleValue());
s.setRate(NumberUtil.div((Number)( s.getConfirmed() * 100),total ).doubleValue());
return s;
}).toList();
JSONObject res = new JSONObject().fluentPut("caseVerificationMapList", caseVerificationMapList);

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

@ -74,7 +74,7 @@ public class DataVRightsComfortController {
// 维权案件总数
result.setRightsNumber(caseNumbers.size());
// 受侵害人数
result.setVictimNumber(list.size());
result.setVictimNumber(rpcApplyMapper.selectVictimNumber(beginTime,finalEndTime));
// 打击处理人数
List<String> tortNames = rpcInfringerResultMapper.selectNamesByTime(beginTime, finalEndTime);
long initialListSize = tortNames.size();
@ -197,7 +197,7 @@ public class DataVRightsComfortController {
// 维权案件总数
re.setRightsNumber(caseNumbers.size());
// 受侵害人数
re.setVictimNumber(list.size());
re.setVictimNumber(rpcApplyMapper.selectVictimNumberByOrg(beginTime,finalEndTime,departId));
// 打击处理人数
List<String> tortNames = rpcInfringerResultMapper.selectNamesByOrgTime(beginTime, finalEndTime,departId);
long initialListSize = tortNames.size();

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

@ -37,6 +37,24 @@ public interface RpcApplyMapper extends BaseMapper<RpcApply> {
)
List<EchartsVo> selectCaseData(Date beginTime, Date endTime,String type);
/**
* 获取受侵害人数
* */
@Select(" SELECT COUNT(*) from rpc_apply_person a LEFT JOIN rpc_apply b " +
" on a.rpc_id = b.rpc_id and b.type =1 " +
" WHERE b.rpc_id is not null " +
" and b.crt_time BETWEEN #{beginTime} and ${endTime} ")
Integer selectVictimNumber(Date beginTime, Date endTime);
/**
* 获取受侵害人数(根据分县)
* */
@Select(" SELECT COUNT(*) from rpc_apply_person a LEFT JOIN rpc_apply b " +
" on a.rpc_id = b.rpc_id and b.type =1 " +
" WHERE b.rpc_id is not null " +
" and b.crt_time BETWEEN #{beginTime} and ${endTime} " +
" and b.second_depart_id = #{deptId} ")
Integer selectVictimNumberByOrg(Date beginTime, Date endTime,String deptId);
@Select("SELECT " +

Loading…
Cancel
Save