网格新增，查询修改

zhongrj

2024-02-20 32f523123a41d6ba1d9cfdfa2bc24df768204653

网格新增，查询修改

 src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml

@@ -5,7 +5,13 @@
    <!--自定义分页查询-->
    <select id="selectGridPage" resultType="org.springblade.modules.grid.vo.GridVO">
        select
        jg.id,jg.community_code,jg.grid_name,jg.principal,jg.principal_phone,jg.remark,
        jg.id,
        jg.community_code,
        jg.grid_name,
        jg.grid_code,
        jg.principal,
        jg.principal_phone,
        jg.remark,
        br.name as communityName,br.town_name as townName
        from jczz_grid jg
        left join blade_region br on br.code = jg.community_code
@@ -19,6 +25,9 @@
        <if test="grid.principal!=null and grid.principal!=''">
            and jg.principal like concat('%',#{grid.principal},'%')
        </if>
        <if test="grid.gridCode!=null and grid.gridCode!=''">
            and jg.grid_code like concat('%',#{grid.gridCode},'%')
        </if>
        <if test="grid.principalPhone!=null and grid.principalPhone!=''">
            and jg.principal_phone like concat('%',#{grid.principalPhone},'%')
        </if>

 src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java

@@ -210,6 +210,10 @@
    @Transactional(rollbackFor = Exception.class)
    public boolean saveOrUpdateGrid(GridEntity grid) {
        boolean flag = false;
        if (null!=grid.getId()) {
            // 更新
            flag = updateById(grid);
        }else {
        // 先查询当前网格社区对应的机构id
        QueryWrapper<Region> regionWrapper = new QueryWrapper<>();
        regionWrapper.eq("code",grid.getCommunityCode());
@@ -218,12 +222,14 @@
        System.out.println("社区名称 = " + region.getName());
        QueryWrapper<Dept> wrapper = new QueryWrapper<>();
        wrapper.eq("dept_name",region.getName())
                .eq("dept_nature", 2)
            .eq("is_deleted",0);
        Dept dept = deptService.getOne(wrapper);
        // 查询当前网格在机构中是否存在，存在不做操作，否则则新增
        QueryWrapper<Dept> wrapperChild = new QueryWrapper<>();
        wrapperChild.eq("dept_name",grid.getGridName())
            .eq("is_deleted",0)
                .eq("dept_nature", 2)
            .eq("parent_id",dept.getId());
        List<Dept> deptChild = deptService.list(wrapperChild);
        if (deptChild.size()==0){
@@ -232,6 +238,8 @@
            deptInfo.setFullName(grid.getGridName());
            deptInfo.setDeptName(grid.getGridName());
            deptInfo.setDeptCategory(1);
                // 综治
                deptInfo.setDeptNature(2);
            deptInfo.setTenantId("000000");
            deptInfo.setRegionCode(grid.getGridCode());
            deptInfo.setAncestors(dept.getAncestors() + "," +dept.getId());
@@ -258,6 +266,7 @@
                flag = save(grid);
            }
        }
        }
        return flag;
    }