Merge remote-tracking branch 'origin/master'

lin

2024-04-10 d3c223eaa4df46d17c138ef8ed5eab8da9638416

 src/main/java/org/springblade/modules/task/service/impl/TaskPlaceSelfCheckServiceImpl.java

@@ -141,7 +141,7 @@
      // 1.保存任务表
      ITaskService bean2 = SpringUtils.getBean(ITaskService.class);
      Long aLong = bean2.saveTask(CommonConstant.NUMBER_ONE, DictConstant.FIRE_SELF_CHECK_NOTICE, 1,
         "", AuthUtil.getUserId(), taskPlaceSelfCheck.getHouseCode(), CommonConstant.NUMBER_TWO, 1);
         "", AuthUtil.getUserId(), taskPlaceSelfCheck.getHouseCode(), CommonConstant.NUMBER_SEVEN, 1);
      if (aLong <= 0) {
         return false;
      }
@@ -155,6 +155,7 @@
         taskPlaceRecordList.stream().forEach(item -> {
            item.setTaskPlaceSelfCheckId(taskPlaceSelfCheck.getId());
            item.setCreateUser(AuthUtil.getUserId());
            item.setType("1");
         });
         List<TaskPlaceRecordEntity> collect = taskPlaceRecordList.stream().filter(item -> item.getState().equals(0)).collect(Collectors.toList());
         if (collect.size() > 0) {
@@ -251,4 +252,9 @@
      }
      return 0;
   }

   @Override
   public TaskPlaceSelfCheckEntity getDetailByTaskId(Long taskId) {
      return baseMapper.getDetailByTaskId( taskId);
   }
}