puhanshu
2021-12-03 52103d7386c6564baf117b31f0817b8dcb7ad025
修改活动bug
3个文件已修改
14 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActSignMapper.xml 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -290,8 +290,7 @@
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComActActSignExcelVO.class)
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                                .registerWriteHandler(new CustomSheetWriteHandler()).build();
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("活动报名名单导出数据").build();
                        excelWriter.write(excelVOS, writeSheet);
                        excelWriter.finish();
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java
@@ -48,7 +48,7 @@
    IPage<ActivitySignVO> listActivitySign(Page page, @Param("activitySignVO") ActivitySignVO activitySignVO);
@Select("<script> " + "SELECT " + "u.user_id id, " + "u.image_url, " + "u.name, " + "u.nick_name, "
        + "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
        + "CASE WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
        + "u.phone, " + "u.tags, " + "a.create_at,  " + "a.is_volunteer, a.status , a.reason, t.limit " + "FROM " + "com_act_act_sign a "
        + "JOIN sys_user u ON a.user_id = u.user_id  left join com_act_activity t on a.activity_id = t.id " + "WHERE " + "a.activity_id = #{activitySignVO.activityId}  "
        + "<if test='activitySignVO.phone != null and activitySignVO.phone != &quot;&quot;'>"
@@ -68,8 +68,8 @@
    List<ComActActSignExcelVO> getSignLists (@Param("activitySignVO") ActivitySignVO activitySignVO);
    @Select("<script> " + "SELECT " + " caas.user_id, " + " su.NAME, " + "CASE " + "  WHEN su.is_volunteer = 1 THEN "
        + "  '志愿者' ELSE '居民'  " + " END identity, " + " su.phone, " + " caas.create_at  " + "FROM "
    @Select("<script> " + "SELECT " + " caas.user_id, " + " su.NAME, " + "CASE WHEN caas.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
        + " su.phone, " + " caas.create_at  " + "FROM "
        + " com_act_act_sign AS caas "
        + " LEFT JOIN sys_user AS su ON su.user_id = caas.user_id where caas.activity_id = #{activityPeopleListDTO.activityId} "
        + "<if test='activityPeopleListDTO.phone != null and activityPeopleListDTO.phone != &quot;&quot;'>"
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActSignMapper.xml
@@ -30,9 +30,6 @@
        su.phone,
        su.tags,
        CASE
        WHEN su.is_partymember = 1 THEN
        '党员'
        WHEN caas.is_volunteer = 1 THEN
        '志愿者' ELSE '居民'
        END identity
@@ -79,7 +76,7 @@
    </select>
    <select id="listActivitySign" resultType="com.panzhihua.common.model.vos.community.ActivitySignVO">
        SELECT u.user_id id, u.image_url, u.name, u.nick_name,
            case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity,
            CASE WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity,
            u.phone, u.tags, a.create_at,  a.is_volunteer, a.status , r.times , a.reason, r.times * r.award as award, t.limit
        FROM com_act_act_sign a
        JOIN sys_user u ON a.user_id = u.user_id