场所信息修改调整

zhongrj

2023-12-26 eeb181daded35d7d03ea94fcad91d6394d6dd807

场所信息修改调整

 src/main/java/org/springblade/modules/place/controller/PlaceController.java

@@ -110,6 +110,17 @@
        return R.status(placeService.addOrUpdate(placeVO));
    }


    /**
     * 自定义新增/修改
     * @param placeVO
     * @return
     */
    @PostMapping("/addOrUpdate")
    public R addOrUpdate(@RequestBody PlaceVO placeVO){
        return R.status(placeService.addOrUpdate(placeVO));
    }

    /**
     * 场所表 修改
     */

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

@@ -198,7 +198,7 @@
        if (null!=placeVO.getGridId()){
            // 判断关联关系表是否存在
            QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
            wrapper.eq("grid_id",placeVO.getGridId()).eq("house_code",placeVO.getHouseCode());
            wrapper.eq("house_code",placeVO.getHouseCode());
            GridRangeEntity one = gridRangeService.getOne(wrapper);
            if (null==one){
                // 新增
@@ -207,6 +207,11 @@
                gridRangeEntity.setGridId(placeVO.getGridId());
                // 插入
                gridRangeService.save(gridRangeEntity);
            }else {
                // 修改绑定
                one.setGridId(placeVO.getGridId());
                // 修改
                gridRangeService.updateById(one);
            }
        }else {
            // 判断网格员，查询对应网格人对应的网格id
@@ -326,12 +331,12 @@
    @Transactional(rollbackFor = Exception.class)
    public User bindUserHandle(PlaceVO placeVO) {
        User newUser = new User();
        if (null!=placeVO.getPhone() && !placeVO.getPhone().equals("")) {
            placeVO.setPrincipal(placeVO.getUsername());
            placeVO.setPrincipalPhone(placeVO.getPhone());
        if (null!=placeVO.getPrincipalPhone() && !placeVO.getPrincipalPhone().equals("")) {
            placeVO.setPrincipal(placeVO.getPrincipal());
            placeVO.setPrincipalPhone(placeVO.getPrincipalPhone());
            //根据手机号查询库里的数据
            User userParams = new User();
            userParams.setPhone(placeVO.getPhone());
            userParams.setPhone(placeVO.getPrincipalPhone());
            User user = userService.getOne(Condition.getQueryWrapper(userParams));

            if (null!=user) {
@@ -346,10 +351,10 @@
                }
            } else {
                //如果用户不存在，则新增一个用户
                newUser.setAccount(placeVO.getPhone());
                newUser.setPhone(placeVO.getPhone());
                newUser.setName(placeVO.getUsername());
                newUser.setRealName(placeVO.getUsername());
                newUser.setAccount(placeVO.getPrincipalPhone());
                newUser.setPhone(placeVO.getPrincipalPhone());
                newUser.setName(placeVO.getPrincipal());
                newUser.setRealName(placeVO.getPrincipal());
                // 社区群众部门
                newUser.setDeptId("1727979636479037441");
                // 目前暂定居民角色，