lidongdong
2024-11-07 4cbd3db9155541429ebb269fd90a0793df005844
花城 新增金汇大屏统计慈善公益
8个文件已修改
58 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishDOMapper.xml 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiCharityApi.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiCharityDao.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiCharityService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiCharityServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiCharityMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -1095,6 +1095,15 @@
                            @RequestParam(value = "state", required = false) String state);
    /**
     * 金汇大屏用
     *
     * @param
     * @return
     */
    @GetMapping("/JinhuiCharity/getJinhuiCharityList")
    public R getJinhuiCharityList();
    /**
     * 获取详情
     * @param id
     * @return
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
@@ -1467,6 +1467,13 @@
        return jinhuiCommunityService.getCharityList(pageNum,pageSize,title,label,state);
    }
    @ApiOperation(value = "金汇慈善公益大屏统计",response = JinhuiCharityVO.class)
    @GetMapping("/getJinhuiCharityList")
    public R getJinhuiCharityList()
    {
        return jinhuiCommunityService.getJinhuiCharityList();
    }
    /**
     * 获取未绑定人员的网格
     * @return
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishDOMapper.xml
@@ -232,12 +232,19 @@
        WHERE community_id = ${communityId} AND `status` NOT IN(1,4) GROUP BY filed) t1,
        (SELECT COUNT(id) AS sum FROM com_act_micro_wish WHERE community_id = ${communityId} AND  `status` NOT IN(1,4)) t2
    </select>
<!--    <select id="getPassedAllImages" resultType="java.lang.String">-->
<!--        SELECT photo_path_list FROM com_act_micro_wish-->
<!--        WHERE community_id = ${communityId} AND (`status` =2 OR `status` = 3 OR `status` = 5 OR `status` = 6 OR `status` = 7)-->
<!--        AND photo_path_list IS NOT NULL AND photo_path_list != ''-->
<!--        ORDER BY create_at DESC limit #{pageSize}-->
<!--    </select>-->
    <select id="getPassedAllImages" resultType="java.lang.String">
        SELECT photo_path_list FROM com_act_micro_wish
        WHERE community_id = ${communityId} AND (`status` =2 OR `status` = 3 OR `status` = 5 OR `status` = 6 OR `status` = 7)
        AND photo_path_list IS NOT NULL AND photo_path_list != ''
        ORDER BY create_at DESC limit #{pageSize}
        SELECT img_url as photoPathList FROM jinhui_micro_volunteering
        WHERE img_url IS NOT NULL AND img_url != ''
        ORDER BY creation_time DESC limit #{pageSize}
    </select>
    <select id="selectIndexMicroWishBaseData"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenMicroWishStatisticsInfo">
        SELECT
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiCharityApi.java
@@ -38,6 +38,18 @@
    }
    /**
     * 金汇大屏用
     *
     * @param
     * @return
     */
    @GetMapping("/getJinhuiCharityList")
    public R getJinhuiCharityList()
    {
        return charityService.getJinhuiCharityList();
    }
    /**
     * 获取详情
     * @param id
     * @return
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiCharityDao.java
@@ -8,6 +8,8 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface JinhuiCharityDao extends BaseMapper<JinhuiCharity>
{
@@ -22,6 +24,8 @@
                                 @Param("state") String state);
    List<JinhuiCharity> getJinhuiCharityList();
    /**
     * 详情
     * @param id
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiCharityService.java
@@ -14,6 +14,8 @@
     */
    R getList(int pageNum,int pageSize,String title,String label,String state);
    R getJinhuiCharityList();
    JinhuiCharity getDetails(String id);
    /**
     * 新增
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiCharityServiceImpl.java
@@ -25,6 +25,11 @@
    }
    @Override
    public R getJinhuiCharityList() {
        return R.ok(baseMapper.getJinhuiCharityList());
    }
    @Override
    public JinhuiCharity getDetails(String id) {
        return baseMapper.getDetails(id);
    }
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiCharityMapper.xml
@@ -16,6 +16,10 @@
    </resultMap>
    <!-- 金汇慈善公益  -->
    <select id="getJinhuiCharityList" resultType="itemMap">
        select title,creation_time from jinhui_charity ORDER BY creation_time DESC
    </select>
    <!-- 分页查询 -->
    <select id="getList" resultMap="itemMap">