From fee8fbb72f73cc11075b07bf457ce2dd2a9ce19e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 05 Jul 2024 11:15:47 +0800
Subject: [PATCH] 无诈代码优化

---
 src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java |   21 ++++++++++++++++++---
 1 files changed, 18 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 d90ac8e..a266572 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
@@ -43,7 +43,9 @@
 import org.springblade.modules.house.vo.HouseRentalTenantVO;
 import org.springblade.modules.house.vo.HouseholdVO;
 import org.springblade.modules.place.service.IPlaceExtService;
+import org.springblade.modules.place.service.IPlacePractitionerService;
 import org.springblade.modules.place.service.IPlaceService;
+import org.springblade.modules.place.vo.PlacePractitionerVO;
 import org.springblade.modules.place.vo.PlaceVO;
 import org.springblade.modules.sms.service.ISmsSendService;
 import org.springblade.modules.task.entity.*;
@@ -272,7 +274,7 @@
 		// 消防自查
 		Integer xfzc = SpringUtils.getBean(ITaskPlaceSelfCheckService.class).getCount(neiCode, CommonConstant.NUMBER_ONE, CommonConstant.NUMBER_ONE);
 		// 校园安全隐患排除
-		Integer xyaqyhpc = 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);
 		// 居住证申请
@@ -291,7 +293,18 @@
 		long xyyh = taskSchoolEvenService.schoolEvenCount(taskSchoolEvenVO);
 		// 校园纠纷矛盾
 		taskSchoolEvenVO.setType(CommonConstant.NUMBER_TWO.toString());
-		long xyjfmd = taskSchoolEvenService.schoolEvenCount(taskSchoolEvenVO);;
+		long xyjfmd = taskSchoolEvenService.schoolEvenCount(taskSchoolEvenVO);
+		;
+
+		taskVO.setReportType(CommonConstant.NUMBER_FOUR);
+		// 校园安全检查
+		Integer xyaqjc = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
+			commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
+		PlacePractitionerVO placePractitionerVO = new PlacePractitionerVO();
+		placePractitionerVO.setConfirmFlag(CommonConstant.NUMBER_ONE);
+		// 从业人员审核
+		Integer cyrysh = SpringUtils.getBean(IPlacePractitionerService.class).selectPlacePractitionerCount(placePractitionerVO);
+
 		// 设置
 		objectObjectHashMap.put("qbhs", qbhs);// 取保候审
 		objectObjectHashMap.put("bqsj", bqsj);// 标签报事-二手交易
@@ -304,9 +317,11 @@
 		objectObjectHashMap.put("xfyhzg", xfyhzg);// 消防隐患整改
 		objectObjectHashMap.put("jzzsq", jzzsq);// 居住证申请
 		objectObjectHashMap.put("wztj", wztj);// 无诈
-		objectObjectHashMap.put("xyaqyhpc", xyaqyhpc);// 校园安全隐患排除
+		// objectObjectHashMap.put("xyaqyhpc", xyaqyhpc);// 校园安全隐患排除
 		objectObjectHashMap.put("xyyh", xyyh);// 校园隐患
 		objectObjectHashMap.put("xyjfmd", xyjfmd);// 校园纠纷矛盾
+		objectObjectHashMap.put("xyaqjc", xyaqjc);// 校园安全检查
+		objectObjectHashMap.put("cyrysh", cyrysh);// 从业人员审核
 		return objectObjectHashMap;
 	}
 

--
Gitblit v1.9.3