supervision
/
supervision-boot
6
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

feat:删除信访投诉大屏的12337数据量显示

feature/tsjb-1.0
buaixuexideshitongxue 3 weeks ago
parent
5db78e198f
commit
b57085f393
5 changed files with 77 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java
  2. 13
      src/main/java/com/biutag/supervision/service/DataMailService.java
  3. 14
      src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java
  4. 58
      src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java
  5. 62
      src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java

6
src/main/java/com/biutag/supervision/controller/datav/DataVMailViewController.java
Unescape View File

@ -66,11 +66,13 @@ public class DataVMailViewController {
List<EchartsVo> countryList = negativeMapper.getMailTrend(year, 21);
List<EchartsVo> policeList = negativeMapper.getMailTrend(year, 22);
List<EchartsVo> commissionerList = dataMailService.getCommissionerTrend(year);
List<EchartsVo> numberList = dataPetition12337Mapper.getMailTrend12337(year);
// 12337 - 已隐藏
// List<EchartsVo> numberList = dataPetition12337Mapper.getMailTrend12337(year);
JSONObject data = new JSONObject().fluentPut("countryList", countryList)
.fluentPut("policeList", policeList)
.fluentPut("commissionerList", commissionerList)
.fluentPut("numberList", numberList);
// .fluentPut("numberList", numberList)
;
return Result.success(data);
}
// endregion

13
src/main/java/com/biutag/supervision/service/DataMailService.java
Unescape View File

@ -42,7 +42,8 @@ public class DataMailService extends ServiceImpl<DataPetitionComplaintMapper, Da
// 一级信访大屏数据中央统计
public MailOverviewVo allMailCount(Date beginTime, Date endTime) {
MailOverviewVo vo = mailCount(beginTime, endTime);
long totalMail = vo.getCountryMail() + vo.getPoliceMail() + vo.getNumberMail();
// 已隐藏12337: long totalMail = vo.getCountryMail() + vo.getPoliceMail() + vo.getNumberMail();
long totalMail = vo.getCountryMail() + vo.getPoliceMail() + vo.getManageMail();
vo.setTotalMail(totalMail);
return vo;
}
@ -62,10 +63,10 @@ public class DataMailService extends ServiceImpl<DataPetitionComplaintMapper, Da
policeQueryWrapper.between("create_time", beginTime, endTime);
Long policeMail = dataPetitionComplaintMapper.selectCount(policeQueryWrapper);
// 12337
QueryWrapper<DataPetition12337> queryWrapper12337 = new QueryWrapper<>();
queryWrapper12337.between("discover_time", beginTime, endTime);
Long mail12337 = dataPetition12337Mapper.selectCount(queryWrapper12337);
// 12337 - 已隐藏
// QueryWrapper<DataPetition12337> queryWrapper12337 = new QueryWrapper<>();
// queryWrapper12337.between("discover_time", beginTime, endTime);
// Long mail12337 = dataPetition12337Mapper.selectCount(queryWrapper12337);
// 局长信箱
QueryWrapper<Mail> mailQueryWrapper = new QueryWrapper<>();
@ -75,7 +76,7 @@ public class DataMailService extends ServiceImpl<DataPetitionComplaintMapper, Da
temp.setCountryMail(countryMail);
temp.setPoliceMail(policeMail);
temp.setNumberMail(mail12337);
// temp.setNumberMail(mail12337); // 已隐藏
temp.setManageMail(mailCount);
return temp;
}

14
src/main/java/com/biutag/supervision/service/DataPetitionComplaintService.java
Unescape View File

@ -199,9 +199,9 @@ public class DataPetitionComplaintService extends ServiceImpl<DataPetitionCompla
policeQueryWrapper.eq("problem_sources_code", 22);
policeQueryWrapper.between("discovery_time", beginTime, endTime);
Long policeMail = dataPetitionComplaintMapper.selectCount(policeQueryWrapper);
// 12337信访
QueryWrapper<DataPetition12337> queryWrapper12337 = new QueryWrapper<>();
Long total12337 = dataPetition12337Mapper.selectCount(queryWrapper12337);
// 12337信访 - 已隐藏
// QueryWrapper<DataPetition12337> queryWrapper12337 = new QueryWrapper<>();
// Long total12337 = dataPetition12337Mapper.selectCount(queryWrapper12337);
// 初访
QueryWrapper<DataPetitionComplaint> firstQueryWrapper = new QueryWrapper<>();
firstQueryWrapper.eq("initial_petition", 1);
@ -232,8 +232,8 @@ public class DataPetitionComplaintService extends ServiceImpl<DataPetitionCompla
massQueryWrapper.eq("mass_visits", 1);
massQueryWrapper.between("discovery_time", beginTime, endTime);
Long massMail = dataPetitionComplaintMapper.selectCount(massQueryWrapper);
// 总数
long totalMail = countryMail+policeMail+total12337;
// 总数 - 已隐藏12337
long totalMail = countryMail + policeMail;
JSONObject overview = new JSONObject()
// 信访总数（起）
@ -244,8 +244,8 @@ public class DataPetitionComplaintService extends ServiceImpl<DataPetitionCompla
.fluentPut("policeMail", policeMail)
// 局长信箱
.fluentPut("commissionerMail", 5534)
// 12337信访
.fluentPut("numMail", total12337)
// 12337信访 - 已隐藏
// .fluentPut("numMail", total12337)
// 初访;
.fluentPut("firstMail", firstMail)
// 重访

58
src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java
Unescape View File

@ -200,15 +200,10 @@ public class DatavServiceImpl implements DatavService {
mailQueryWrapper.between("mail_time", request.getBeginTime(), request.getEndTime());
long jzxxCount = mailMapper.selectCount(mailQueryWrapper);
// 12337
// NegativeQueryParam xf12337Param = new NegativeQueryParam();
// xf12337Param.setCrtTime(dates);
// xf12337Param.setProblemSourcesCode(Collections.singletonList(ProblemSourcesEnum.XF12337.getValue()));
// long xf12337Count = negativeResourceService.count(xf12337Param);
QueryWrapper<DataPetition12337> queryWrapper12337 = new QueryWrapper<>();
queryWrapper12337.between("discover_time", request.getBeginTime(), request.getEndTime());
long xf12337Count = dataPetition12337Mapper.selectCount(queryWrapper12337);
// 12337 - 已隐藏
// QueryWrapper<DataPetition12337> queryWrapper12337 = new QueryWrapper<>();
// queryWrapper12337.between("discover_time", request.getBeginTime(), request.getEndTime());
// long xf12337Count = dataPetition12337Mapper.selectCount(queryWrapper12337);
// 国家信访
@ -239,7 +234,7 @@ public class DatavServiceImpl implements DatavService {
overview.setNumSupervisionPro(szdcCount);
overview.setCaseVerificationPro(ajhcCount);
overview.setMailboxNumber(jzxxCount);
overview.setComplaintPro(xf12337Count + gjxfCount + gabxfCount);
overview.setComplaintPro(gjxfCount + gabxfCount); // 隐藏12337: xf12337Count +
overview.setAuditPro(sjxmCount);
overview.calcTotal();
JSONObject data = new JSONObject().fluentPut("overview", overview);
@ -285,14 +280,14 @@ public class DatavServiceImpl implements DatavService {
// 交办案件数
List<Negative> jbNegatvieList = negatives.stream().filter(one -> proCode.contains(one.getProblemSourcesCode())).toList();
long caseVerificationProCount = dataCaseVerifs.size() + jbNegatvieList.size();
// 12337
QueryWrapper<DataPetition12337> queryWrapper12337 = new QueryWrapper<>();
queryWrapper12337.between("discover_time", request.getBeginTime(), request.getEndTime());
queryWrapper12337.and(wrapper -> wrapper
.in("third_depart_id", allDepartIds)
.or()
.in("second_depart_id", allDepartIds));
long xf12337Count = dataPetition12337Mapper.selectCount(queryWrapper12337);
// 12337 - 已隐藏
// QueryWrapper<DataPetition12337> queryWrapper12337 = new QueryWrapper<>();
// queryWrapper12337.between("discover_time", request.getBeginTime(), request.getEndTime());
// queryWrapper12337.and(wrapper -> wrapper
// .in("third_depart_id", allDepartIds)
// .or()
// .in("second_depart_id", allDepartIds));
// long xf12337Count = dataPetition12337Mapper.selectCount(queryWrapper12337);
// 国家信访
DataPetitionComplaintQueryParam countryParam = new DataPetitionComplaintQueryParam();
countryParam.setCreateTime(dates);
@ -338,7 +333,7 @@ public class DatavServiceImpl implements DatavService {
globalMapIconVo.setSupervisionPro(supervisionProCount);
globalMapIconVo.setNumSupervisionPro(numSupervisionProCount);
globalMapIconVo.setCaseVerificationPro(caseVerificationProCount);
globalMapIconVo.setComplaintPro(xf12337Count + countryMail + policeMail);
globalMapIconVo.setComplaintPro(countryMail + policeMail); // 隐藏12337: + xf12337Count
globalMapIconVo.setAuditPro((long) (reportProjects.size()+dataAuditList.size()));
globalMapIconVo.setMailboxNumber(mailCount);
globalMapIconVo.calcTotal();
@ -978,10 +973,10 @@ public class DatavServiceImpl implements DatavService {
policeQueryWrapper.between("create_time", request.getBeginTime(), request.getEndTime());
Long policeMail = dataPetitionComplaintMapper.selectCount(policeQueryWrapper);
// 12337
QueryWrapper<DataPetition12337> queryWrapper12337 = new QueryWrapper<>();
queryWrapper12337.between("discover_time", request.getBeginTime(), request.getEndTime());
Long mail12337 = dataPetition12337Mapper.selectCount(queryWrapper12337);
// 12337 - 已隐藏
// QueryWrapper<DataPetition12337> queryWrapper12337 = new QueryWrapper<>();
// queryWrapper12337.between("discover_time", request.getBeginTime(), request.getEndTime());
// Long mail12337 = dataPetition12337Mapper.selectCount(queryWrapper12337);
// 局长信箱
QueryWrapper<Mail> mailQueryWrapper = new QueryWrapper<>();
@ -993,9 +988,10 @@ public class DatavServiceImpl implements DatavService {
MailOverviewVo overview = new MailOverviewVo();
overview.setCountryMail(countryMail);
overview.setPoliceMail(policeMail);
overview.setNumberMail(mail12337);
// overview.setNumberMail(mail12337); // 已隐藏
overview.setManageMail(mailCount);
overview.setTotalMail(overview.getCountryMail() + overview.getPoliceMail() + overview.getNumberMail());
// 只计算国家信访+公安部信访+局长信箱
overview.setTotalMail(overview.getCountryMail() + overview.getPoliceMail() + overview.getManageMail());
JSONObject data = new JSONObject().fluentPut("overview", overview);
return Result.success(data);
}
@ -1023,8 +1019,8 @@ public class DatavServiceImpl implements DatavService {
Long countryTotal = dataPetitionComplaintMapper.selectMailBySourceCode(beginTime, endTime, GJXFPT.getValue(), departId);
// 公安信访
Long policeTotal = dataPetitionComplaintMapper.selectMailBySourceCode(beginTime, endTime, GABXF.getValue(), departId);
// 12337
Long numTotal = dataPetition12337Service.count(new LambdaQueryWrapper<DataPetition12337>().between(DataPetition12337::getDiscoverTime, beginTime, endTime).eq(DataPetition12337::getSecondDepartId, departId));
// 12337 - 已隐藏
// Long numTotal = dataPetition12337Service.count(new LambdaQueryWrapper<DataPetition12337>().between(DataPetition12337::getDiscoverTime, beginTime, endTime).eq(DataPetition12337::getSecondDepartId, departId));
// 局长信箱
QueryWrapper<Mail> subOneMailQueryWrapper = new QueryWrapper<>();
String exDepartId = supExternalDepartMapper.getExIdByInId(departId.toString(), EX_SOURCE);
@ -1032,16 +1028,16 @@ public class DatavServiceImpl implements DatavService {
subOneMailQueryWrapper.eq("second_dept_id", exDepartId);
subOneMailQueryWrapper.between("create_time", beginTime, endTime);
Long commissionerTotal = mailMapper.selectCount(subOneMailQueryWrapper);
// 总数
Long total = countryTotal + policeTotal + numTotal;
// 总数 - 已隐藏12337
Long total = countryTotal + policeTotal + commissionerTotal;
//国家信访
re.setCountryTotal(countryTotal.toString());
//公安部信访
re.setPoliceTotal(policeTotal.toString());
//局长信箱
re.setCommissionerTotal(commissionerTotal.toString());
//12337信访
re.setNumTotal(numTotal.toString());
//12337信访 - 已隐藏
// re.setNumTotal(numTotal.toString());
re.setTotal(total.toString());
}
JSONObject data = new JSONObject().fluentPut("mailMapIconList", res);

62
src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java
Unescape View File

@ -233,14 +233,14 @@ public class SubDatavServiceImpl implements SubDatavService {
long mailCount = mailMapper.selectCount(mailQueryWrapper);
// 12337
QueryWrapper<DataPetition12337> queryWrapper12337 = new QueryWrapper<>();
queryWrapper12337.between("discover_time", request.getBeginTime(), request.getEndTime());
queryWrapper12337.and(wrapper -> wrapper
.in("third_depart_id", allDepartIds)
.or()
.in("second_depart_id", allDepartIds));
long xf12337Count = dataPetition12337Mapper.selectCount(queryWrapper12337);
// 12337 - 已隐藏
// QueryWrapper<DataPetition12337> queryWrapper12337 = new QueryWrapper<>();
// queryWrapper12337.between("discover_time", request.getBeginTime(), request.getEndTime());
// queryWrapper12337.and(wrapper -> wrapper
// .in("third_depart_id", allDepartIds)
// .or()
// .in("second_depart_id", allDepartIds));
// long xf12337Count = dataPetition12337Mapper.selectCount(queryWrapper12337);
// 国家信访
@ -275,7 +275,7 @@ public class SubDatavServiceImpl implements SubDatavService {
overview.setNumSupervisionPro(szdcCount);
overview.setCaseVerificationPro(ajhcCount);
overview.setMailboxNumber(mailCount);
overview.setComplaintPro(xf12337Count + gjxfCount + gabxfCount);
overview.setComplaintPro(gjxfCount + gabxfCount); // 隐藏12337: xf12337Count +
overview.setAuditPro(sjxmCount);
overview.calcTotal();
JSONObject data = new JSONObject().fluentPut("overview", overview);
@ -319,12 +319,12 @@ public class SubDatavServiceImpl implements SubDatavService {
List<Negative> jbNegatvieList = negatives.stream().filter(one -> ldjbCode.contains(one.getProblemSourcesCode())).toList();
long caseVerificationProCount = dataCaseVerifs + jbNegatvieList.size();
// 12337
NegativeQueryParam xf12337Param = new NegativeQueryParam();
xf12337Param.setCrtTime(dates);
xf12337Param.setInvolveDepartIds(Set.of(childDepartId));
xf12337Param.setProblemSourcesCode(Collections.singletonList(ProblemSourcesEnum.XF12337.getValue()));
long xf12337Count = negativeResourceService.count(xf12337Param);
// 12337 - 已隐藏
// NegativeQueryParam xf12337Param = new NegativeQueryParam();
// xf12337Param.setCrtTime(dates);
// xf12337Param.setInvolveDepartIds(Set.of(childDepartId));
// xf12337Param.setProblemSourcesCode(Collections.singletonList(ProblemSourcesEnum.XF12337.getValue()));
// long xf12337Count = negativeResourceService.count(xf12337Param);
// 国家信访
DataPetitionComplaintQueryParam countryParam = new DataPetitionComplaintQueryParam();
@ -372,7 +372,8 @@ public class SubDatavServiceImpl implements SubDatavService {
globalMapIconVo.setSupervisionPro(supervisionProCount);
globalMapIconVo.setNumSupervisionPro(numSupervisionProCount);
globalMapIconVo.setCaseVerificationPro(caseVerificationProCount);
globalMapIconVo.setComplaintPro(xf12337Count + countryMail + policeMail);
// 隐藏12337: xf12337Count + countryMail + policeMail
globalMapIconVo.setComplaintPro(countryMail + policeMail);
globalMapIconVo.setAuditPro(sjxmCount);
globalMapIconVo.setMailboxNumber(mailCount);
globalMapIconVo.setTalkPro(0L);
@ -1010,8 +1011,8 @@ public class SubDatavServiceImpl implements SubDatavService {
Long countryTotal = dataPetitionComplaintMapper.selectMailBySourceCode(beginTime, endTime, GJXFPT.getValue(), departId);
// 公安信访
Long policeTotal = dataPetitionComplaintMapper.selectMailBySourceCode(beginTime, endTime, GABXF.getValue(), departId);
// 12337
Long numTotal = dataPetition12337Service.count(new LambdaQueryWrapper<DataPetition12337>().between(DataPetition12337::getDiscoverTime, beginTime, endTime).eq(DataPetition12337::getSecondDepartId, departId));
// 12337 - 已隐藏
// Long numTotal = dataPetition12337Service.count(new LambdaQueryWrapper<DataPetition12337>().between(DataPetition12337::getDiscoverTime, beginTime, endTime).eq(DataPetition12337::getSecondDepartId, departId));
// 局长信箱
QueryWrapper<Mail> subOneMailQueryWrapper = new QueryWrapper<>();
String exDepartId = supExternalDepartMapper.getExIdByInId(departId.toString(), "局长信箱");
@ -1019,16 +1020,16 @@ public class SubDatavServiceImpl implements SubDatavService {
subOneMailQueryWrapper.eq("second_dept_id", exDepartId);
subOneMailQueryWrapper.between("create_time", beginTime, endTime);
Long commissionerTotal = mailMapper.selectCount(subOneMailQueryWrapper);
// 总数
Long total = countryTotal + policeTotal + numTotal;
// 总数 - 已隐藏12337
Long total = countryTotal + policeTotal + commissionerTotal;
//国家信访
overview.setCountryMail(countryTotal);
//公安部信访
overview.setPoliceMail(policeTotal);
//局长信箱
overview.setManageMail(commissionerTotal);
//12337信访
overview.setNumberMail(numTotal);
//12337信访 - 已隐藏
// overview.setNumberMail(numTotal);
overview.setTotalMail(total);
// overview.setCountryMail(120L); // 国家信访
// overview.setPoliceMail(45L); // 公安部信访
@ -1061,11 +1062,11 @@ public class SubDatavServiceImpl implements SubDatavService {
Long countryTotal = dataPetitionComplaintMapper.selectPoliceMailBySourceCode(beginTime, endTime, GJXFPT.getValue(), policeDepartId);
// 公安
Long policeTotal = dataPetitionComplaintMapper.selectPoliceMailBySourceCode(beginTime, endTime, GABXF.getValue(), policeDepartId);
// 12337 数据
LambdaQueryWrapper<DataPetition12337> dataPetition12337LambdaQueryWrapper = new LambdaQueryWrapper<>();
dataPetition12337LambdaQueryWrapper.between(DataPetition12337::getDiscoverTime, beginTime, endTime);
dataPetition12337LambdaQueryWrapper.eq(DataPetition12337::getThirdDepartId, re.getDepartId());
Long numTotal = dataPetition12337Service.count(dataPetition12337LambdaQueryWrapper);
// 12337 数据 - 已隐藏
// LambdaQueryWrapper<DataPetition12337> dataPetition12337LambdaQueryWrapper = new LambdaQueryWrapper<>();
// dataPetition12337LambdaQueryWrapper.between(DataPetition12337::getDiscoverTime, beginTime, endTime);
// dataPetition12337LambdaQueryWrapper.eq(DataPetition12337::getThirdDepartId, re.getDepartId());
// Long numTotal = dataPetition12337Service.count(dataPetition12337LambdaQueryWrapper);
// 局长信箱
String exDepartId = supExternalDepartMapper.getExIdByInId(policeDepartId, EX_SOURCE);
Long manageMail = 0L;
@ -1078,13 +1079,14 @@ public class SubDatavServiceImpl implements SubDatavService {
}
long country = countryTotal == null ? 0L : countryTotal;
long police = policeTotal == null ? 0L : policeTotal;
long num = numTotal == null ? 0L : numTotal;
// 12337 - 已隐藏: long num = numTotal == null ? 0L : numTotal;
long manage = manageMail == null ? 0L : manageMail;
Long total = country + police + num;
// 已隐藏12337: Long total = country + police + num;
Long total = country + police + manage;
re.setCountryTotal(String.valueOf(country));
re.setPoliceTotal(String.valueOf(police));
re.setCommissionerTotal(String.valueOf(manage));
re.setNumTotal(String.valueOf(num));
// 已隐藏: re.setNumTotal(String.valueOf(num));
re.setTotal(total.toString());
}
JSONObject data = new JSONObject().fluentPut("mailMapIconList", res);

Write Preview
Loading…
Cancel
Save