Browse Source

fix: 1、维权大屏优化(受侵害人数);

master
pengwei 6 months ago
parent
commit
4c6410af6f
  1. 7
      src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java
  2. 1
      src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java
  3. 3
      src/main/java/com/biutag/supervision/controller/datav/DataVSupervisionNotifyController.java
  4. 4
      src/main/java/com/biutag/supervision/mapper/NegativeMapper.java

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

@ -156,10 +156,11 @@ public class DataVCaseVerifController {
Date finalEndTime = DateUtil.endOfDay(endTime);
List<CaseVerificationMapVo> caseVerificationMapList = negativeMapper.getCaseVerificationMap(beginTime, finalEndTime);
caseVerificationMapList =caseVerificationMapList.stream().map(s->{
long total =dataCaseVerifMapper.selectCount(new LambdaQueryWrapper<DataCaseVerif>().between(DataCaseVerif::getCreateTime,beginTime,finalEndTime));
s.setTotal((int) total);
// long total =dataCaseVerifMapper.selectCount(new LambdaQueryWrapper<DataCaseVerif>().between(DataCaseVerif::getCreateTime,beginTime,finalEndTime)
// .eq(DataCaseVerif::getSecondDepartId,s.));
// s.setTotal((int) total);
s.setRate(NumberUtil.div((Number)( s.getConfirmed() * 100),total ).doubleValue());
// s.setRate(NumberUtil.div((Number)( s.getConfirmed() * 100),total ).doubleValue());
return s;
}).toList();
JSONObject res = new JSONObject().fluentPut("caseVerificationMapList", caseVerificationMapList);

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

@ -192,6 +192,7 @@ public class DataVRightsComfortController {
.between(RpcApply::getCrtTime, beginTime, finalEndTime)
.eq(RpcApply::getSecondDepartId,departId)
.eq(RpcApply::getType, RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue()));
Set<String> caseNumbers = list.stream().map(RpcApply::getCaseNumber).collect(Collectors.toSet());
// 维权案件总数

3
src/main/java/com/biutag/supervision/controller/datav/DataVSupervisionNotifyController.java

@ -146,6 +146,7 @@ public class DataVSupervisionNotifyController {
public Result<JSONObject> getSupervisionNotifyMap(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
endTime = DateUtil.endOfDay(endTime);
//地图数据
List<SuperviseMapIconVo> superviseTempMapVoList = negativeMapper.getSupervisionMapIconInfo(beginTime, endTime);
JSONObject data = new JSONObject().fluentPut("superviseTempMapVoList", superviseTempMapVoList);
@ -181,6 +182,7 @@ public class DataVSupervisionNotifyController {
public Result<JSONObject> getYellowBetDrug(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime,
String dictValue) {
endTime = DateUtil.endOfDay(endTime);
// 分县市局
DayTimeSuperviseVo countyOverview = negativeMapper.getYellowBetOverview(beginTime, endTime, 3, dictValue);
List<OrganizeProblemRankVo> countyRankList = negativeMapper.getYellowBetRankList(beginTime, endTime, 3, dictValue);
@ -207,6 +209,7 @@ public class DataVSupervisionNotifyController {
@GetMapping("/getWorkDynamics")
public Result<List<News>> getWorkDynamics(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
endTime = DateUtil.endOfDay(endTime);
List<News> newsList = newsService.getWorkDynamics(beginTime, endTime, DCGZDT, null);
return Result.success(newsList);
}

4
src/main/java/com/biutag/supervision/mapper/NegativeMapper.java

@ -238,7 +238,9 @@ public interface NegativeMapper extends BaseMapper<Negative> {
"WHERE problemSourcesCode = 16 " +
"AND ng.crtTime BETWEEN #{beginTime} AND #{endTime}")
VideoSuperviseCountVo getAllVideoSuperviseCount(Date beginTime, Date endTime);
/**
* 问题类型占比
* */
@Select("SELECT npr.threeLevelContent AS `name`, " +
"COUNT(*) AS `value` " +
"FROM negative ng " +

Loading…
Cancel
Save