【丽水修复】历史随访记录导出修复

陈昶聿

4 天以前 c722df8c090c6097ea1d4d15fa53da7992c9aa2f

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java

@@ -243,20 +243,6 @@
    /**
     * 随访历史记录导出
     */
    //@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
//    @Log(title = "随访历史记录导出", businessType = BusinessType.EXPORT)
//    @PostMapping("/getSubtaskByDiagnameExport")
//    public void getSubtaskByDiagnameExport(HttpServletResponse response, List<ServiceSubtaskDiagname> serviceSubtaskDiagnameList) {
//        ExcelUtil<ServiceSubtaskDiagname> util = new ExcelUtil<ServiceSubtaskDiagname>(ServiceSubtaskDiagname.class);
//
//        if (active.equals("ls") || active.equals("druid")) {
//            util.exportExcel(response, serviceSubtaskDiagnameList, LocalDate.now().getMonthValue() + "随访统计导出");
//        } else {
//            util.exportExcel(response, serviceSubtaskDiagnameList, "随访统计导出");
//        }
//    }

    //@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
    @Log(title = "随访历史记录导出", businessType = BusinessType.EXPORT)
    @PostMapping("/getSubtaskByDiagnameExport")
    public void getSubtaskByDiagnameExport(HttpServletResponse response, ServiceSubtask serviceSubtask) {
@@ -265,15 +251,16 @@
        serviceSubtask.setOrgid(user.getOrgid());
        serviceSubtask.setPageNum(PageUtils.getOffset(serviceSubtask.getPageNum(), serviceSubtask.getPageSize()));
        List<ServiceSubtask> subtaskList = serviceSubtaskService.selectServiceSubtaskByDiagname(serviceSubtask);
        ExcelUtil<ServiceSubtask> util = new ExcelUtil<ServiceSubtask>(ServiceSubtask.class);
        List<ServiceSubtaskDiagname> serviceSubtaskDiagnameList = new ArrayList<>();
        if (CollectionUtils.isNotEmpty(subtaskList)) serviceSubtaskDiagnameList = serviceSubtaskService.convertToDiagnameList(subtaskList);
        ExcelUtil<ServiceSubtaskDiagname> util = new ExcelUtil<ServiceSubtaskDiagname>(ServiceSubtaskDiagname.class);

        if (active.equals("ls") || active.equals("druid")) {
            util.exportExcel(response, subtaskList, LocalDate.now().getMonthValue() + "随访统计导出");
            util.exportExcel(response, serviceSubtaskDiagnameList, LocalDate.now().getMonthValue() + "随访统计导出");
        } else {
            util.exportExcel(response, subtaskList, "随访统计导出");
            util.exportExcel(response, serviceSubtaskDiagnameList, "随访统计导出");
        }
    }


    /**
     * 新增或修改删除单一任务