报警记录添加字段+从业人员修改信息更新生日

lin

2024-03-15 adda3ce6f8b337dd7c6f238716d37bd520b8e7eb

 src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java

@@ -212,8 +212,27 @@
      gridBind(placeVO);
      // 警务网格绑定
      jwGridCodeBind(placeVO);
      // 保存从业人员
      savePlacePractitioner(placeVO);
      // 返回结果
      return flag;
   }


   /**
    * 保存从业人员
    *
    * @param placeVO
    */
   private void savePlacePractitioner(PlaceVO placeVO) {
      if (placeVO.getPlacePractitioner() != null) {
         IPlacePractitionerService practitionerService = SpringUtil.getBean(IPlacePractitionerService.class);
         List<PlacePractitionerEntity> placePractitioner = placeVO.getPlacePractitioner();
         for (PlacePractitionerEntity placePractitionerEntity : placePractitioner) {
            placePractitionerEntity.setPlaceId(placeVO.getId());
         }
         practitionerService.saveOrUpdateBatch(placeVO.getPlacePractitioner());
      }
   }

   /**
@@ -715,13 +734,16 @@
   @Transactional(rollbackFor = Exception.class)
   public void savePlaceExtAndTaskInfo(PlaceVO placeVO) {
      PlaceExtEntity placeExtEntity = new PlaceExtEntity();
      placeExtEntity.setPlaceId(placeVO.getId());
      // 判断是否已存在，已存在则不新增
      QueryWrapper<PlaceExtEntity> wrapper = new QueryWrapper<>();
      wrapper.eq("is_deleted", 0)
         .eq("place_id", placeVO.getId());
      PlaceExtEntity one = placeExtService.getOne(wrapper);
      if (null == one) {
      PlaceExtEntity extServiceOne = placeExtService.getOne(wrapper);
      if (null == extServiceOne) {
         // 判断是否有传
         if (placeVO.getPlaceExtEntity() != null) {
            placeExtEntity = placeVO.getPlaceExtEntity();
         }
         placeExtEntity.setPlaceId(placeVO.getId());
         // 默认给待完善状态
         placeExtEntity.setConfirmFlag(4);
@@ -732,7 +754,9 @@
         // 新增场所详情
         placeExtService.save(placeExtEntity);
      } else {
         placeExtService.updateById(placeVO.getPlaceExtEntity());
         if (placeVO.getPlaceExtEntity() != null) {
            placeExtService.updateById(placeVO.getPlaceExtEntity());
         }
      }
   }

@@ -851,6 +875,11 @@
            QueryWrapper<PlaceExtEntity> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("is_deleted", 0).eq("place_id", placeVO.getId());
            placeVO.setPlaceExtEntity(placeExtService.getOne(queryWrapper));
            // 查询从业人员
            IPlacePractitionerService placePractitionerService = SpringUtils.getBean(IPlacePractitionerService.class);
            List<PlacePractitionerEntity> entityList = placePractitionerService.list(Wrappers.<PlacePractitionerEntity>lambdaQuery()
               .eq(PlacePractitionerEntity::getPlaceId, placeVO.getId()));
            placeVO.setPlacePractitioner(entityList);
            // 查询绑定的房屋
            placeVO.setHouseBindList(baseMapper.getHouseBindMap(placeVO.getHouseCodeBinds()));
         }