随手拍修改

101captain

2021-08-19 fc394faaaf484b1a5263b4415509b320518ce301

随手拍修改

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

@@ -170,4 +170,12 @@
    @ApiModelProperty(value = "完成人名称")
    private String completeName;

    @ApiModelProperty(value = "是否上报城管 0未上报 1已上报 2已退回")
    private Integer isReportUrban;

    @ApiModelProperty(value = "城管安排状态 0未安排 1已安排 2已处理")
    private Integer urbanStatus;

    @ApiModelProperty(value = "社区名字")
    private String communityName;
}

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

@@ -260,6 +260,13 @@
        return communityService.pageEasyPhoto(comActEasyPhotoVO);
    }

    @ApiOperation(value = "城管分页查询随手拍")
    @PostMapping("/pageeasyphoto/urban")
    public R pageEasyPhotoUrban(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        comActEasyPhotoVO.setIsReportUrban(1);
        return communityService.pageEasyPhoto(comActEasyPhotoVO);
    }

    @ApiOperation(value = "随手拍详情", response = ComActEasyPhotoVO.class)
    @GetMapping("easyphoto")
    public R detailEasyPhoto(@RequestParam("id") Long id) {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java

@@ -199,12 +199,17 @@
            "p.activity_amount, " +
            "count(pu.id)giveThumbsUpNum, " +
            "p.handle_photo_list " +
            "c.name communityName " +
            "p.transfer_time" +
            "p.transfer_reason" +
            "p.urban_status" +
            "FROM " +
            "com_act_easy_photo p " +
            "JOIN sys_user u on p.sponsor_id=u.user_id " +
            "LEFT JOIN sys_user su on p.handler_id=su.user_id " +
            "LEFT JOIN sys_user su1 on p.complete_id=su1.user_id " +
            "LEFT JOIN com_act_easy_photo_user pu on p.id=pu.easy_photo_id " +
            "LEFT JOIN com_act c on p.community_id=c.community_id " +
            "WHERE p.del_tag = 0 and p.id=#{id}")
    ComActEasyPhotoVO detailEasyPhoto(Long id);
    @Select("SELECT " +

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

@@ -57,12 +57,14 @@
            p.activity_type,
            p.activity_amount,
            p.activity_id,
            p.examine_at
            p.examine_at,
            c.name  communityName
        FROM
            com_act_easy_photo p
            LEFT JOIN sys_user u ON p.sponsor_id = u.user_id
            LEFT JOIN com_act_easy_photo_user pu ON p.id = pu.easy_photo_id
            LEFT JOIN sys_user su ON p.handler_id = su.user_id
            left join com_act c on p.community_id =c.community_id
        WHERE
            p.del_tag = 0
        <if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>
@@ -70,6 +72,12 @@
        </if>
        <if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >
          AND p.`status` = #{comActEasyPhotoVO.status}
        </if>
        <if test='comActEasyPhotoVO.isReportUrban != null and comActEasyPhotoVO.isReportUrban!=0' >
            AND p.`is_report_urban` = #{comActEasyPhotoVO.isReportUrban}
        </if>
        <if test='comActEasyPhotoVO.urbanStatus != null and comActEasyPhotoVO.urbanStatus!=0' >
            AND p.`urban_status` = #{comActEasyPhotoVO.urbanStatus}
        </if>
        <if test='comActEasyPhotoVO.createBegin != null  '>
        AND p.create_at BETWEEN #{comActEasyPhotoVO.createBegin}
@@ -82,7 +90,8 @@
        <if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != &quot;&quot;'>
            AND (u.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or
            p.happen_addr like concat(#{comActEasyPhotoVO.keyWord},'%') or
            su.`name` like concat(#{comActEasyPhotoVO.keyWord},'%')
            su.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or
            p.detail like concat(#{comActEasyPhotoVO.keyWord},'%')
            )
        </if>
        GROUP BY