From 9ba12dad011e2afa278833f37aba895a632ccb9c Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 06 May 2024 14:45:16 +0800
Subject: [PATCH] 校园安全检查

---
 src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 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 0228a5f..bbfb817 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
@@ -48,6 +48,7 @@
 import org.springblade.modules.task.entity.*;
 import org.springblade.modules.task.mapper.TaskMapper;
 import org.springblade.modules.task.service.*;
+import org.springblade.modules.task.vo.TaskSchoolEvenVO;
 import org.springblade.modules.task.vo.TaskVO;
 import org.springblade.modules.task.service.ITaskPlaceRectificationService;
 import org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity;
@@ -271,8 +272,8 @@
 		Integer zfrw = SpringUtils.getBean(IGridWorkLogService.class).getGridWorkCountHandleCount(gridCode, CommonConstant.NUMBER_ONE);
 		// 消防自查
 		Integer xfzc = SpringUtils.getBean(ITaskPlaceSelfCheckService.class).getCount(neiCode, CommonConstant.NUMBER_ONE, CommonConstant.NUMBER_ONE);
-		// 校园检查
-		Integer xyjc = SpringUtils.getBean(ITaskPlaceSelfCheckService.class).getCount(neiCode, CommonConstant.NUMBER_ONE, CommonConstant.NUMBER_TWO);
+		// 校园安全隐患排除
+		Integer xyaqyhpc = SpringUtils.getBean(ITaskPlaceSelfCheckService.class).getCount(neiCode, CommonConstant.NUMBER_ONE, CommonConstant.NUMBER_TWO);
 		// 消防隐患整改
 		Integer xfyhzg = SpringUtils.getBean(ITaskPlaceRectificationService.class).getCount(neiCode, CommonConstant.NUMBER_ONE);
 		// 居住证申请
@@ -281,6 +282,17 @@
 		taskVO.setReportType(6);
 		Integer wztj = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
 			commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
+		ITaskSchoolEvenService taskSchoolEvenService = SpringUtils.getBean(ITaskSchoolEvenService.class);
+		TaskSchoolEvenVO taskSchoolEvenVO = new TaskSchoolEvenVO();
+//		taskSchoolEvenVO.setIsReporting(CommonConstant.NUMBER_ONE.toString());
+//		taskSchoolEvenVO.setIsHandle(CommonConstant.NUMBER_TWO.toString());
+		taskSchoolEvenVO.setConfirmFlag(CommonConstant.NUMBER_ONE.toString());
+		taskSchoolEvenVO.setType(CommonConstant.NUMBER_ONE.toString());
+		// 校园隐患
+		long xyyh = taskSchoolEvenService.schoolEvenCount(taskSchoolEvenVO);
+		// 校园纠纷矛盾
+		taskSchoolEvenVO.setType(CommonConstant.NUMBER_TWO.toString());
+		long xyjfmd = taskSchoolEvenService.schoolEvenCount(taskSchoolEvenVO);;
 		// 设置
 		objectObjectHashMap.put("qbhs", qbhs);// 取保候审
 		objectObjectHashMap.put("bqsj", bqsj);// 标签报事-二手交易
@@ -293,7 +305,9 @@
 		objectObjectHashMap.put("xfyhzg", xfyhzg);// 消防隐患整改
 		objectObjectHashMap.put("jzzsq", jzzsq);// 居住证申请
 		objectObjectHashMap.put("wztj", wztj);// 无诈
-		objectObjectHashMap.put("xyjc", xyjc);// 校园检查
+		objectObjectHashMap.put("xyaqyhpc", xyaqyhpc);// 校园安全隐患排除
+		objectObjectHashMap.put("xyyh", xyyh);// 校园隐患
+		objectObjectHashMap.put("xyjfmd", xyjfmd);// 校园纠纷矛盾
 		return objectObjectHashMap;
 	}
 

--
Gitblit v1.9.3