Browse Source

二级首页大屏--总览数据+问题机构排名

master
buaixuexideshitongxue 2 months ago
parent
commit
1d9a7ff677
  1. 61
      src/main/java/com/biutag/supervision/controller/subdatav/SubOneGlobalController.java
  2. 3
      src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
  3. 28
      src/main/java/com/biutag/supervision/pojo/param/NegativeOrganizationRankQueryParam.java
  4. 57
      src/main/java/com/biutag/supervision/pojo/param/SupDepartQueryParam.java
  5. 4
      src/main/java/com/biutag/supervision/pojo/request/datav/DataVRequest.java
  6. 47
      src/main/java/com/biutag/supervision/pojo/request/subdatav/SubDataVRequest.java
  7. 5
      src/main/java/com/biutag/supervision/repository/negative/NegativeResourceService.java
  8. 32
      src/main/java/com/biutag/supervision/repository/supdepart/SupDepartResourceService.java
  9. 28
      src/main/java/com/biutag/supervision/service/subDatav/SubDatavService.java
  10. 173
      src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java
  11. 25
      src/main/resources/mapper/SupTaskProblemMapper.xml

61
src/main/java/com/biutag/supervision/controller/subdatav/SubOneGlobalController.java

@ -3,28 +3,29 @@ package com.biutag.supervision.controller.subdatav;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.biutag.supervision.constants.enums.ProblemSourcesEnum; import com.biutag.supervision.constants.enums.ProblemSourcesEnum;
import com.biutag.supervision.mapper.MailMapper; import com.biutag.supervision.mapper.MailMapper;
import com.biutag.supervision.mapper.NegativeMapper; import com.biutag.supervision.mapper.NegativeMapper;
import com.biutag.supervision.mapper.SupExternalDepartMapper; import com.biutag.supervision.mapper.SupExternalDepartMapper;
import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.Result;
import com.biutag.supervision.pojo.entity.Negative; import com.biutag.supervision.pojo.entity.Negative;
import com.biutag.supervision.pojo.entity.SupExternalDepart;
import com.biutag.supervision.pojo.entity.mailbox.Mail; import com.biutag.supervision.pojo.entity.mailbox.Mail;
import com.biutag.supervision.pojo.request.subdatav.SubDataVRequest;
import com.biutag.supervision.pojo.vo.*; import com.biutag.supervision.pojo.vo.*;
import com.biutag.supervision.service.*; import com.biutag.supervision.service.CountyStreetDeptService;
import com.biutag.supervision.service.DataMailService;
import com.biutag.supervision.service.NegativeService;
import com.biutag.supervision.service.subDatav.SubDatavService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.*; import java.util.Date;
import java.util.List;
/** /**
* @Auther: sh * @Auther: sh
@ -38,12 +39,22 @@ import java.util.*;
@Slf4j @Slf4j
public class SubOneGlobalController { public class SubOneGlobalController {
private final String VALID_SIGN = "terminated"; // 有效标识
private final String EX_SOURCE = "局长信箱"; // 映射来源
private final NegativeMapper negativeMapper; private final NegativeMapper negativeMapper;
private final CountyStreetDeptService countyStreetDeptService; private final CountyStreetDeptService countyStreetDeptService;
private final DataMailService dataMailService; private final DataMailService dataMailService;
private final NegativeService negativeService; private final NegativeService negativeService;
private final MailMapper mailMapper; private final MailMapper mailMapper;
private final SupExternalDepartMapper externalDepartMapper; private final SupExternalDepartMapper externalDepartMapper;
@Resource
private SubDatavService subDatavService;
/** /**
* 获取地图数据, 所有二级地图的json数据 * 获取地图数据, 所有二级地图的json数据
* *
@ -60,31 +71,14 @@ public class SubOneGlobalController {
//region 左边 //region 左边
/**
* 机构问题排名
*
* @param departId 2级单位的id
* @param beginTime 开始时间
* @param endTime 结束时间
* @return Result<JSONObject>
*/
@Operation(summary = "机构问题排名") @Operation(summary = "机构问题排名")
@GetMapping("/getSubOneOrganizationRank") @PostMapping("/getSubOneOrganizationRank")
public Result<JSONObject> getSubOneOrganizationRank(@RequestParam Integer departId, public Result<JSONObject> getSubOneOrganizationRank(@RequestBody SubDataVRequest request) {
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, return subDatavService.getSubOneOrganizationRank(request);
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
List<OrganizeProblemRankVo> fxsjlist = negativeMapper.selectPoliceOrganizeProblemRank(departId, beginTime, endTime);
List<OrganizeProblemRankVo> jsdwlist = negativeMapper.selectTeamOrganizeProblemRank(departId, beginTime, endTime);
JSONObject res = new JSONObject()
.fluentPut("fxsjlist", fxsjlist)
.fluentPut("jsdwlist", jsdwlist);
return Result.success(res);
} }
/** /**
* 业务类型占比 * 业务类型占比
* *
@ -107,8 +101,7 @@ public class SubOneGlobalController {
//region 中间 //region 中间
private final String VALID_SIGN = "terminated"; // 有效标识
private final String EX_SOURCE = "局长信箱"; // 映射来源
/** /**
* 获取首页大屏中央数据 * 获取首页大屏中央数据
* *
@ -147,6 +140,12 @@ public class SubOneGlobalController {
return Result.success(data); return Result.success(data);
} }
@Operation(summary = "大屏中央数据")
@PostMapping("/getSubOneAllCount")
public Result<JSONObject> getSubOneAllCount(@RequestBody SubDataVRequest request) {
return subDatavService.getSubOneAllCount(request);
}
/** /**
* 地图数据 * 地图数据
* *

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

@ -2,6 +2,7 @@ package com.biutag.supervision.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.biutag.supervision.pojo.entity.Negative; import com.biutag.supervision.pojo.entity.Negative;
import com.biutag.supervision.pojo.param.NegativeOrganizationRankQueryParam;
import com.biutag.supervision.pojo.vo.*; import com.biutag.supervision.pojo.vo.*;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
@ -1095,6 +1096,8 @@ public interface NegativeMapper extends BaseMapper<Negative> {
List<Negative> selectListBySampleId(@Param("args") List<Integer> sampleIdList); List<Negative> selectListBySampleId(@Param("args") List<Integer> sampleIdList);
List<OrganizeProblemRankVo> getOrganizationRank(NegativeOrganizationRankQueryParam param);
// endregion // endregion
} }

28
src/main/java/com/biutag/supervision/pojo/param/NegativeOrganizationRankQueryParam.java

@ -0,0 +1,28 @@
package com.biutag.supervision.pojo.param;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import java.util.List;
import java.util.Set;
/**
* @ClassName NegativeOrganizationRankQueryParam
* @Description 机构问题排名查询参数实体
* @Author shihao
* @Date 2025/12/19 16:51
*/
@Getter
@Setter
@Schema(description = "机构问题排名查询参数实体")
public class NegativeOrganizationRankQueryParam {
@Schema(description = "部门集合")
private Set<String> involveDepartIds;
@Schema(description = "时间集合")
private List<Date> crtTime;
}

57
src/main/java/com/biutag/supervision/pojo/param/SupDepartQueryParam.java

@ -0,0 +1,57 @@
package com.biutag.supervision.pojo.param;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import java.util.Set;
/**
* @ClassName SupDepartQueryParam
* @Description 部门查询请求
* @Author shihao
* @Date 2025/12/19 16:00
*/
@Getter
@Setter
@Schema(description = "部门查询请求")
public class SupDepartQueryParam {
@Schema(description = "部门ID")
private String id;
@Schema(description = "部门ID集合")
private Set<String> ids;
@Schema(description = "父部门ID")
private String pid;
@Schema(description = "父部门ID集合")
private Set<String> pids;
@Schema(description = "部门编码")
private String code;
@Schema(description = "部门编码集合")
private Set<String> codes;
@Schema(description = "部门层级")
private String level;
@Schema(description = "部门层级集合")
private Set<String> levels;
@Schema(description = "部门简称")
private String shortName;
@Schema(description = "部门名称")
private String name;
@Schema(description = "部门名称模糊查询")
private String nameLike;
@Schema(description = "单位统计分组ID")
private Integer statisticsGroupId;
}

4
src/main/java/com/biutag/supervision/pojo/request/datav/DataVRequest.java

@ -1,5 +1,6 @@
package com.biutag.supervision.pojo.request.datav; package com.biutag.supervision.pojo.request.datav;
import cn.hutool.core.date.DateUtil;
import com.biutag.supervision.aop.ParamChecked; import com.biutag.supervision.aop.ParamChecked;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.ValidationException; import jakarta.validation.ValidationException;
@ -32,5 +33,8 @@ public class DataVRequest implements ParamChecked {
if (Objects.isNull(beginTime) || Objects.isNull(endTime)){ if (Objects.isNull(beginTime) || Objects.isNull(endTime)){
throw new ValidationException("必须选择时间"); throw new ValidationException("必须选择时间");
} }
// 统一格式化时间
this.beginTime = DateUtil.beginOfDay(this.beginTime);
this.endTime = DateUtil.endOfDay(this.endTime);
} }
} }

47
src/main/java/com/biutag/supervision/pojo/request/subdatav/SubDataVRequest.java

@ -0,0 +1,47 @@
package com.biutag.supervision.pojo.request.subdatav;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.biutag.supervision.aop.ParamChecked;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.ValidationException;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import java.util.Objects;
/**
* @ClassName SubDataVRequest
* @Description 二级数据大屏请求实体
* @Author shihao
* @Date 2025/12/19 15:26
*/
@Setter
@Getter
@Schema(description = "二级数据大屏请求实体")
public class SubDataVRequest implements ParamChecked {
@Schema(description = "开始时间")
private Date beginTime;
@Schema(description = "结束时间")
private Date endTime;
@Schema(description = "部门Id")
private String departId;
@Override
public void check() {
if (Objects.isNull(beginTime) || Objects.isNull(endTime)){
throw new ValidationException("必须选择时间");
}
if (StrUtil.isBlank(departId)){
throw new ValidationException("必须传入部门ID");
}
this.beginTime = DateUtil.beginOfDay(this.beginTime);
this.endTime = DateUtil.endOfDay(this.endTime);
}
}

5
src/main/java/com/biutag/supervision/repository/negative/NegativeResourceService.java

@ -5,7 +5,9 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.biutag.supervision.mapper.NegativeMapper; import com.biutag.supervision.mapper.NegativeMapper;
import com.biutag.supervision.pojo.entity.Negative; import com.biutag.supervision.pojo.entity.Negative;
import com.biutag.supervision.pojo.param.NegativeOrganizationRankQueryParam;
import com.biutag.supervision.pojo.param.NegativeQueryParam; import com.biutag.supervision.pojo.param.NegativeQueryParam;
import com.biutag.supervision.pojo.vo.OrganizeProblemRankVo;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -175,4 +177,7 @@ public class NegativeResourceService {
return negativeMapper.selectCount(queryWrapper); return negativeMapper.selectCount(queryWrapper);
} }
public List<OrganizeProblemRankVo> getOrganizationRank(NegativeOrganizationRankQueryParam param) {
return negativeMapper.getOrganizationRank(param);
}
} }

32
src/main/java/com/biutag/supervision/repository/supdepart/SupDepartResourceService.java

@ -1,9 +1,14 @@
package com.biutag.supervision.repository.supdepart; package com.biutag.supervision.repository.supdepart;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.biutag.supervision.mapper.SupDepartMapper; import com.biutag.supervision.mapper.SupDepartMapper;
import com.biutag.supervision.pojo.dto.DepartAndSubDepartDto; import com.biutag.supervision.pojo.dto.DepartAndSubDepartDto;
import com.biutag.supervision.pojo.entity.SupDepart;
import com.biutag.supervision.pojo.param.SupDepartGroupParam; import com.biutag.supervision.pojo.param.SupDepartGroupParam;
import com.biutag.supervision.pojo.param.SupDepartQueryParam;
import com.biutag.supervision.repository.base.BaseDAO;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -17,12 +22,37 @@ import java.util.stream.Collectors;
* @Date 2025/12/11 15:04 * @Date 2025/12/11 15:04
*/ */
@Service @Service
public class SupDepartResourceService { public class SupDepartResourceService extends BaseDAO {
@Resource @Resource
private SupDepartMapper supDepartMapper; private SupDepartMapper supDepartMapper;
public List<SupDepart> query(SupDepartQueryParam param){
LambdaQueryWrapper<SupDepart> wrapper = new LambdaQueryWrapper<>();
setBatchQuery(param.getId(), param.getIds(), wrapper, SupDepart::getId);
setBatchQuery(param.getPid(), param.getPids(), wrapper, SupDepart::getPid);
setBatchQuery(param.getCode(), param.getCodes(), wrapper, SupDepart::getCode);
wrapper.eq(StrUtil.isNotBlank(param.getLevel()) ,SupDepart::getLevel, param.getLevel());
wrapper.in(CollectionUtil.isNotEmpty(param.getLevels()), SupDepart::getLevel, param.getLevels());
wrapper.eq(StrUtil.isNotBlank(param.getShortName()), SupDepart::getShortName, param.getShortName());
wrapper.eq(StrUtil.isNotBlank(param.getName()), SupDepart::getName, param.getName());
wrapper.like(StrUtil.isNotBlank(param.getNameLike()), SupDepart::getName, param.getNameLike());
wrapper.eq(param.getStatisticsGroupId()!=null, SupDepart::getStatisticsGroupId, param.getStatisticsGroupId());
if (wrapper.getExpression() == null || wrapper.getExpression().getSqlSegment().isEmpty()) {
return Collections.emptyList();
}
return supDepartMapper.selectList(wrapper);
}
/** /**
* 获取部门和子部门的数据 * 获取部门和子部门的数据
* @param param * @param param

28
src/main/java/com/biutag/supervision/service/subDatav/SubDatavService.java

@ -0,0 +1,28 @@
package com.biutag.supervision.service.subDatav;
import com.alibaba.fastjson.JSONObject;
import com.biutag.supervision.pojo.Result;
import com.biutag.supervision.pojo.request.subdatav.SubDataVRequest;
/**
* @ClassName SubDatavService
* @Description 区县大屏服务层
* @Author shihao
* @Date 2025/12/19 15:30
*/
public interface SubDatavService {
/**
* 获取区县首页大屏的机构问题排名
* @param request
* @return
*/
Result<JSONObject> getSubOneOrganizationRank(SubDataVRequest request);
/**
* 获取区县首页大屏的中央总览数据
* @param request
* @return
*/
Result<JSONObject> getSubOneAllCount(SubDataVRequest request);
}

173
src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java

@ -0,0 +1,173 @@
package com.biutag.supervision.service.subDatav;
import com.alibaba.fastjson.JSONObject;
import com.biutag.supervision.constants.enums.DepartGroupEnum;
import com.biutag.supervision.constants.enums.ProblemSourcesEnum;
import com.biutag.supervision.pojo.Result;
import com.biutag.supervision.pojo.dto.DepartAndSubDepartDto;
import com.biutag.supervision.pojo.entity.SupDepart;
import com.biutag.supervision.pojo.entity.SupExternalDepart;
import com.biutag.supervision.pojo.param.*;
import com.biutag.supervision.pojo.request.subdatav.SubDataVRequest;
import com.biutag.supervision.pojo.vo.GlobalOverViewVo;
import com.biutag.supervision.pojo.vo.OrganizeProblemRankVo;
import com.biutag.supervision.repository.dataCaseVerif.DataCaseVerifResourceService;
import com.biutag.supervision.repository.dataPetitionComplaint.DataPetitionComplaintResourceService;
import com.biutag.supervision.repository.mail.MailResourceService;
import com.biutag.supervision.repository.negative.NegativeResourceService;
import com.biutag.supervision.repository.reportproject.ReportProjectResourceService;
import com.biutag.supervision.repository.supExternalDepart.SupExternalDepartResourceService;
import com.biutag.supervision.repository.supdepart.SupDepartResourceService;
import com.biutag.supervision.service.NegativeBlameService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
/**
* @ClassName SubDatavServiceImpl
* @Description 区县大屏服务层
* @Author shihao
* @Date 2025/12/19 15:30
*/
@Service
public class SubDatavServiceImpl implements SubDatavService {
@Resource
private SupDepartResourceService supDepartResourceService;
@Resource
private NegativeResourceService negativeResourceService;
@Resource
private ReportProjectResourceService reportProjectResourceService;
@Resource
private NegativeBlameService negativeBlameService;
@Resource
private DataPetitionComplaintResourceService dataPetitionComplaintResourceService;
@Resource
private MailResourceService mailResourceService;
@Resource
private SupExternalDepartResourceService supExternalDepartResourceService;
@Resource
private DataCaseVerifResourceService dataCaseVerifResourceService;
@Override
public Result<JSONObject> getSubOneOrganizationRank(SubDataVRequest request) {
SupDepartQueryParam supDepartQueryParam = new SupDepartQueryParam();
supDepartQueryParam.setPid(request.getDepartId());
List<SupDepart> query = supDepartResourceService.query(supDepartQueryParam);
Set<String> pcsSet = query.stream().filter(one -> "10".equals(one.getStatisticsGroupId())).map(SupDepart::getId).collect(Collectors.toSet());
Set<String> ddSet = query.stream().filter(one -> !"10".equals(one.getStatisticsGroupId())).map(SupDepart::getId).collect(Collectors.toSet());
List<Date> dates = Arrays.asList(request.getBeginTime(), request.getEndTime());
NegativeOrganizationRankQueryParam pcsParam = new NegativeOrganizationRankQueryParam();
pcsParam.setCrtTime(dates);
pcsParam.setInvolveDepartIds(pcsSet);
List<OrganizeProblemRankVo> fxsjlist = negativeResourceService.getOrganizationRank(pcsParam);
NegativeOrganizationRankQueryParam ddParam = new NegativeOrganizationRankQueryParam();
ddParam.setCrtTime(dates);
ddParam.setInvolveDepartIds(ddSet);
List<OrganizeProblemRankVo> jsdwlist = negativeResourceService.getOrganizationRank(ddParam);
JSONObject res = new JSONObject()
.fluentPut("fxsjlist", fxsjlist)
.fluentPut("jsdwlist", jsdwlist);
return Result.success(res);
}
@Override
public Result<JSONObject> getSubOneAllCount(SubDataVRequest request) {
SupDepartGroupParam supDepartGroupParam = new SupDepartGroupParam();
supDepartGroupParam.setGroupId(DepartGroupEnum.COUNTY_CITY_BUREAUS.getId());
supDepartGroupParam.setParentLevel(2);
supDepartGroupParam.setChildLevel(3);
Map<String, DepartAndSubDepartDto> departAndSubDepart = supDepartResourceService.getDepartAndSubDepart(supDepartGroupParam);
DepartAndSubDepartDto departDto = departAndSubDepart.get(request.getDepartId());
Set<String> allDepartIds = departDto.getAllDepartIds();
GlobalOverViewVo overview = GlobalOverViewVo.of();
List<Date> dates = Arrays.asList(request.getBeginTime(), request.getEndTime());
// 现场督查
NegativeQueryParam xcdcQueryParam = new NegativeQueryParam();
xcdcQueryParam.setCrtTime(dates);
xcdcQueryParam.setInvolveDepartIds(allDepartIds);
xcdcQueryParam.setProblemSourcesCode(ProblemSourcesEnum.GROUP_13);
long xcdcCount = negativeResourceService.count(xcdcQueryParam);
// 数字督察
NegativeQueryParam szdcQueryParam = new NegativeQueryParam();
szdcQueryParam.setCrtTime(dates);
szdcQueryParam.setInvolveDepartIds(allDepartIds);
szdcQueryParam.setProblemSourcesCode(ProblemSourcesEnum.GROUP_14_15_16);
long szdcCount = negativeResourceService.count(szdcQueryParam);
// 案件核查
NegativeQueryParam ajhcQueryParam = new NegativeQueryParam();
ajhcQueryParam.setCrtTime(dates);
ajhcQueryParam.setInvolveDepartIds(allDepartIds);
ajhcQueryParam.setProblemSourcesCode(ProblemSourcesEnum.GROUP_17_18_19_20);
long ajhcCount = negativeResourceService.count(ajhcQueryParam);
// 局长信箱
SupExternalDepartQueryParam supExternalDepartQueryParam = new SupExternalDepartQueryParam();
supExternalDepartQueryParam.setInternalIds(allDepartIds);
supExternalDepartQueryParam.setSource("局长信箱");
List<SupExternalDepart> supExternalDepartList = supExternalDepartResourceService.query(supExternalDepartQueryParam);
Set<String> supExternalDepartIdSet = supExternalDepartList.stream().map(SupExternalDepart::getExternalId).collect(Collectors.toSet());
MailQueryParam mailQueryParam = new MailQueryParam();
mailQueryParam.setSecondDeptIds(supExternalDepartIdSet);
mailQueryParam.setCreateTime(dates);
long mailCount = mailResourceService.count(mailQueryParam);
// 12337
NegativeQueryParam xf12337Param = new NegativeQueryParam();
xf12337Param.setCrtTime(dates);
xf12337Param.setProblemSourcesCode(Collections.singletonList(ProblemSourcesEnum.XF12337.getValue()));
xf12337Param.setInvolveDepartIds(allDepartIds);
long xf12337Count = negativeResourceService.count(xf12337Param);
// 国家信访
DataPetitionComplaintQueryParam countryParam = new DataPetitionComplaintQueryParam();
countryParam.setCreateTime(dates);
countryParam.setSecondDepartIds(allDepartIds);
countryParam.setProblemSourcesCode(ProblemSourcesEnum.GJXFPT.getValue());
long gjxfCount = dataPetitionComplaintResourceService.count(countryParam);
// 公安部门信访
DataPetitionComplaintQueryParam policeParam = new DataPetitionComplaintQueryParam();
policeParam.setCreateTime(dates);
policeParam.setSecondDepartIds(allDepartIds);
policeParam.setProblemSourcesCode(ProblemSourcesEnum.GABXF.getValue());
long gabxfCount = dataPetitionComplaintResourceService.count(policeParam);
// 审计项目数
ReportProjectQueryParam reportProjectQueryParam = new ReportProjectQueryParam();
reportProjectQueryParam.setArchivingStart(request.getBeginTime());
reportProjectQueryParam.setArchivingEnd(request.getEndTime());
reportProjectQueryParam.setAuditUnitIds(allDepartIds);
long sjxmCount = reportProjectResourceService.count(reportProjectQueryParam);
overview.setSupervisionPro(xcdcCount);
overview.setNumSupervisionPro(szdcCount);
overview.setCaseVerificationPro(ajhcCount);
overview.setMailboxNumber(mailCount);
overview.setComplaintPro(xf12337Count + gjxfCount + gabxfCount);
overview.setAuditPro(sjxmCount);
overview.calcTotal();
JSONObject data = new JSONObject().fluentPut("overview", overview);
return Result.success(data);
}
}

25
src/main/resources/mapper/SupTaskProblemMapper.xml

@ -86,4 +86,29 @@
</select> </select>
<select id="getOrganizationRank" resultType="com.biutag.supervision.pojo.vo.OrganizeProblemRankVo">
select
sd.short_name as label,
count(1) as `value`
FROM negative ng
JOIN sup_depart sd ON sd.id = ng.involveDepartId
<where>
<if test="crtTime != null">
AND ng.crtTime BETWEEN #{crtTime[0]} AND #{crtTime[1]}
</if>
<!-- 部门集合 -->
<if test="involveDepartIds != null">
AND ng.involveDepartId IN
<foreach collection="involveDepartIds" item="involveDepartId" open="(" separator="," close=")">
#{involveDepartId}
</foreach>
</if>
</where>
GROUP BY sd.id, sd.short_name
ORDER BY `value` DESC
</select>
</mapper> </mapper>

Loading…
Cancel
Save