bug修改

101captain

2022-07-20 c40f8e3d2e08e108780091776437242528bf61d6

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

@@ -8,6 +8,7 @@
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDpcStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenEasyPhotoStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigscreenGridsGovernanceStatisticsVO;
import com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO;
@@ -211,6 +212,7 @@
            "c.name communityName," +
            "p.transfer_time," +
            "p.is_report_urban," +
            "p.is_report_dpc," +
            "p.transfer_reason," +
            "ca.`name` as classifyName," +
            "p.urban_status, " +
@@ -251,61 +253,61 @@
            )
    List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);

    @Select("<script> " +
            "SELECT " +
            "p.id, " +
            "u.`name` sponsor_name, " +
            "u.`nick_name` userNickName, " +
            "u.phone sponsor_phone, " +
            "count(DISTINCT pu.id)giveThumbsUpNum, " +
            "count(DISTINCT c.id)commentNum, " +
            "u.image_url, " +
            "p.happen_addr, " +
            "p.addr_remark, " +
            "su.`name` handler_name, " +
            "p.`status`, " +
            "p.`is_hide`, " +
            "p.`detail`, " +
            "p.`is_need_feed_back`, " +
            "p.`photo_path_list`, " +
            "p.create_at, " +
            "p.feedback_at, " +
            "p.activity_type, " +
            "p.activity_amount, " +
            "p.classify_id, " +
            "class.`name` as classifyName, " +
            "p.img_width, " +
            "p.img_height, " +
            "p.examine_at  " +
            "FROM " +
            "com_act_easy_photo p " +
            "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_easy_photo_comment c ON p.id = c.easy_photo_id  " +
            "left JOIN com_act_easy_photo_classify class ON p.classify_id = class.id  " +
            " <where>" +
            " p.del_tag = 0 "  +
            "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
            "  and p.community_id = ${comActEasyPhotoVO.communityId} " +
            " </if> " +
            "<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
            "AND p.`status` = #{comActEasyPhotoVO.status}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>" +
            "AND p.`status` in (2,5) and p.is_publicity = 1 " +
            " </if> " +
            "<if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != &quot;&quot;'>" +
            "AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%'))   " +
            " </if> " +
            "group by p.id "+
            "order by p.create_at desc "+
            " </where>" +
            "</script>"
    )
//    @Select("<script> " +
//            "SELECT " +
//            "p.id, " +
//            "u.`name` sponsor_name, " +
//            "u.`nick_name` userNickName, " +
//            "u.phone sponsor_phone, " +
//            "count(DISTINCT pu.id)giveThumbsUpNum, " +
//            "count(DISTINCT c.id)commentNum, " +
//            "u.image_url, " +
//            "p.happen_addr, " +
//            "p.addr_remark, " +
//            "su.`name` handler_name, " +
//            "p.`status`, " +
//            "p.`is_hide`, " +
//            "p.`detail`, " +
//            "p.`is_need_feed_back`, " +
//            "p.`photo_path_list`, " +
//            "p.create_at, " +
//            "p.feedback_at, " +
//            "p.activity_type, " +
//            "p.activity_amount, " +
//            "p.classify_id, " +
//            "class.`name` as classifyName, " +
//            "p.img_width, " +
//            "p.img_height, " +
//            "p.examine_at  " +
//            "FROM " +
//            "com_act_easy_photo p " +
//            "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_easy_photo_comment c ON p.id = c.easy_photo_id  " +
//            "left JOIN com_act_easy_photo_classify class ON p.classify_id = class.id  " +
//            " <where>" +
//            " p.del_tag = 0 "  +
//            "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
//            "  and p.community_id = ${comActEasyPhotoVO.communityId} " +
//            " </if> " +
//            "<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
//            "AND p.`status` = #{comActEasyPhotoVO.status}  " +
//            " </if> " +
//            "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
//            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId}  " +
//            " </if> " +
//            "<if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>" +
//            "AND p.`status` in (2,4) and p.is_publicity = 1 " +
//            " </if> " +
//            "<if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != &quot;&quot;'>" +
//            "AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%'))   " +
//            " </if> " +
//            "group by p.id "+
//            "order by p.create_at desc "+
//            " </where>" +
//            "</script>"
//    )
    IPage<ComActEasyPhotoVO> pageEasyPhotoApplets(Page page, @Param("comActEasyPhotoVO")ComActEasyPhotoVO comActEasyPhotoVO);

    @Select("SELECT t.name,COUNT(p.id) as num FROM com_act_easy_photo_type t LEFT JOIN com_act_easy_photo_type_relation r ON  t.id = r.easy_type_id " +
@@ -421,4 +423,34 @@
     * @return
     */
    List<ComActEasyPhotoVO> getPartyBuildIngRecord(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);

    /**
     * 获取上报人大代表的随手拍新增数据
     * @param communityId
     * @return
     */
    List<StatisticsCommVO> getEasyPhotoAddPolylineDataForDpc(@Param("communityId") Long communityId);

    /**
     * 上报人大代表的随手拍累计折线数据
     * @param communityId
     * @param date
     * @return
     */
    StatisticsCommVO getEasyPhotoTotalPolylineDateForDpc(@Param("communityId") Long communityId, @Param("date") String date);

    /**
     * 人大代表-随手拍展示列表
     * @param page
     * @param pageBaseDTO
     * @return
     */
    IPage<ComActEasyPhotoVO> dpcEasyPhotoList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);

    /**
     * 获取人大代表基础数据
     * @param communityId
     * @return
     */
    BigScreenDpcStatisticsInfo selectDpcBaseData(@Param("communityId") Long communityId);
}