提交修改

101captain

2021-08-19 9d0d3070c1e95b61440368bd58a325c15c7f99e1

提交修改

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

@@ -178,4 +178,10 @@

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

    @ApiModelProperty(value = "移交时间")
    private Date transferTime;

    @ApiModelProperty(value = "移交说明")
    private String transferReason;
}

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

New file
@@ -0,0 +1,9 @@
package com.panzhihua.common.model.vos.community.easyPhoto;

import lombok.Data;

@Data
public class ComActEasyPhotoCountVO {
    private Integer total;
    private Integer today;
}

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

@@ -261,7 +261,7 @@
    }

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

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

@@ -648,6 +648,14 @@
    }

    /**
     * 城管随手拍统计
     */
    @PostMapping("/esayPhotoCount")
    public R esayphotoCount(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        return comActEasyPhotoService.easyPhotoCount(comActEasyPhotoVO);
    }

    /**
     * 新增社区
     *
     * @param comActVO 社区信息

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

@@ -5,11 +5,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoCountVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoStatisticsVO;
import com.panzhihua.common.model.vos.screen.EastPhotoTypeVO;
import com.panzhihua.common.model.vos.screen.EastPhotoVO;
import com.panzhihua.common.model.vos.screen.EasyPhotoDataVO;
import com.panzhihua.common.model.vos.screen.PbWorkVO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -323,4 +322,5 @@
//            " `status` = 1  " +
//            " AND community_id = #{communityId} and del_tag = 0")
    ComActEasyPhotoStatisticsVO getEasyPhotoStatistics(@Param("communityId")Long communityId);
    ComActEasyPhotoCountVO easyPhotoCount(ComActEasyPhotoVO comActEasyPhotoVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java

@@ -114,5 +114,5 @@
     */
    R readUserReward(Long userId,Long communityId);


    R easyPhotoCount(ComActEasyPhotoVO comActEasyPhotoVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java

@@ -628,5 +628,10 @@
        return R.ok();
    }

    @Override
    public R easyPhotoCount(ComActEasyPhotoVO comActEasyPhotoVO) {
        return R.ok(this.comActEasyPhotoDAO.easyPhotoCount(comActEasyPhotoVO));
    }


}

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

@@ -58,7 +58,9 @@
            p.activity_amount,
            p.activity_id,
            p.examine_at,
            c.name  communityName
            c.name  communityName,
            p.is_report_urban,
            p.urban_status
        FROM
            com_act_easy_photo p
            LEFT JOIN sys_user u ON p.sponsor_id = u.user_id
@@ -125,4 +127,8 @@
            AND del_tag = 0
    </select>

    <select id="easyPhotoCount" resultType="com.panzhihua.common.model.vos.community.ComActEasyPhotoCountVO">
            select
    </select>

</mapper>