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/TaskNoFraudReportingServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskNoFraudReportingServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskNoFraudReportingServiceImpl.java
index 23f6702..ef6896f 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskNoFraudReportingServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskNoFraudReportingServiceImpl.java
@@ -23,6 +23,7 @@
import org.springblade.common.constant.DictConstant;
import org.springblade.common.exception.CustomException;
import org.springblade.common.param.CommonParamSet;
+import org.springblade.common.param.GridSet;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
@@ -59,17 +60,18 @@
commonParamSet.getIsAdministrator(),
commonParamSet.getRegionChildCodesList(),
commonParamSet.getGridCodeList());
- // 上报数量
- for (TaskNoFraudReportingVO taskNoFraudReportingVO : taskNoFraudReportingVOS) {
- int number = 0;
- for (TaskPlaceRecordVO patrolRecord : taskNoFraudReportingVO.getTaskPlaceRecordVOList()) {
- if (StringUtils.isNotBlank(patrolRecord.getImageUrls())) {
- number++;
- }
- }
- taskNoFraudReportingVO.setNumber(number);
- }
return page.setRecords(taskNoFraudReportingVOS);
+ }
+
+ @Override
+ public Integer selectTaskNoFraudReportingCount(TaskNoFraudReportingVO taskNoFraudReporting) {
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskNoFraudReportingVO.class, taskNoFraudReporting);
+ Integer count = baseMapper.selectTaskNoFraudReportingCount(
+ taskNoFraudReporting,
+ commonParamSet.getIsAdministrator(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getGridCodeList());
+ return count;
}
@Override
@@ -88,6 +90,12 @@
return false;
}
taskNoFraudReporting.setTaskId(aLong);
+ // 计算网格
+ if (StringUtils.isNotBlank(taskNoFraudReporting.getLng()) && StringUtils.isNotBlank(taskNoFraudReporting.getLat())) {
+ // 点落面计算警格,网格,警格
+ GridSet invoke = new GridSet().invoke(TaskNoFraudReportingVO.class, taskNoFraudReporting,
+ "lng", "lat", "gridCode", "jwGridCode");
+ }
// 2.保存任务详情
boolean save = save(taskNoFraudReporting);
if (save) {
@@ -99,7 +107,7 @@
item.setCreateUser(AuthUtil.getUserId());
item.setType("2");
});
- List<TaskPlaceRecordEntity> collect = taskPlaceRecordList.stream().filter(item -> StringUtils.isNotBlank(item.getImageUrls())).collect(Collectors.toList());
+ List<TaskPlaceRecordEntity> collect = taskPlaceRecordList.stream().collect(Collectors.toList());
if (collect.size() > 0) {
bean.saveBatch(collect);
}
@@ -120,9 +128,15 @@
return taskNoExplosionExcels;
}
+ /**
+ * 更新
+ *
+ * @param taskNoFraudReporting
+ * @return
+ */
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean updateTaskNoFraudReporting(TaskNoFraudReportingVO taskNoFraudReporting){
+ public Boolean updateTaskNoFraudReporting(TaskNoFraudReportingVO taskNoFraudReporting) {
// 1.更新任务表
ITaskService taskService = SpringUtils.getBean(ITaskService.class);
Long aLong = taskService.updateTask(null, null, null, taskNoFraudReporting.getReasonFailure(), AuthUtil.getUserId(), taskNoFraudReporting.getTaskId(), taskNoFraudReporting.getStatus());
@@ -132,14 +146,17 @@
// 2.更新任务详情
boolean save = updateById(taskNoFraudReporting);
if (save) {
- // 3.更新题目记录
+ // 3.更新或新增题目记录
List<TaskPlaceRecordVO> taskPlaceRecordList = taskNoFraudReporting.getTaskPlaceRecordVOList();
if (taskPlaceRecordList != null && taskPlaceRecordList.size() > 0) {
ITaskPlaceRecordService bean = SpringUtil.getBean(ITaskPlaceRecordService.class);
- List<TaskPlaceRecordEntity> copy = BeanUtil.copy(taskPlaceRecordList, TaskPlaceRecordEntity.class);
- boolean b = bean.saveOrUpdateBatch(copy);
- if (b) {
- return b;
+ List<TaskPlaceRecordEntity> recordEntityList = BeanUtil.copy(taskPlaceRecordList, TaskPlaceRecordEntity.class);
+ for (TaskPlaceRecordEntity taskPlaceRecordEntity : recordEntityList) {
+ taskPlaceRecordEntity.setType("2");
+ }
+ boolean result = bean.saveOrUpdateBatch(recordEntityList);
+ if (result) {
+ return result;
}
throw new CustomException("保存失败!");
}
--
Gitblit v1.9.3