1254

whywhyo

2023-07-21 d2a1957ec40c70c696ab3260d7f7df90c4539589

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java

@@ -53,19 +53,21 @@
     * 根据宠物id获取相关备忘录
     */
    @GetMapping
    public AjaxResult getByPetId(@PathParam("pid")Long pid){
        return zfPetNoteService.getAllPetNoteByPetId(pid);
    public AjaxResult getByPetId(@PathParam("pid")String pid,ZfPetNote zfPetNote){
        Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
        return zfPetNoteService.getAllPetNoteByPetId(pageNum,pageSize,pid,zfPetNote);
    }


    /**
     * 获取导入模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getExportModel(HttpServletResponse response){
        List<ZfPetNote> list = Collections.singletonList(new ZfPetNote());
        ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class);
        util.exportExcel(response,list,"魅宠备忘录记录数据");
        util.exportExcel(response,list,"魅宠备忘录导入模板");
    }


@@ -88,7 +90,7 @@
     */
    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
    @PostMapping("/importData/{pid}")
    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file,@PathVariable Long pid) throws Exception
    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file,@PathVariable String pid) throws Exception
    {
        ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class);
        List<ZfPetNote> eventList = util.importExcel(file.getInputStream());