From dde162ffb34f2cc0ece4ca9cfcd09e2cb42ace6d Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 17 May 2024 18:13:11 +0800
Subject: [PATCH] 租户导入导出

---
 src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 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 91c82c2..1950ef4 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,15 @@
 		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.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 +303,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;
 	}
 
@@ -388,11 +400,11 @@
 //		String params = jsonParam.getString("params");
 		boolean flag = false;
 		// 校园安全自查任务生成
-		createCampusReportingTask();
+//		createCampusReportingTask();
 		// 打金店/二手车/二手手机任务生成
-		createLabelReportingTask();
+//		createLabelReportingTask();
 		// 旅馆安全自查任务生成
-		createHotelReportingTask();
+//		createHotelReportingTask();
 		// 人员类-肇事肇祸精神障碍患者走访任务生成
 		createGridWordTask();
 		// 返回

--
Gitblit v1.9.3