From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计

---
 src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java |   47 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 32 insertions(+), 15 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..d90ac8e 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
@@ -20,6 +20,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -48,10 +49,9 @@
 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.TaskNoFraudReportingVO;
+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;
-import org.springblade.modules.task.service.ITaskPlaceSelfCheckService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -271,16 +271,27 @@
 		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);
 		// 居住证申请
 		Integer jzzsq = residencePermitApplyService.getCount(neiCode, CommonConstant.NUMBER_ONE);
 		// 无诈统计
-		taskVO.setReportType(6);
-		Integer wztj = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
-			commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
+		ITaskNoFraudReportingService noFraudReportingService = SpringUtils.getBean(ITaskNoFraudReportingService.class);
+		TaskNoFraudReportingVO taskNoFraudReportingVO = new TaskNoFraudReportingVO();
+		taskNoFraudReportingVO.setStatus(1);
+		Integer wztj = noFraudReportingService.selectTaskNoFraudReportingCount(taskNoFraudReportingVO);
+
+		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 +304,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 +401,11 @@
 //		String params = jsonParam.getString("params");
 		boolean flag = false;
 		// 校园安全自查任务生成
-		createCampusReportingTask();
+//		createCampusReportingTask();
 		// 打金店/二手车/二手手机任务生成
-		createLabelReportingTask();
+//		createLabelReportingTask();
 		// 旅馆安全自查任务生成
-		createHotelReportingTask();
+//		createHotelReportingTask();
 		// 人员类-肇事肇祸精神障碍患者走访任务生成
 		createGridWordTask();
 		// 返回
@@ -666,9 +679,13 @@
 		} else if (task.getReportType().equals(CommonConstant.REPORT_TYPE_NO_FRAUD)) {
 			// 如果报告类型为无诈,尝试更新无诈报告状态
 			ITaskNoFraudReportingService bean = SpringUtils.getBean(ITaskNoFraudReportingService.class);
-			return bean.update(Wrappers.<TaskNoFraudReportingEntity>lambdaUpdate()
-				.set(TaskNoFraudReportingEntity::getStatus, task.getStatus())
-				.eq(TaskNoFraudReportingEntity::getTaskId, task.getId()));
+			LambdaUpdateWrapper<TaskNoFraudReportingEntity> objectLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+			if (StringUtils.isNotBlank(task.getHouseCode())) {
+				objectLambdaUpdateWrapper.set(TaskNoFraudReportingEntity::getHouseCode, task.getHouseCode());
+			}
+			objectLambdaUpdateWrapper.set(TaskNoFraudReportingEntity::getStatus, task.getStatus());
+			objectLambdaUpdateWrapper.eq(TaskNoFraudReportingEntity::getTaskId, task.getId());
+			return bean.update(objectLambdaUpdateWrapper);
 		}
 		// 如果没有匹配的报告类型,返回false
 		return false;

--
Gitblit v1.9.3