bug修改

101captain

2022-07-16 0e3937933f04b2fc0600f04f41ac87a96f61e3d3

bug修改

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidCheckRecordApi.java

@@ -42,7 +42,7 @@
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComActAcidCheckRecordVO.class)
    @OperLog(operModul = "分页查询排查数据",operType = 1)
    //@OperLog(operModul = "分页查询排查数据",operType = 1)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody ComActAcidCheckRecordDTO comActAcidCheckRecordDTO) {
        return this.communityService.selectAllComActAcidCheckRecord(comActAcidCheckRecordDTO);
@@ -54,7 +54,7 @@
     * @param id 主键
     * @return 单条数据
     */
    @OperLog(operModul = "查询单条排查数据",operType = 1)
    //@OperLog(operModul = "查询单条排查数据",operType = 1)
    @ApiOperation(value = "通过主键查询单条数据",response = ComActAcidCheckRecordVO.class)
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
@@ -67,7 +67,7 @@
     * @param comActAcidCheckRecordVO 实体对象
     * @return 新增结果
     */
    @OperLog(operModul = "新增排查数据",operType = 1)
    //@OperLog(operModul = "新增排查数据",operType = 1)
    @ApiOperation(value = "新增数据")
    @PostMapping
    public R insert(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO) {
@@ -81,7 +81,7 @@
     * @param comActAcidCheckRecordVO 实体对象
     * @return 修改结果
     */
    @OperLog(operModul = "修改排查数据",operType = 1,businessType = Constants.UPDATE)
    //@OperLog(operModul = "修改排查数据",operType = 1,businessType = Constants.UPDATE)
    @ApiOperation(value = "修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO) {

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidDangerMemberApi.java

@@ -40,7 +40,7 @@
    @Resource
    private CommunityService communityService;

    @OperLog(operModul = "后台查询风险人员",operType = 1)
    //@OperLog(operModul = "后台查询风险人员",operType = 1)
    @ApiOperation(value = "后台分页查询风险人员", response = ComActAcidDangerMemberVO.class)
    @PostMapping("/queryAll")
    public R pageDangerMember(@RequestBody @Valid ComActAcidDangerMemberDTO pageDangerMemberDTO) {

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidMemberApi.java

@@ -42,7 +42,7 @@
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @OperLog(operModul = "分页查询防疫工作人员列表",operType = 1)
    //@OperLog(operModul = "分页查询防疫工作人员列表",operType = 1)
    @ApiOperation(value = "分页查询列表",response = ComActAcidMemberVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody ComActAcidMemberDTO commonPage) {
@@ -56,7 +56,7 @@
     * @param id 主键
     * @return 单条数据
     */
    @OperLog(operModul = "查询单条防疫工作人员信息",operType = 1)
    //@OperLog(operModul = "查询单条防疫工作人员信息",operType = 1)
    @ApiOperation("通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
@@ -69,7 +69,7 @@
     * @param comActAcidMemberVO 实体对象
     * @return 新增结果
     */
    @OperLog(operModul = "新增防疫工作人员记录",operType = 1)
    //@OperLog(operModul = "新增防疫工作人员记录",operType = 1)
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActAcidMemberVO comActAcidMemberVO) {
@@ -84,7 +84,7 @@
     * @param comActAcidMemberVO 实体对象
     * @return 修改结果
     */
    @OperLog(operModul = "修改防疫工作人员信息",operType = 1,businessType = Constants.UPDATE)
    //@OperLog(operModul = "修改防疫工作人员信息",operType = 1,businessType = Constants.UPDATE)
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActAcidMemberVO comActAcidMemberVO) {
@@ -97,7 +97,7 @@
     * @param id 主键结合
     * @return 删除结果
     */
    @OperLog(operModul = "删除防疫工作人员信息",operType = 1)
    //@OperLog(operModul = "删除防疫工作人员信息",operType = 1)
    @ApiOperation("删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java

@@ -80,7 +80,7 @@
     * @param comActAcidRecordDTO 查询实体
     * @return 所有数据
     */
    @OperLog(operModul = "查询防疫登记信息列表",operType = 1)
    //@OperLog(operModul = "查询防疫登记信息列表",operType = 1)
    @ApiOperation(value = "分页查询",response = ComActAcidRecordVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) {
@@ -105,7 +105,7 @@
     * @param id 主键
     * @return 单条数据
     */
    @OperLog(operModul = "查询单条防疫信息",operType = 1)
    //@OperLog(operModul = "查询单条防疫信息",operType = 1)
    @ApiOperation(value = "通过主键查询单条数据",response = ComActAcidRecordVO.class)
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
@@ -118,7 +118,7 @@
     * @param comActAcidRecordVO 实体对象
     * @return 新增结果
     */
    @OperLog(operModul = "新增防疫信息数据",operType = 1)
    //@OperLog(operModul = "新增防疫信息数据",operType = 1)
    @ApiOperation(value = "新增数据")
    @PostMapping
    public R insert(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
@@ -131,7 +131,7 @@
     * @param comActAcidRecordVO 实体对象
     * @return 修改结果
     */
    @OperLog(operModul = "修改防疫信息数据",operType = 1,businessType = Constants.UPDATE)
    //@OperLog(operModul = "修改防疫信息数据",operType = 1,businessType = Constants.UPDATE)
    @ApiOperation(value = "修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
@@ -145,14 +145,14 @@
     * @param id 主键结合
     * @return 删除结果
     */
    @OperLog(operModul = "删除防疫信息数据",operType = 1)
    //@OperLog(operModul = "删除防疫信息数据",operType = 1)
    @ApiOperation(value = "删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.deleteComActAcidRecord(id);
    }

    @OperLog(operModul = "导出防疫信息",operType = 1)
    //@OperLog(operModul = "导出防疫信息",operType = 1)
    @ApiOperation(value = "导出")
    @PostMapping("/export")
    public R export(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) {
@@ -376,7 +376,7 @@
     * 5项常规统计
     * @return
     */
    @OperLog(operModul = "防疫信息五项常规统计",operType = 1)
    //@OperLog(operModul = "防疫信息五项常规统计",operType = 1)
    @ApiOperation(value = "5项常规统计",response = FiveCount.class)
    @GetMapping("fiveCount")
    public R fiveCount(@RequestParam("localCity")String localCity){
@@ -387,7 +387,7 @@
     * 5项常规统计
     * @return
     */
    @OperLog(operModul = "防疫信息7项常规统计",operType = 1)
    //@OperLog(operModul = "防疫信息7项常规统计",operType = 1)
    @ApiOperation(value = "7项常规统计",response = FiveCount.class)
    @GetMapping("fiveCountPlus")
    public R fiveCountPlus(@RequestParam("date")String date,@RequestParam(value = "localCity",required = false)String localCity){
@@ -398,7 +398,7 @@
    }


    @OperLog(operModul = "防疫信息报表统计",operType = 1)
    //@OperLog(operModul = "防疫信息报表统计",operType = 1)
    @ApiOperation(value = "报表统计",response = ComAcidStaticVO.class)
    @GetMapping("/statics")
    public R statics(@RequestParam("date")String date){

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java

@@ -145,7 +145,7 @@
        return partyBuildingService.getPbOrgAllList(partyOrganizationVO);
    }

    @OperLog(operModul = "党支部管理", operType = 1)
    //@OperLog(operModul = "党支部管理", operType = 1)
    @ApiOperation(value = "新增党支部")
    @PostMapping("addpartyorganization")
    public R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
@@ -155,7 +155,7 @@
        return r;
    }

    @OperLog(operModul = "党支部管理", operType = 2)
    //@OperLog(operModul = "党支部管理", operType = 2)
    @ApiOperation(value = "编辑党支部")
    @PostMapping("updatepartyorganization")
    public R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
@@ -166,7 +166,7 @@
        return partyBuildingService.updatePartyOrganization(partyOrganizationVO);
    }

    @OperLog(operModul = "党支部管理", operType = 3)
    //@OperLog(operModul = "党支部管理", operType = 3)
    @ApiOperation(value = "启用、禁用党支部")
    @PutMapping("resetpartyorganization")
    public R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
@@ -181,7 +181,7 @@
        return partyBuildingService.resetPartyOrganization(partyOrganizationVO);
    }

    @OperLog(operModul = "党支部管理", operType = 4)
    //@OperLog(operModul = "党支部管理", operType = 4)
    @ApiOperation(value = "删除党支部")
    @DeleteMapping("deletepartyorganization")
    public R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
@@ -192,7 +192,7 @@
        return partyBuildingService.deletePartyOrganization(partyOrganizationVO);
    }

    @OperLog(operModul = "党员管理", operType = 1)
    //@OperLog(operModul = "党员管理", operType = 1)
    @ApiOperation(value = "新增党员")
    @PostMapping("addpartybuildingmember")
    public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
@@ -207,7 +207,7 @@
        return r;
    }

    @OperLog(operModul = "党员管理", operType = 2)
    //@OperLog(operModul = "党员管理", operType = 2)
    @ApiOperation(value = "编辑党员")
    @PutMapping("updatepartybuildingmember")
    public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
@@ -468,7 +468,7 @@
        return userService.listIdentity(communityId);
    }

    @OperLog(operModul = "党委管理", operType = 1)
    //@OperLog(operModul = "党委管理", operType = 1)
    @ApiOperation(value = "新增党委")
    @PostMapping("addpartycommittee")
    public R addPartyCommittee(@RequestBody @Validated(AddGroup.class) PartyCommitteeVO partyCommitteeVO) {
@@ -481,7 +481,7 @@
        return r;
    }

    @OperLog(operModul = "党委管理", operType = 2)
    //@OperLog(operModul = "党委管理", operType = 2)
    @ApiOperation(value = "编辑党委")
    @PutMapping("updatepartycommittee")
    public R updatePartyCommittee(@RequestBody @Validated(AddGroup.class) PartyCommitteeVO partyCommitteeVO) {
@@ -494,7 +494,7 @@
        return partyBuildingService.updatePartyCommittee(partyCommitteeVO);
    }

    @OperLog(operModul = "党委管理", operType = 3)
    //@OperLog(operModul = "党委管理", operType = 3)
    @ApiOperation(value = "删除党委")
    @DeleteMapping("deletepartycommittee")
    public R deletePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
@@ -572,7 +572,7 @@
        return partyBuildingService.deleteYnamic(id);
    }

    @OperLog(operModul = "党员管理", operType = 3)
    //@OperLog(operModul = "党员管理", operType = 3)
    @ApiOperation(value = "删除党员")
    @DeleteMapping("deletepartybuildingmember")
    public R deleteDynUser(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
@@ -1047,7 +1047,7 @@
        return partyBuildingService.checkMember(idCard);
    }

    @OperLog(operModul = "党员管理", operType = 1)
    //@OperLog(operModul = "党员管理", operType = 1)
    @ApiOperation(value = "分页查询党员列表",response = PartyBuildingMemberVO.class)
    @PostMapping("/page/member")
    public R pageMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java

@@ -41,7 +41,7 @@

    @ApiOperation(value = "新增社区后台账户")
    @PostMapping("user")
    @OperLog(operModul = "用户管理", operType = 1)
    //@OperLog(operModul = "用户管理", operType = 1)
    public R addUser(@RequestBody @Validated(AddGroup.class) AdministratorsUserVO administratorsUserVO) {
        administratorsUserVO.setType(3);
        administratorsUserVO.setAreaId(null);
@@ -51,7 +51,7 @@

    @ApiOperation(value = "编辑社区后台账户")
    @PutMapping("user")
    @OperLog(operModul = "用户管理", operType = 2)
    //@OperLog(operModul = "用户管理", operType = 2)
    public R putUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO) {
        Long userId = administratorsUserVO.getUserId();
        if (null == userId || 0 == userId) {
@@ -69,7 +69,7 @@

    @ApiOperation(value = "删除后台用户")
    @DeleteMapping("user")
    @OperLog(operModul = "用户管理", operType = 3)
    //@OperLog(operModul = "用户管理", operType = 3)
    public R deleteUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO) {
        Long userId = administratorsUserVO.getUserId();
        if (null == userId || 0 == userId) {
@@ -95,7 +95,7 @@

    // @ApiOperation(value = "新增角色")
    // @PostMapping("role")
    // @OperLog(operModul = "角色管理",operType = 1)
     //@OperLog(operModul = "角色管理",operType = 1)
    // public R addRoleBackstage(@RequestBody RoleVO roleVO){
    // String roleName = roleVO.getRoleName();
    // if (ObjectUtils.isEmpty(roleName)) {
@@ -112,7 +112,7 @@

    @ApiOperation(value = "删除角色")
    @DeleteMapping("role")
    @OperLog(operModul = "角色管理", operType = 3)
    //@OperLog(operModul = "角色管理", operType = 3)
    public R deleteRoleBackstage(@RequestBody RoleVO roleVO) {
        Long roleId = roleVO.getRoleId();
        if (null == roleId || 0 == roleId) {
@@ -138,7 +138,7 @@

    @ApiOperation(value = "新增角色-设置角色的权限")
    @PostMapping("menu")
    @OperLog(operModul = "角色管理", operType = 1)
    //@OperLog(operModul = "角色管理", operType = 1)
    public R addMenuRole(@RequestBody @Validated MenuRoleVO menuRoleVO) {
        RoleVO roleVO = new RoleVO();
        String roleName = menuRoleVO.getRoleName();
@@ -166,7 +166,7 @@

    @ApiOperation(value = "设置角色的权限")
    @PutMapping("menu")
    @OperLog(operModul = "角色管理", operType = 2)
    //@OperLog(operModul = "角色管理", operType = 2)
    public R putMenuRole(@RequestBody @Validated MenuRoleVO menuRoleVO) {
        menuRoleVO.setCommunityId(this.getCommunityId());
        return userService.putMenuRole(menuRoleVO);
@@ -216,7 +216,7 @@

    @ApiOperation(value = "编辑用户协议")
    @PutMapping("agreement")
    @OperLog(operModul = "用户协议", operType = 2)
    //@OperLog(operModul = "用户协议", operType = 2)
    public R putAgreement(@RequestBody SysUserAgreementVO sysUserAgreementVO) {
        Long id = sysUserAgreementVO.getId();
        if (null == id || id == 0) {