From ebd41b7b2e44dc8b96f177d7bf88d2f5f997b75c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 28 Apr 2024 14:30:07 +0800
Subject: [PATCH] 民警导入修改
---
src/main/java/org/springblade/modules/task/service/impl/TaskNoFraudReportingServiceImpl.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 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..092130d 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
@@ -59,16 +59,6 @@
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);
}
@@ -99,7 +89,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,6 +110,11 @@
return taskNoExplosionExcels;
}
+ /**
+ * 更新
+ * @param taskNoFraudReporting
+ * @return
+ */
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateTaskNoFraudReporting(TaskNoFraudReportingVO taskNoFraudReporting){
@@ -132,14 +127,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