From 2fa2fb8cf2df59d46a6a52a462a09e59621c6d5b Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 01 Apr 2024 14:57:05 +0800
Subject: [PATCH] 消防整改记录统计优化
---
src/main/java/org/springblade/modules/task/service/impl/TaskPlaceRectificationServiceImpl.java | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskPlaceRectificationServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskPlaceRectificationServiceImpl.java
index bb104d4..76ed7bf 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskPlaceRectificationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskPlaceRectificationServiceImpl.java
@@ -107,20 +107,20 @@
// 数据过滤 todo
String roleName = SpringUtils.getRequestParam("roleName");
String communityCode = SpringUtils.getRequestParam("communityCode");
- if (!Strings.isBlank(communityCode)){
+ if (!Strings.isBlank(communityCode)) {
// 校验社区编号是否合规
- if(null!=SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
+ if (null != SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
taskPlaceRectificationDTO.setCommunityCode(communityCode);
}
}
List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+ Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
// 网格编号集合
List<String> gridCodeList = new ArrayList<>();
// 民警角色
- if (!Strings.isBlank(roleName)){
+ if (!Strings.isBlank(roleName)) {
taskPlaceRectificationDTO.setRoleName(roleName);
- if(roleName.equals("mj")) {
+ if (roleName.equals("mj")) {
regionChildCodesList = SpringUtil.getBean(IPoliceAffairsGridService.class).getCommunityCodeListByUserId(AuthUtil.getUserId());
}
if (roleName.equals("wgy")) {
@@ -128,16 +128,16 @@
}
}
List<String> strings = new ArrayList<>();
- if (null!=taskPlaceRectificationDTO.getNineType()){
+ if (null != taskPlaceRectificationDTO.getNineType()) {
QueryWrapper<DictBiz> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0).eq("dict_key",taskPlaceRectificationDTO.getNineType()).eq("code","nineType");
+ queryWrapper.eq("is_deleted", 0).eq("dict_key", taskPlaceRectificationDTO.getNineType()).eq("code", "nineType");
// 先查询当前
DictBiz one = dictBizService.getOne(queryWrapper);
// 查询本身和子集的key
List<DictBiz> list = dictBizService.getList("nineType", one.getId());
- if (list.size()==0){
+ if (list.size() == 0) {
strings.add(taskPlaceRectificationDTO.getNineType());
- }else {
+ } else {
strings = list.stream().map(DictBiz::getDictKey).collect(Collectors.toList());
}
}
@@ -218,20 +218,20 @@
// 数据过滤 todo
String roleName = SpringUtils.getRequestParam("roleName");
String communityCode = SpringUtils.getRequestParam("communityCode");
- if (!Strings.isBlank(communityCode)){
+ if (!Strings.isBlank(communityCode)) {
// 校验社区编号是否合规
- if(null!=SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
+ if (null != SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
taskPlaceRectificationVO.setCommunityCode(communityCode);
}
}
List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+ Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
// 网格编号集合
List<String> gridCodeList = new ArrayList<>();
// 民警角色
- if (!Strings.isBlank(roleName)){
+ if (!Strings.isBlank(roleName)) {
taskPlaceRectificationVO.setRoleName(roleName);
- if(roleName.equals("mj")) {
+ if (roleName.equals("mj")) {
regionChildCodesList = SpringUtil.getBean(IPoliceAffairsGridService.class).getCommunityCodeListByUserId(AuthUtil.getUserId());
}
if (roleName.equals("wgy")) {
@@ -239,16 +239,16 @@
}
}
List<String> strings = new ArrayList<>();
- if (null!=taskPlaceRectificationVO.getNineType()){
+ if (null != taskPlaceRectificationVO.getNineType()) {
QueryWrapper<DictBiz> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0).eq("dict_key",taskPlaceRectificationVO.getNineType()).eq("code","nineType");
+ queryWrapper.eq("is_deleted", 0).eq("dict_key", taskPlaceRectificationVO.getNineType()).eq("code", "nineType");
// 先查询当前
DictBiz one = dictBizService.getOne(queryWrapper);
// 查询本身和子集的key
List<DictBiz> list = dictBizService.getList("nineType", one.getId());
- if (list.size()==0){
+ if (list.size() == 0) {
strings.add(taskPlaceRectificationVO.getNineType());
- }else {
+ } else {
strings = list.stream().map(DictBiz::getDictKey).collect(Collectors.toList());
}
}
@@ -446,7 +446,14 @@
// 获取请求头中的角色别名
String roleName = SpringUtils.getRequestParam("roleName");
if (AuthUtils.isMj(roleName)) {
- return baseMapper.getCount(neiCode, i, AuthUtil.getUserId());
+ // 民警角色
+ List<String> regionChildCodesList = SpringUtil.getBean(IPoliceAffairsGridService.class)
+ .getCommunityCodeListByUserId(AuthUtil.getUserId());
+ TaskPlaceRectificationDTO taskPlaceRectificationDTO = new TaskPlaceRectificationDTO();
+ taskPlaceRectificationDTO.setCommunityCode(neiCode);
+ taskPlaceRectificationDTO.setStatus(i);
+ taskPlaceRectificationDTO.setRoleName(roleName);
+ return baseMapper.getCount(taskPlaceRectificationDTO, regionChildCodesList, 2);
}
return 0;
}
--
Gitblit v1.9.3