From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
index 78063b6..e904888 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -128,11 +128,13 @@
@Override
public IPage<TaskVO> getBailReportingPage(IPage<TaskVO> page, TaskVO task) {
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskVO.class, task);
// 民警角色
if (AuthUtil.getUserRole().equals("mj")) {
- CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskVO.class, task);
task.setUserId(AuthUtil.getUserId());
- return page.setRecords(baseMapper.selectTaskPageBy(page, task, commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator()));
+ return page.setRecords(baseMapper.selectTaskPageBy(page, task,
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator()));
} else {
if (AuthUtil.getUserAccount().equals("18879306957")) {
task.setCommunityCode("361102003027");
@@ -142,7 +144,12 @@
task.setUserId(AuthUtil.getUserId());
}
// 非民警角色
- List<TaskVO> taskVOS = baseMapper.getBailReportingPage(page, task);
+ List<TaskVO> taskVOS = baseMapper.getBailReportingPage(page,
+ task,
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getGridCodeList(),
+ commonParamSet.getIsAdministrator());
+ // 返回
return page.setRecords(taskVOS);
}
}
@@ -233,7 +240,8 @@
Integer zhsh = iHouseholdService.statistics(roleType > 0 ? AuthUtil.getUserId() : null, neiCode,0);
// 出租审核
HouseRentalTenantVO houseRentalTenantVO = new HouseRentalTenantVO();
- houseRentalTenantVO.setNeiCode(neiCode);
+ houseRentalTenantVO.setCommunityCode(neiCode);
+ houseRentalTenantVO.setAuditStatus(2);
Integer czsh = iHouseRentalService.getStatisticsCount(houseRentalTenantVO);
// 场所审核
Integer cssh = SpringUtils.getBean(IPlaceExtService.class).selectCount(roleType > 0 ? AuthUtil.getUserId() : null, neiCode, 1);
@@ -245,6 +253,8 @@
Integer xfzc = SpringUtils.getBean(ITaskPlaceSelfCheckService.class).getCount(neiCode, 1);
// 消防隐患整改
Integer xfyhzg = SpringUtils.getBean(ITaskPlaceRectificationService.class).getCount(neiCode, 1);
+ // 居住证申请
+ Integer jzzsq = SpringUtils.getBean(ITaskResidencePermitApplyService.class).getCount(neiCode, 1);
// 设置
objectObjectHashMap.put("qbhs", qbhs);// 取保候审
objectObjectHashMap.put("bqsj", bqsj);// 标签报事-二手交易
@@ -255,6 +265,7 @@
objectObjectHashMap.put("zfrw", zfrw);// 走访日志
objectObjectHashMap.put("xfzc", xfzc);// 消防自查
objectObjectHashMap.put("xfyhzg", xfyhzg);// 消防隐患整改
+ objectObjectHashMap.put("jzzsq", jzzsq);// 居住证申请
return objectObjectHashMap;
}
--
Gitblit v1.9.3