lidongdong
2024-03-19 9fe76b7ebda8e602c077c61c0529c2e826474f4e
修改报道单位导出报错
2个文件已修改
13 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -1385,13 +1385,14 @@
    }
    @GetMapping("/exportExcel")
    public void exportExcel(@RequestParam(value = "year",required = false) Integer year,
    public R exportExcel(@RequestParam(value = "year",required = false) Integer year,
                         @RequestParam(value = "type",required = false) Integer type,
                         @RequestParam(value = "communityId",required = false) Long communityId,
                         @RequestParam(value = "belongTo",required = false) String  belongTo,
                         HttpServletResponse response) throws Exception {
        List<ExcelDO> excelDOList = communityService.export(year, belongTo, communityId);
        com.panzhihua.common.utlis.EasyExcel.export2Web(response,"报道单位","sheet",ExcelDO.class,excelDOList);
        return R.ok(excelDOList);
//        com.panzhihua.common.utlis.EasyExcel.export2Web(response,"报道单位","sheet",ExcelDO.class,excelDOList);
    }
    @GetMapping("/partyExcel")
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml
@@ -553,8 +553,12 @@
    </select>
    <select id="selectStatsUser" resultType="com.panzhihua.common.model.vos.neighbor.ServiceStaticsVO">
        select count(t1.checkId) as times,sum(t1.hours) as hours from  ((select real_service_time as hours,solve_id  as checkId  from com_act_neighbor_circle canc left join sys_user su on canc.solve_id = su.user_id  where order_type = 2 AND canc.is_del = 2 and solve_status = 4 and su.phone = #{phone} and canc.order_time between concat(#{date},'-01-01 00:00:00') and concat(#{date},'-12-31 23:59:59')) union all
                                                                        (select duration as hours,caas.user_id as checkId from com_act_activity caa LEFT JOIN com_act_act_regist caas on caa.id = caas.activity_id left join sys_user su on caas.user_id = su.user_id where caas.sign_identity = 2 and caas.end_time is not null and su.phone =#{phone}  and publish_at between concat(#{date},'-01-01 00:00:00') and concat(#{date},'-12-31 23:59:59') group by caa.id)) t1
        select count(t1.checkId) as times,sum(t1.hours) as hours from  ((select real_service_time as hours,solve_id  as checkId
        from com_act_neighbor_circle canc left join sys_user su on canc.solve_id = su.user_id  where order_type = 2 AND canc.is_del = 2 and solve_status = 4
        and su.phone = #{phone} and canc.order_time between concat(#{date},'-01-01 00:00:00') and concat(#{date},'-12-31 23:59:59')) union all
        (select duration as hours,caas.user_id as checkId from com_act_activity caa LEFT JOIN com_act_act_regist caas on caa.id = caas.activity_id
            left join sys_user su on caas.user_id = su.user_id where caas.sign_identity = 2 and caas.end_time is not null and su.phone =#{phone}
            and publish_at between concat(#{date},'-01-01 00:00:00') and concat(#{date},'-12-31 23:59:59') group by caa.id)) t1
    </select>
    <select id="selectListByPhone" resultType="com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO">