住户删除不能排除

lin

2024-04-17 2af148a7b15f1273d12be7b910bc6d9e4e41d2c2

 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("保存失败！");
         }