仁和社区修改

101captain

2022-01-15 6503ce8e94ff4c2999952c171dcec9b64a21b416

仁和社区修改

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java

@@ -51,18 +51,18 @@
    @PostMapping("addstreet")
    public R pageStreet(@RequestBody ComStreetVO comStreetVO) {
        R r = communityService.addStreet(comStreetVO);
        if (R.isOk(r)) {
            AdministratorsUserVO administratorsUserVO = new AdministratorsUserVO();
            administratorsUserVO.setAccount(comStreetVO.getAccount());
            administratorsUserVO.setPassword(comStreetVO.getPassword());
            administratorsUserVO.setType(4);
            administratorsUserVO.setAreaId(null);
            administratorsUserVO.setStatus(1);
            administratorsUserVO.setRoleId(999999999l);
            administratorsUserVO.setUserId(this.getUserId());
            administratorsUserVO.setCommunityId(this.getCommunityId());
            userService.addUserBackstage(administratorsUserVO);
        }
//        if (R.isOk(r)) {
//            AdministratorsUserVO administratorsUserVO = new AdministratorsUserVO();
//            administratorsUserVO.setAccount(comStreetVO.getAccount());
//            administratorsUserVO.setPassword(comStreetVO.getPassword());
//            administratorsUserVO.setType(4);
//            administratorsUserVO.setAreaId(null);
//            administratorsUserVO.setStatus(1);
//            administratorsUserVO.setRoleId(999999999l);
//            administratorsUserVO.setUserId(this.getUserId());
//            administratorsUserVO.setCommunityId(this.getCommunityId());
//            userService.addUserBackstage(administratorsUserVO);
//        }
        return r;
    }


 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/WorkGuideApi.java

@@ -73,6 +73,7 @@
    @ApiOperation(value = "办事指南分类_分页查询", response = ComActWorkGuideClassifyVO.class)
    @PostMapping("classify/apage")
    public R pageWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) {
        comActWorkGuideClassifyVO.setAreaCode(this.getAreaCode());
        return communityService.pageWorkGuideClassify(comActWorkGuideClassifyVO);
    }

@@ -86,6 +87,7 @@
    @ApiOperation(value = "办事指南分类_新增或修改")
    @PostMapping("classify/add")
    public R addWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) {
        comActWorkGuideClassifyVO.setAreaCode(this.getAreaCode());
        return communityService.addWorkGuideClassify(comActWorkGuideClassifyVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActWorkGuideDTO.java

@@ -55,5 +55,7 @@
    @ApiModelProperty("纬度")
    private String lat;

    private String areaCode;

    private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideClassifyVO.java

@@ -42,4 +42,6 @@

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize;

    private String areaCode;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java

@@ -28,4 +28,5 @@
    private String roleName;
    @ApiModelProperty(value = "所在社区", hidden = true)
    private Long communityId;
    private String areaCode;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java

@@ -78,7 +78,7 @@
    @Transactional(rollbackFor = Exception.class)
    public R delectStreat(@RequestBody List<Long> Ids) {
        R r = comStreetService.delectStreat(Ids);
        return R.ok(r);
        return r;
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideClassifyDO.java

@@ -47,4 +47,6 @@
    * 系统预置：1-是 0-否
    */
    private Integer sysFlag;

    private String areaCode;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWorkGuideClassifyMapper.xml

@@ -28,6 +28,9 @@
            <if test="comActWorkGuideClassifyVO.classifyName != null and comActWorkGuideClassifyVO.classifyName !=''">
                AND classify_name like concat ('%', #{comActWorkGuideClassifyVO.classifyName}, '%')
            </if>
            <if test="comActWorkGuideClassifyVO.areaCode != null and comActWorkGuideClassifyVO.areaCode !=''">
                AND area_code = #{comActWorkGuideClassifyVO.classifyName}
            </if>
        </where>
        order by create_at desc
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientServiceCategoryMapper.xml

@@ -35,7 +35,7 @@
                AND `name` LIKE concat('%', #{pageConvenientServiceCategoryDTO.name}, '%' )
            </if>
        <if test="pageConvenientServiceCategoryDTO.areaCode != null and pageConvenientServiceCategoryDTO.areaCode.trim() != &quot;&quot;">
            AND area_code = #{pageConvenientServiceCategoryDTO.name}
            AND area_code = #{pageConvenientServiceCategoryDTO.areaCode}
        </if>
        ORDER BY weight DESC
    </select>