Merge branch 'huacheng' into huacheng_test

101captain

2022-07-06 d6578ec702eb4fcff690d71ea3237a885f46b85c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -36,6 +36,8 @@
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
import com.panzhihua.common.model.vos.community.social.*;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import com.panzhihua.common.model.vos.community.*;
import org.springframework.beans.BeanUtils;
@@ -5921,6 +5923,30 @@
    @PostMapping("/neighbor/deleteNeighborByApp")
    R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO);


    /**
     * 分页查询邻里圈列表
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈列表
     */
    @PostMapping("/neighbor/selectSolve")
    R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);


    /**
     * 修改数据
     * @param editNeighborCircleAdminVO
     * @return
     */
    @PostMapping("/neighbor/update")
    R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);

    @PostMapping("/neighbor/serviceStatic")
    R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO);


    /**
     * 获取系统配置value
     * @param key   系统配置code
@@ -6972,6 +6998,14 @@
     */
    @PostMapping("/building/house/population/delete/admin")
    R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto);

    /**
     * 删除楼栋
     * @param id
     * @return
     */
    @GetMapping("/building/delete")
    R buildingDelete(@RequestParam("id")Long id);

    /**
     * 分页查询所有数据
@@ -9594,6 +9628,16 @@
    @PostMapping("/comActAcidRecord/update")
    R updateComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO);


    /**
     * 小程序修改填报记录
     *
     * @param comActAcidRecordVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActAcidRecord/updateApplets")
    R updateApplets(@RequestBody ComActAcidRecordVO comActAcidRecordVO);

    /**
     * 删除数据
     *
@@ -9602,6 +9646,18 @@
     */
    @GetMapping("/comActAcidRecord/del")
    R deleteComActAcidRecord(@RequestParam("id") Long id);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActAcidRecord/detailByApp")
    R detailByApp(@RequestParam("id") Long id,@RequestParam("localCity")String localCity);

    @GetMapping("/comActAcidRecord/charts")
    R charts(@RequestParam("date")String date,@RequestParam("localCity")String localCity);

    @PostMapping("/comActAcidRecord/export")
    R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);
@@ -9623,6 +9679,9 @@

    @GetMapping("/comActAcidRecord/statics")
    R comActAcidRecordStatics(@RequestParam("date")String date);

    @GetMapping("/comActAcidRecord/test")
    R test();

    /**
     * 分页查询所有数据
@@ -9676,7 +9735,7 @@
    R updateBatchComActReserveDangerArea(@RequestBody EditDangerBatchDTO editDangerBatchDTO);

    @GetMapping("/comAreaTownCommunity/areaTownCommunity")
    R areaTownCommunity(@RequestParam("name")String name);
    R areaTownCommunity(@RequestParam("name")String name,@RequestParam("userId")Long userId);

    /**
     * 物业公司详情
@@ -9823,4 +9882,21 @@
     */
    @PostMapping("/comActAcidCheckRecord/update")
    R updateComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);

    @GetMapping("/bcRegion/levelList")
    R levelList(@RequestParam("level")Integer level,@RequestParam("code")String code);

    @GetMapping("/bcRegion/levelListBackstage")
    R levelListBackstage();

    /**
     * 单位活动统计
     */
    @GetMapping("/neighbor/activityAnalysis")
    R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,@RequestParam(value = "type",required = false) Integer type,
                                       @RequestParam(value = "range",required = false)Integer range,@RequestParam(value = "communityId",required = false) Long communityId,
                                       @RequestParam(value = "page",required = false) Integer page,
                                       @RequestParam(value = "size",required = false) Integer size,
                                       @RequestParam(value = "belongTo",required = false) String  belongTo);

}