45615

whywhyo

2023-07-25 1e0fe96e56d9d6fa6153d4c7e512e129d922ca61

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

@@ -53,8 +53,10 @@
     * 根据宠物id获取相关备忘录
     */
    @GetMapping
    public AjaxResult getByPetId(@PathParam("pid")String 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);
    }


@@ -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());